redis/node-redis
1
0
Fork 0
mirror of https://github.com/redis/node-redis.git synced 2025-08-06 02:15:48 +03:00
Code Activity

fix empty unsub/punsub TypeError

Browse Source 
When unsubscribe or punsubscribe is called and it has
no subscriptions, the reply[1] is a null which causes
`TypeError: Cannot call method 'toString' of null`

Check if reply[1] is null before calling toString otherwise
just pass null.
This commit is contained in:
Jeff Barczewski
2013-03-26 10:49:13 -05:00
parent 0c143a7299
commit 655681f790
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
index.js
View File

@@ -629,10 +629,12 @@ RedisClient.prototype.return_reply = function (reply) {
} }
// subscribe commands take an optional callback and also emit an event, but only the first response is included in the callback // subscribe commands take an optional callback and also emit an event, but only the first response is included in the callback
// TODO - document this or fix it so it works in a more obvious way // TODO - document this or fix it so it works in a more obvious way
// reply[1] can be null
var reply1String = (reply[1] === null) ? null : reply[1].toString();
if (command_obj && typeof command_obj.callback === "function") { if (command_obj && typeof command_obj.callback === "function") {
try_callback(command_obj.callback, reply[1].toString()); try_callback(command_obj.callback, reply1String);
} }
this.emit(type, reply[1].toString(), reply[2]); // channel, count this.emit(type, reply1String, reply[2]); // channel, count
} else { } else {
throw new Error("subscriptions are active but got unknown reply type " + type); throw new Error("subscriptions are active but got unknown reply type " + type);
} }
@@ -708,7 +710,7 @@ RedisClient.prototype.send_command = function (command, args, callback) {
return callback(err); return callback(err);
} }
} }
buffer_args = false; buffer_args = false;
for (i = 0, il = args.length, arg; i < il; i += 1) { for (i = 0, il = args.length, arg; i < il; i += 1) {
if (Buffer.isBuffer(args[i])) { if (Buffer.isBuffer(args[i])) {