[mms] More efficient parsing in Horde_Crypt_Pgp_Parse.

horde · Jan 24, 2014 · c2ca7ae · c2ca7ae
1 parent e14889f
commit c2ca7ae
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/framework/Crypt/lib/Horde/Crypt/Pgp/Parse.php b/framework/Crypt/lib/Horde/Crypt/Pgp/Parse.php
@@ -107,7 +107,8 @@ public function parse($text)
 
         while (!$stream->eof()) {
             $val = rtrim($stream->getToChar("\n", false), "\r");
-            if (preg_match('/^-----(BEGIN|END) PGP ([^-]+)-----\s*$/', $val, $matches)) {
+            if ((strpos($val, '-----') === 0) &&
+                preg_match('/^-----(BEGIN|END) PGP ([^-]+)-----\s*$/', $val, $matches)) {
                 if (isset($temp['data'])) {
                     $data[] = $temp;
                 }

diff --git a/framework/Crypt/package.xml b/framework/Crypt/package.xml
@@ -27,7 +27,7 @@
  </stability>
  <license uri="http://www.horde.org/licenses/lgpl21">LGPL-2.1</license>
  <notes>
-* 
+* [mms] More efficient parsing in Horde_Crypt_Pgp_Parse.
  </notes>
  <contents>
   <dir baseinstalldir="/" name="/">
@@ -990,7 +990,7 @@ Initial release as a PEAR package
    <date>2013-11-19</date>
    <license uri="http://www.horde.org/licenses/lgpl21">LGPL-2.1</license>
    <notes>
-* 
+* [mms] More efficient parsing in Horde_Crypt_Pgp_Parse.
    </notes>
   </release>
  </changelog>