Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel

This commit is contained in:
Michael Hackstein 2013-07-11 13:45:05 +02:00
parent 47d9ffc174 fd2a83123c
commit e4e55bc52d
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/V8/v8-conv.cpp
View File

@ -1459,7 +1459,7 @@ TRI_json_t* TRI_ObjectToJson (v8::Handle<v8::Value> parameter) {
if (*str != 0) { if (*str != 0) {
TRI_json_t* j = TRI_CreateString2Json(TRI_UNKNOWN_MEM_ZONE, *str, str.length()); TRI_json_t* j = TRI_CreateString2Json(TRI_UNKNOWN_MEM_ZONE, *str, str.length());
// this passes ownership for the utf8 string to the JSON object // this passes ownership for the utf8 string to the JSON object
str.disown(); str.steal();
// the Utf8ValueNFC dtor won't free the string now // the Utf8ValueNFC dtor won't free the string now
return j; return j;
@ -1507,7 +1507,7 @@ TRI_json_t* TRI_ObjectToJson (v8::Handle<v8::Value> parameter) {
// move the string pointer into the JSON object // move the string pointer into the JSON object
TRI_Insert4ArrayJson(TRI_UNKNOWN_MEM_ZONE, arrayJson, *str, str.length(), result, false); TRI_Insert4ArrayJson(TRI_UNKNOWN_MEM_ZONE, arrayJson, *str, str.length(), result, false);
// this passes ownership for the utf8 string to the JSON object // this passes ownership for the utf8 string to the JSON object
str.disown(); str.steal();
} }
TRI_Free(TRI_UNKNOWN_MEM_ZONE, result); TRI_Free(TRI_UNKNOWN_MEM_ZONE, result);

2
lib/V8/v8-utils.h
View File

@ -51,7 +51,7 @@ class TRI_Utf8ValueNFC {
char* operator* () { return _str; } char* operator* () { return _str; }
const char* operator* () const { return _str; } const char* operator* () const { return _str; }
size_t length () const { return _length; } size_t length () const { return _length; }
void disown () { _str = 0; } char* steal () { char* tmp = _str; _str = 0; return tmp; }
private: private:
char* _str; char* _str;
size_t _length; size_t _length;