Gitweb links: ...log http://git.netsurf-browser.org/nsgenbind.git/shortlog/d81d30699f57f0ca41b... ...commit http://git.netsurf-browser.org/nsgenbind.git/commit/d81d30699f57f0ca41b91... ...tree http://git.netsurf-browser.org/nsgenbind.git/tree/d81d30699f57f0ca41b917c... The branch, master has been updated via d81d30699f57f0ca41b917c854ef6d0875a18129 (commit) from 5c2dc7300edb6449b29285818fde794ce2669f29 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commitdiff http://git.netsurf-browser.org/nsgenbind.git/commit/?id=d81d30699f57f0ca4... commit d81d30699f57f0ca41b917c854ef6d0875a18129 Author: John-Mark Bell <jmb(a)netsurf-browser.org&gt; Commit: John-Mark Bell <jmb(a)netsurf-browser.org&gt; Make generated string attribute getters cope with libdom returning NULL. Fixes #2415, #2418. diff --git a/src/duk-libdom-generated.c b/src/duk-libdom-generated.c index e40c43e..bae0826 100644 --- a/src/duk-libdom-generated.c +++ b/src/duk-libdom-generated.c @@ -97,10 +97,14 @@ output_generated_attribute_getter(FILE* outf, "\t\treturn 0;\n" "\t}\n" "\n" - "\tduk_push_lstring(ctx,\n" - "\t\tdom_string_data(str),\n" - "\t\tdom_string_length(str));\n" - "\tdom_string_unref(str);\n" + "\tif (str != NULL) {\n" + "\t\tduk_push_lstring(ctx,\n" + "\t\t\tdom_string_data(str),\n" + "\t\t\tdom_string_length(str));\n" + "\t\tdom_string_unref(str);\n" + "\t} else {\n" + "\t\tduk_push_lstring(ctx, NULL, 0);\n" + "\t}\n" "\n" "\treturn 1;\n"); break; ----------------------------------------------------------------------- Summary of changes: src/duk-libdom-generated.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/duk-libdom-generated.c b/src/duk-libdom-generated.c index e40c43e..bae0826 100644 --- a/src/duk-libdom-generated.c +++ b/src/duk-libdom-generated.c @@ -97,10 +97,14 @@ output_generated_attribute_getter(FILE* outf, "\t\treturn 0;\n" "\t}\n" "\n" - "\tduk_push_lstring(ctx,\n" - "\t\tdom_string_data(str),\n" - "\t\tdom_string_length(str));\n" - "\tdom_string_unref(str);\n" + "\tif (str != NULL) {\n" + "\t\tduk_push_lstring(ctx,\n" + "\t\t\tdom_string_data(str),\n" + "\t\t\tdom_string_length(str));\n" + "\t\tdom_string_unref(str);\n" + "\t} else {\n" + "\t\tduk_push_lstring(ctx, NULL, 0);\n" + "\t}\n" "\n" "\treturn 1;\n"); break; -- NetSurf Generator for JavaScript bindings