Fix socket destroy in case of no connection (#955)

IoT.js-DCO-1.0-Signed-off-by: Robert Sipka [email protected]

Author: robertsipka

src/js/net.js

@@ -191,7 +191,7 @@ Socket.prototype.destroy = function() {
   // unset timeout
   clearSocketTimeout(self);
 
-  if (self._writableState.ended) {
+  if (self._writableState.ended && self._handle) {
     close(self);
     state.destroyed = true;
   } else {
@@ -417,7 +417,7 @@ function onSocketFinish() {
   var self = this;
   var state = self._socketState;
 
-  if (!state.readable || self._readableState.ended) {
+  if (!state.readable || self._readableState.ended || !self._handle) {
     // no readable stream or ended, destroy(close) socket.
     return self.destroy();
   } else {

test/node/parallel/test-net-end-without-connect.js

@@ -0,0 +1,42 @@
+/* Copyright 2017-present Samsung Electronics Co., Ltd. and other contributors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// Copyright Joyent, Inc. and other Node contributors.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to permit
+// persons to whom the Software is furnished to do so, subject to the
+// following conditions:
+//
+// The above copyright notice and this permission notice shall be included
+// in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+// USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+'use strict';
+require('node/common');
+var net = require('net');
+
+var sock = new net.Socket();
+sock.end(); // Should not throw.

test/testsets.json

@@ -113,6 +113,7 @@
   ],
   "node/parallel": [
     { "name": "test-assert.js" },
-    { "name": "test-net-bind-twice.js" }
+    { "name": "test-net-bind-twice.js" },
+    { "name": "test-net-end-without-connect.js" }
   ]
 }