From fef0b47da4bc794e571a9fcd4f32bef378e20195 Mon Sep 17 00:00:00 2001
From: Vincent Boucher <vincent.boucher@b12-consulting.com>
Date: Wed, 30 Sep 2015 18:03:27 +0200
Subject: [PATCH] testing callback type in denodeify(), nbind() and nfcall()

---
 q.js | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/q.js b/q.js
index fb3167fe..52b3b0e1 100644
--- a/q.js
+++ b/q.js
@@ -366,6 +366,13 @@ if (typeof ReturnValue !== "undefined") {
     };
 }
 
+// Validate callback
+function checkCallbackForWrap(callback) {
+    if (typeof callback !== "function") {
+        throw new Error("Q can't wrap an undefined function");
+    }
+}
+
 // long stack traces
 
 var STACK_JUMP_SEPARATOR = "From previous event:";
@@ -1896,6 +1903,8 @@ Promise.prototype.nfapply = function (args) {
  *
  */
 Q.nfcall = function (callback /*...args*/) {
+    checkCallbackForWrap(callback);
+
     var args = array_slice(arguments, 1);
     return Q(callback).nfapply(args);
 };
@@ -1918,9 +1927,8 @@ Promise.prototype.nfcall = function (/*...args*/) {
  */
 Q.nfbind =
 Q.denodeify = function (callback /*...args*/) {
-    if (callback === undefined) {
-        throw new Error("Q can't wrap an undefined function");
-    }
+    checkCallbackForWrap(callback);
+
     var baseArgs = array_slice(arguments, 1);
     return function () {
         var nodeArgs = baseArgs.concat(array_slice(arguments));
@@ -1939,6 +1947,8 @@ Promise.prototype.denodeify = function (/*...args*/) {
 };
 
 Q.nbind = function (callback, thisp /*...args*/) {
+    checkCallbackForWrap(callback);
+
     var baseArgs = array_slice(arguments, 2);
     return function () {
         var nodeArgs = baseArgs.concat(array_slice(arguments));