fix #17

BenzLeung · Aug 2, 2019 · f791056 · f791056
1 parent ba02008
commit f791056
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 6 deletions.
diff --git a/BenzAMRRecorder.js b/BenzAMRRecorder.js
@@ -977,10 +977,13 @@
 	            }
 	            return ret
 	        };
-	        var sourceRegex = /^function\s*\(([^)]*)\)\s*{\s*([^*]*?)[\s;]*(?:return\s*(.*?)[;\s]*)?}$/;
+	        var sourceRegex = /^function\s\(([^)]*)\)\s*{\s*([^*]*?)[\s;]*(?:return\s*(.*?)[;\s]*)?}$/;
 
 	        function parseJSFunc(jsfunc) {
-	            var parsed = jsfunc.toString().match(sourceRegex).slice(1);
+	            // Match the body and the return value of a javascript function source
+	            var parsed = jsfunc.toString().match(sourceRegex);
+	            if (!parsed) { return {}; }
+	            parsed = parsed.slice(1);
 	            return {arguments: parsed[0], body: parsed[1], returnValue: parsed[2]}
 	        }
 

diff --git a/BenzAMRRecorder.js.map b/BenzAMRRecorder.js.map
diff --git a/BenzAMRRecorder.min.js b/BenzAMRRecorder.min.js
diff --git a/src/amrnb.js b/src/amrnb.js
@@ -479,10 +479,13 @@ var AMR = (function () {
             }
             return ret
         };
-        var sourceRegex = /^function\s*\(([^)]*)\)\s*{\s*([^*]*?)[\s;]*(?:return\s*(.*?)[;\s]*)?}$/;
+        var sourceRegex = /^function\s\(([^)]*)\)\s*{\s*([^*]*?)[\s;]*(?:return\s*(.*?)[;\s]*)?}$/;
 
         function parseJSFunc(jsfunc) {
-            var parsed = jsfunc.toString().match(sourceRegex).slice(1);
+            // Match the body and the return value of a javascript function source
+            var parsed = jsfunc.toString().match(sourceRegex);
+            if (!parsed) { return {}; }
+            parsed = parsed.slice(1);
             return {arguments: parsed[0], body: parsed[1], returnValue: parsed[2]}
         }