Commit b3f366ff authored by deuce's avatar deuce
Browse files

Add JSVALUE_TO_STRING() macro and ensure NULL returns on errors.

parent 630d800d
......@@ -128,15 +128,24 @@ extern int thread_suid_broken; /* NPTL is no longer broken */
size_t pos; \
const jschar *val; \
\
if((val=JS_GetStringCharsAndLength(cx, str, &len))) { \
if((ret=alloca(len+1))) { \
for(pos=0; pos<len; pos++) \
ret[pos]=val[pos]; \
ret[len]=0; \
ret=NULL; \
if(str != NULL) { \
if((val=JS_GetStringCharsAndLength(cx, str, &len))) { \
if((ret=(char *)alloca(len+1))) { \
for(pos=0; pos<len; pos++) \
ret[pos]=val[pos]; \
ret[len]=0; \
} \
} \
} \
}
#define JSVALUE_TO_STRING(cx, val, ret) \
{ \
JSString str=JS_ValueToString(cx, val); \
JSSTRING_TO_STRING(cx, str, ret); \
}
#endif
#ifdef USE_CRYPTLIB
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment