Merge branch 'elinks-0.12'

Conflicts:
	src/document/dom/renderer.c

NEWS

@@ -95,7 +95,10 @@ Other changes:
   title, note the charset.  Don't truncate titles to the width of the
   terminal.
 * 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.
+* critical: bug 1067: crash in call_dom_stack_callbacks with RSS
 
 ELinks 0.12pre2:
 ----------------

configure.in

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

src/scripting/smjs/core.c

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