diff options
| author | Ben Noordhuis <info@bnoordhuis.nl> | 2013-11-11 11:31:36 +0100 |
|---|---|---|
| committer | Ben Noordhuis <info@bnoordhuis.nl> | 2013-11-12 22:10:57 +0100 |
| commit | 5235d71f89502febbdab3cb0ce432e345ccf7534 (patch) | |
| tree | 2cb257f7b53ec0fb292195ded7480980a18ba9ff | |
| parent | 27f115d715478b9a800927498ba606d4a62f927c (diff) | |
| download | node-5235d71f89502febbdab3cb0ce432e345ccf7534.tar.gz | |
src: use Context::Scope objects in cares_wrap.cc
Enter the context explicitly, don't rely on the fact that there is a
Context::Scope a few stack frames below because it may be gone someday
| -rw-r--r-- | src/cares_wrap.cc | 27 |
1 files changed, 18 insertions, 9 deletions
diff --git a/src/cares_wrap.cc b/src/cares_wrap.cc index 5cc19f48f..041d4a91f 100644 --- a/src/cares_wrap.cc +++ b/src/cares_wrap.cc @@ -367,7 +367,8 @@ class QueryAWrap: public QueryWrap { protected: void Parse(unsigned char* buf, int len) { - HandleScope scope(node_isolate); + HandleScope handle_scope(env()->isolate()); + Context::Scope context_scope(env()->context()); struct hostent* host; @@ -403,7 +404,8 @@ class QueryAaaaWrap: public QueryWrap { protected: void Parse(unsigned char* buf, int len) { - HandleScope scope(node_isolate); + HandleScope handle_scope(env()->isolate()); + Context::Scope context_scope(env()->context()); struct hostent* host; @@ -439,8 +441,8 @@ class QueryCnameWrap: public QueryWrap { protected: void Parse(unsigned char* buf, int len) { - HandleScope scope(node_isolate); - + HandleScope handle_scope(env()->isolate()); + Context::Scope context_scope(env()->context()); struct hostent* host; int status = ares_parse_a_reply(buf, len, &host, NULL, NULL); @@ -478,7 +480,8 @@ class QueryMxWrap: public QueryWrap { protected: void Parse(unsigned char* buf, int len) { - HandleScope scope(node_isolate); + HandleScope handle_scope(env()->isolate()); + Context::Scope context_scope(env()->context()); struct ares_mx_reply* mx_start; int status = ares_parse_mx_reply(buf, len, &mx_start); @@ -528,6 +531,8 @@ class QueryNsWrap: public QueryWrap { protected: void Parse(unsigned char* buf, int len) { + HandleScope handle_scope(env()->isolate()); + Context::Scope context_scope(env()->context()); struct hostent* host; int status = ares_parse_ns_reply(buf, len, &host); @@ -562,6 +567,8 @@ class QueryTxtWrap: public QueryWrap { protected: void Parse(unsigned char* buf, int len) { + HandleScope handle_scope(env()->isolate()); + Context::Scope context_scope(env()->context()); struct ares_txt_reply* txt_out; int status = ares_parse_txt_reply(buf, len, &txt_out); @@ -603,7 +610,8 @@ class QuerySrvWrap: public QueryWrap { protected: void Parse(unsigned char* buf, int len) { - HandleScope scope(node_isolate); + HandleScope handle_scope(env()->isolate()); + Context::Scope context_scope(env()->context()); struct ares_srv_reply* srv_start; int status = ares_parse_srv_reply(buf, len, &srv_start); @@ -660,7 +668,8 @@ class QueryNaptrWrap: public QueryWrap { protected: void Parse(unsigned char* buf, int len) { - HandleScope scope(node_isolate); + HandleScope handle_scope(env()->isolate()); + Context::Scope context_scope(env()->context()); ares_naptr_reply* naptr_start; int status = ares_parse_naptr_reply(buf, len, &naptr_start); @@ -740,8 +749,8 @@ class GetHostByAddrWrap: public QueryWrap { protected: void Parse(struct hostent* host) { - HandleScope scope(node_isolate); - + HandleScope handle_scope(env()->isolate()); + Context::Scope context_scope(env()->context()); this->CallOnComplete(HostentToNames(host)); } }; |