From 818eb864b33ae08fb57bc3c196fba96f02c3786a Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Sun, 13 Jul 2014 12:00:30 +0200 Subject: [PATCH] Handle exceptions from JS_ParseJSON in XMLHttpRequest.response. --- src/components/script/dom/xmlhttprequest.rs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/components/script/dom/xmlhttprequest.rs b/src/components/script/dom/xmlhttprequest.rs index c20feae0437..40a1a9778b1 100644 --- a/src/components/script/dom/xmlhttprequest.rs +++ b/src/components/script/dom/xmlhttprequest.rs @@ -36,6 +36,7 @@ use http::method::{Method, Get, Head, Connect, Trace, ExtensionMethod}; use http::status::Status; use js::jsapi::{JS_AddObjectRoot, JS_ParseJSON, JS_RemoveObjectRoot, JSContext}; +use js::jsapi::JS_ClearPendingException; use js::jsval::{JSVal, NullValue, UndefinedValue}; use libc; @@ -617,7 +618,10 @@ impl<'a> XMLHttpRequestMethods<'a> for JSRef<'a, XMLHttpRequest> { let decoded = UTF_8.decode(self.response.deref().borrow().as_slice(), DecodeReplace).unwrap().to_string().to_utf16(); let mut vp = UndefinedValue(); unsafe { - JS_ParseJSON(cx, decoded.as_ptr(), decoded.len() as u32, &mut vp); + if JS_ParseJSON(cx, decoded.as_ptr(), decoded.len() as u32, &mut vp) == 0 { + JS_ClearPendingException(cx); + return NullValue(); + } } vp }