fixes socketio#555

aquari · Oct 22, 2011 · bee1efb · bee1efb
1 parent 120924f
commit bee1efb
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 4 deletions.
diff --git a/lib/transports/websocket/hybi-07-12.js b/lib/transports/websocket/hybi-07-12.js
@@ -41,7 +41,13 @@ function WebSocket (mng, data, req) {
   });
   this.parser.on('ping', function () {
     // version 8 ping => pong
-    self.socket.write('\u008a\u0000');
+    try {
+      self.socket.write('\u008a\u0000');
+    }
+    catch (e) {
+      self.end();
+      return;
+    }
   });
   this.parser.on('close', function () {
     self.end();
@@ -177,7 +183,13 @@ WebSocket.prototype.verifyOrigin = function (origin) {
 WebSocket.prototype.write = function (data) {
   if (this.open) {
     var buf = this.frame(0x81, data);
-    this.socket.write(buf, 'binary');
+    try {
+      this.socket.write(buf, 'binary');
+    }
+    catch (e) {
+      this.end();
+      return;
+    }
     this.log.debug(this.name + ' writing', data);
   }
 };

diff --git a/lib/transports/websocket/hybi-16.js b/lib/transports/websocket/hybi-16.js
@@ -41,7 +41,13 @@ function WebSocket (mng, data, req) {
   });
   this.parser.on('ping', function () {
     // version 8 ping => pong
-    self.socket.write('\u008a\u0000');
+    try {
+      self.socket.write('\u008a\u0000');
+    }
+    catch (e) {
+      self.end();
+      return;
+    }
   });
   this.parser.on('close', function () {
     self.end();
@@ -177,7 +183,13 @@ WebSocket.prototype.verifyOrigin = function (origin) {
 WebSocket.prototype.write = function (data) {
   if (this.open) {
     var buf = this.frame(0x81, data);
-    this.socket.write(buf, 'binary');
+    try {
+      this.socket.write(buf, 'binary');
+    }
+    catch (e) {
+      this.end();
+      return;
+    }
     this.log.debug(this.name + ' writing', data);
   }
 };