Created
December 30, 2011 00:08
-
-
Save ry/1536827 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
From 272ef4891ccdb23f267b984e0f47c0274961604d Mon Sep 17 00:00:00 2001 | |
From: Ryan Dahl <ry@tinyclouds.org> | |
Date: Thu, 29 Dec 2011 16:06:14 -0800 | |
Subject: [PATCH] Potential fix for #2438 | |
--- | |
src/node_http_parser.cc | 28 ++++++++++++++++++++++++++++ | |
1 files changed, 28 insertions(+), 0 deletions(-) | |
diff --git a/src/node_http_parser.cc b/src/node_http_parser.cc | |
index 38251a1..4df3ac3 100644 | |
--- a/src/node_http_parser.cc | |
+++ b/src/node_http_parser.cc | |
@@ -179,6 +179,19 @@ struct StringPtr { | |
} | |
+ // If str_ does not point to a heap string yet, this function makes it do | |
+ // so. This is called at the end of each http_parser_execute() so as not | |
+ // to leak references. See issue #2438 and test-http-parser-bad-ref.js. | |
+ void Save() { | |
+ if (!on_heap_) { | |
+ char* s = new char[size_]; | |
+ memcpy(s, str_, size_); | |
+ str_ = s; | |
+ on_heap_ = true; | |
+ } | |
+ } | |
+ | |
+ | |
void Reset() { | |
if (on_heap_) { | |
delete[] str_; | |
@@ -401,6 +414,19 @@ public: | |
} | |
+ void Save() { | |
+ url_.Save(); | |
+ | |
+ for (int i = 0; i < num_fields_; i++) { | |
+ fields_[i].Save(); | |
+ } | |
+ | |
+ for (int i = 0; i < num_values_; i++) { | |
+ values_[i].Save(); | |
+ } | |
+ } | |
+ | |
+ | |
// var bytesParsed = parser->execute(buffer, off, len); | |
static Handle<Value> Execute(const Arguments& args) { | |
HandleScope scope; | |
@@ -447,6 +473,8 @@ public: | |
size_t nparsed = | |
http_parser_execute(&parser->parser_, &settings, buffer_data + off, len); | |
+ parser->Save(); | |
+ | |
// Unassign the 'buffer_' variable | |
assert(current_buffer); | |
current_buffer = NULL; | |
-- | |
1.7.2 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment