1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add HandleScope to http-parser binding

Browse Source 
Fixes production crashes. We were not able to reproduce in the test suite.
This commit is contained in:
Ryan Dahl 2011-12-21 12:01:39 -08:00
parent 07c27e040e
commit 73cf8e82e7
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/node_http_parser.cc
View File

@ -119,15 +119,17 @@ static size_t current_buffer_len;
#define HTTP_CB(name) \ #define HTTP_CB(name) \
static int name(http_parser* p_) { \ static int name(http_parser* p_) { \
Parser* self = container_of(p_, Parser, parser_); \ HandleScope scope; \
return self->name##_(); \ Parser* self = container_of(p_, Parser, parser_); \
} \ return self->name##_(); \
int always_inline name##_() } \
int always_inline name##_()
#define HTTP_DATA_CB(name) \ #define HTTP_DATA_CB(name) \
static int name(http_parser* p_, const char* at, size_t length) { \ static int name(http_parser* p_, const char* at, size_t length) { \
HandleScope scope; \
Parser* self = container_of(p_, Parser, parser_); \ Parser* self = container_of(p_, Parser, parser_); \
return self->name##_(at, length); \ return self->name##_(at, length); \
} \ } \
@ -212,10 +214,12 @@ struct StringPtr {
Handle<String> ToString() const { Handle<String> ToString() const {
if (str_) HandleScope scope;
return String::New(str_, size_); if (str_) {
else return scope.Close(String::New(str_, size_));
return String::Empty(); } else {
return scope.Close(String::Empty());
}
} }
@ -513,6 +517,8 @@ public:
private: private:
Local<Array> CreateHeaders() { Local<Array> CreateHeaders() {
HandleScope scope;
// num_values_ is either -1 or the entry # of the last header // num_values_ is either -1 or the entry # of the last header
// so num_values_ == 0 means there's a single header // so num_values_ == 0 means there's a single header
Local<Array> headers = Array::New(2 * (num_values_ + 1)); Local<Array> headers = Array::New(2 * (num_values_ + 1));
@ -522,7 +528,7 @@ private:
headers->Set(2 * i + 1, values_[i].ToString()); headers->Set(2 * i + 1, values_[i].ToString());
} }
return headers; return scope.Close(headers);
} }