From 9f4c3b0d45f858d3d3021ef4b8edebf6005008ff Mon Sep 17 00:00:00 2001 From: "hheennrryy@gmail.com" Date: Fri, 8 Mar 2013 06:07:27 -0500 Subject: http: check if incoming parser has already been freed Fix #4948 This adds a check before setting the incoming parser to null. Under certain circumstances it'll already be set to null by freeParser(). Otherwise this will cause node to crash as it tries to set null on something that is already null. --- lib/http.js | 2 +- test/simple/test-regress-GH-4948.js | 50 +++++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+), 1 deletion(-) create mode 100644 test/simple/test-regress-GH-4948.js diff --git a/lib/http.js b/lib/http.js index aafbe5f60f..1f52d31514 100644 --- a/lib/http.js +++ b/lib/http.js @@ -420,7 +420,7 @@ IncomingMessage.prototype._dump = function() { return; this._dumped = true; - this.socket.parser.incoming = null; + if (this.socket.parser) this.socket.parser.incoming = null; this.push(null); readStart(this.socket); }; diff --git a/test/simple/test-regress-GH-4948.js b/test/simple/test-regress-GH-4948.js new file mode 100644 index 0000000000..d96c4da613 --- /dev/null +++ b/test/simple/test-regress-GH-4948.js @@ -0,0 +1,50 @@ +// 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. + +// https://github.com/joyent/node/issues/4948 + +var common = require('../common'); +var http = require('http'); + +http.createServer(function(serverReq, serverRes){ + + http.request({hostname: 'localhost', port: common.PORT}, function(res) { + // required, just needs to be in the client response somewhere + serverRes.end(); + + // required for test to fail + res.on('data', function(data) {}); + }).end(); + + serverRes.write('some data'); +}).listen(common.PORT); + + +// simulate a client request that closes early +var net = require('net'); + +var sock = new net.Socket(); +sock.connect(common.PORT, 'localhost'); + +sock.on('connect', function() { + sock.write('GET / HTTP/1.1\r\n\r\n'); + sock.end(); +}); -- cgit v1.2.3