Merge pull request Dexus#61 from shugigo/shugigo-patch-1

No match fix at preg_match_all
andris9 · Sep 16, 2015 · 4f7a62c · 4f7a62c
2 parents 89a4518 + dcabd92
commit 4f7a62c
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/lib/pem.js b/lib/pem.js
@@ -779,7 +779,7 @@ function rtrim(str, charlist) {
 
 function preg_match_all(regex, haystack) {
     var globalRegex = new RegExp(regex, 'g');
-    var globalMatch = haystack.match(globalRegex);
+    var globalMatch = haystack.match(globalRegex) || [];
     var matchArray = [],
         nonGlobalRegex, nonGlobalMatch;
     for (var i=0; i<globalMatch.length; i++) {