Merge pull request #34 from danielmcq/master

Fix issue when parsing invalid cookies
bmeck · May 30, 2018 · f6e3097 · f6e3097
2 parents 207de77 + 1730d38
commit f6e3097
Showing 1 changed file with 16 additions and 5 deletions.
diff --git a/cookiejar.js b/cookiejar.js
@@ -67,11 +67,22 @@
         if (this instanceof Cookie) {
             var parts = str.split(";").filter(function (value) {
                     return !!value;
-                }),
-                pair = parts[0].match(/([^=]+)=([\s\S]*)/),
-                key = pair[1],
-                value = pair[2],
-                i;
+                });
+            var i;
+
+            var pair = parts[0].match(/([^=]+)=([\s\S]*)/);
+            if (!pair) {
+                console.warn("Invalid cookie header encountered. Header: '"+str+"'");
+                return;
+            }
+
+            var key = pair[1];
+            var value = pair[2];
+            if ( typeof key !== 'string' || key.length === 0 || typeof value !== 'string' ) {
+                console.warn("Unable to extract values from cookie header. Cookie: '"+str+"'");
+                return;
+            }
+
             this.name = key;
             this.value = value;