From f40d7bb816fe010155be0df63456178088f4657e Mon Sep 17 00:00:00 2001
From: Ms2ger <Ms2ger@gmail.com>
Date: Mon, 19 Sep 2016 15:15:50 +0200
Subject: [PATCH] Return a ConversionResult::Failure when converting a
 non-iterable value to Vec.

---
 mozjs/js/rust/src/conversions.rs      | 6 +++++-
 mozjs/js/rust/tests/vec_conversion.rs | 9 +++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/mozjs/js/rust/src/conversions.rs b/mozjs/js/rust/src/conversions.rs
index 61f82c8bfda..0ce0c03caba 100644
--- a/mozjs/js/rust/src/conversions.rs
+++ b/mozjs/js/rust/src/conversions.rs
@@ -580,10 +580,14 @@ impl<C: Clone, T: FromJSValConvertible<Config=C>> FromJSValConvertible for Vec<T
         let mut iterator = ForOfIteratorGuard::new(cx, &mut iterator);
         let iterator = &mut *iterator.root;
 
-        if !iterator.init(value, JS::ForOfIterator_NonIterableBehavior::ThrowOnNonIterable) {
+        if !iterator.init(value, JS::ForOfIterator_NonIterableBehavior::AllowNonIterable) {
             return Err(())
         }
 
+        if iterator.iterator.ptr.is_null() {
+            return Ok(ConversionResult::Failure("Value is not iterable".into()));
+        }
+
         let mut ret = vec![];
 
         loop {
diff --git a/mozjs/js/rust/tests/vec_conversion.rs b/mozjs/js/rust/tests/vec_conversion.rs
index 34f816b774e..033fbcafea9 100644
--- a/mozjs/js/rust/tests/vec_conversion.rs
+++ b/mozjs/js/rust/tests/vec_conversion.rs
@@ -7,6 +7,7 @@ extern crate js;
 
 use js::ac::AutoCompartment;
 use js::conversions::ConversionBehavior;
+use js::conversions::ConversionResult;
 use js::conversions::FromJSValConvertible;
 use js::conversions::ToJSValConvertible;
 use js::jsapi::root::JS::CompartmentOptions;
@@ -67,5 +68,13 @@ fn vec_conversion() {
                                  ConversionBehavior::Default).unwrap();
 
         assert_eq!(&orig_vec, converted.get_success_value().unwrap());
+
+        rt.evaluate_script(global, "({})", "test", 1, rval.handle_mut()).unwrap();
+        let converted = Vec::<i32>::from_jsval(cx, rval.handle(),
+                                               ConversionBehavior::Default);
+        assert!(match converted {
+            Ok(ConversionResult::Failure(_)) => true,
+            _ => false,
+        });
     }
 }