aniani/elinks
1
0
Fork 0
mirror of https://github.com/rkd77/elinks.git synced 2024-12-04 14:46:47 -05:00
Code

Rework smjs_load_hooks not to free path until it is done and to always

Browse Source 
call done_string on the script string, even when add_file_to_string fails.
This commit is contained in:
Miciah Dashiel Butler Masters 2005-12-19 19:08:34 +00:00 committed by Miciah Dashiel Butler Masters
parent 7b6afb52c8
commit 5ca5381fbc
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/scripting/smjs/core.c
View File

@ -71,7 +71,6 @@ void
smjs_load_hooks(void) smjs_load_hooks(void)
{ {
jsval rval; jsval rval;
struct string *string;
struct string script; struct string script;
unsigned char *path; unsigned char *path;
@ -83,15 +82,13 @@ smjs_load_hooks(void)
path = stracpy(CONFDIR "/" SMJS_HOOKS_FILENAME); path = stracpy(CONFDIR "/" SMJS_HOOKS_FILENAME);
} }
string = add_file_to_string(&script, path); if (add_file_to_string(&script, path)
mem_free(path); && JS_FALSE == JS_EvaluateScript(smjs_ctx,
if (!string) return;
if (JS_FALSE == JS_EvaluateScript(smjs_ctx,
JS_GetGlobalObject(smjs_ctx), JS_GetGlobalObject(smjs_ctx),
script.source, script.length, path, 1, &rval)) script.source, script.length, path, 1, &rval))
alert_smjs_error("error loading default script file"); alert_smjs_error("error loading default script file");
mem_free(path);
done_string(&script); done_string(&script);
} }