Merge pull request #828 from node-nock/bug-827-matchStringOrRegexp

Bug #827 Defensive coding around target
nock · Feb 13, 2017 · 7197769 · 7197769
2 parents 0fb8c3d + f2ae8c1
commit 7197769
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/lib/common.js b/lib/common.js
@@ -308,11 +308,9 @@ function percentEncode(str) {
 }
 
 function matchStringOrRegexp(target, pattern) {
-  if (pattern instanceof RegExp) {
-    return target.toString().match(pattern);
-  } else {
-    return target.toString() === pattern;
-  }
+  var str = target && target.toString ? target.toString() : target;
+
+  return pattern instanceof RegExp  ? str.match(pattern) : str === pattern;
 }
 
 // return [newKey, newValue]