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

Merge branch 'elinks-0.12'

Browse Source 
Conflicts:
	src/document/dom/renderer.c
This commit is contained in:
Witold Filipczyk 2009-02-12 10:01:57 +01:00 committed by Witold Filipczyk
commit 9054e57c55
3 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
NEWS
View File

@ -95,7 +95,10 @@ Other changes:
title, note the charset. Don't truncate titles to the width of the title, note the charset. Don't truncate titles to the width of the
terminal. terminal.
* bug 1061: Correctly truncate UTF-8 titles in the tab bar. * bug 1061: Correctly truncate UTF-8 titles in the tab bar.
* minor bug 761: When reading bookmarks from an XBEL file, distinguish
attribute names from attribute values.
* enhancement: Updated ISO 8859-7, ISO 8859-16, KOI8-R, and MacRoman. * enhancement: Updated ISO 8859-7, ISO 8859-16, KOI8-R, and MacRoman.
* critical: bug 1067: crash in call_dom_stack_callbacks with RSS
ELinks 0.12pre2: ELinks 0.12pre2:
---------------- ----------------

3
configure.in
View File

@ -632,6 +632,9 @@ fi
AC_MSG_RESULT($cf_result) AC_MSG_RESULT($cf_result)
CONFIG_SPIDERMONKEY="$cf_result" CONFIG_SPIDERMONKEY="$cf_result"
if test "$cf_result" = "yes"; then
AC_CHECK_FUNCS([[JS_ReportAllocationOverflow]])
fi
EL_RESTORE_FLAGS EL_RESTORE_FLAGS
if test "x$CONFIG_SPIDERMONKEY" = xyes && if test "x$CONFIG_SPIDERMONKEY" = xyes &&

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

@ -195,7 +195,11 @@ utf8_to_jsstring(JSContext *ctx, const unsigned char *str, int length)
* Check whether the multiplication could overflow. */ * Check whether the multiplication could overflow. */
assert(!needs_utf16_surrogates(UCS_REPLACEMENT_CHARACTER)); assert(!needs_utf16_surrogates(UCS_REPLACEMENT_CHARACTER));
if (in_bytes > ((size_t) -1) / sizeof(jschar)) { if (in_bytes > ((size_t) -1) / sizeof(jschar)) {
#ifdef HAVE_JS_REPORTALLOCATIONOVERFLOW
JS_ReportAllocationOverflow(ctx); JS_ReportAllocationOverflow(ctx);
#else
JS_ReportOutOfMemory(ctx);
#endif
return NULL; return NULL;
} }
utf16_alloc = in_bytes; utf16_alloc = in_bytes;