blackbeard420/weechat
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

javascript: fix crash in return of string values when WeeChat API function returns NULL

Browse Source
This commit is contained in:
Sébastien Helleu 2015-03-07 09:57:24 +01:00
parent dfb2c79cbb
commit bed4ee1f35
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/javascript/weechat-js-api.cpp
View File

@ -101,13 +101,17 @@ using namespace v8;
#define API_RETURN_EMPTY \
return String::New("");
#define API_RETURN_STRING(__string) \
return String::New(__string)
if (__string) \
return String::New(__string); \
return String::New("")
#define API_RETURN_STRING_FREE(__string) \
if (__string) \
{ \
Handle<Value> return_value = String::New(__string); \
free ((void *)__string); \
return return_value; \
}
} \
return String::New("")
#define API_RETURN_INT(__int) \
return Integer::New(__int)
#define API_RETURN_LONG(__int) \
@ -3188,6 +3192,9 @@ API_FUNC(buffer_get_string)
result = weechat_buffer_get_string (
(struct t_gui_buffer *)API_STR2PTR(*buffer),
*property);
weechat_log_printf ("buffer: %s", *buffer);
weechat_log_printf ("property: %s", *property);
weechat_log_printf ("result: %lx", result);
API_RETURN_STRING(result);
}