Fix promisifiy giving a function an invalid identifier as a name

petkaantonov · Apr 27, 2014 · 968df84 · 968df84
1 parent 60995e5
commit 968df84
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/promisify.js b/src/promisify.js
@@ -121,9 +121,8 @@ function parameterCount(fn) {
     return 0;
 }
 
+var rident = /^[a-z$_][a-z$_0-9]*$/i;
 function propertyAccess(id) {
-    var rident = /^[a-z$_][a-z$_0-9]*$/i;
-
     if (rident.test(id)) {
         return "." + id;
     }
@@ -161,6 +160,10 @@ function makeNodePromisifiedEval(callback, receiver, originalName, fn) {
         "break;";
     }
 
+    if (!rident.test(callbackName)) {
+        callbackName = "promisified";
+    }
+
     function generateArgumentSwitchCase() {
         var ret = "";
         for(var i = 0; i < argumentOrder.length; ++i) {

diff --git a/test/mocha/promisify.js b/test/mocha/promisify.js
@@ -398,6 +398,8 @@ describe( "Promisify from prototype to object", function() {
 
         };
 
+        method["---invalid---"] = function(){};
+
         if ((function(){"use strict"; return this === void 0})()) {
             Object.defineProperty(method, "thrower", {
                 enumerable: true,