Improve handling of failed integer type conversions.

Source/bindings/v8/custom/V8HTMLOptionsCollectionCustom.cpp

 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 16 matching lines @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 #include "V8HTMLOptionsCollection.h"
 
 #include "V8HTMLOptionElement.h"
 #include "V8Node.h"
 #include "V8NodeList.h"
-#include "bindings/v8/ExceptionMessages.h"
 #include "bindings/v8/ExceptionState.h"
 #include "bindings/v8/V8Binding.h"
 #include "core/dom/ExceptionCode.h"
 #include "core/dom/NamedNodesCollection.h"
 #include "core/html/HTMLOptionElement.h"
 #include "core/html/HTMLOptionsCollection.h"
 #include "core/html/HTMLSelectElement.h"
 
 namespace WebCore {
 
@@ skipping 28 matching lines @@
     ExceptionState exceptionState(ExceptionState::ExecutionContext, "add", "HTMLOptionsCollection", info.Holder(), info.GetIsolate());
     if (!V8HTMLOptionElement::hasInstance(info[0], info.GetIsolate(), worldType(info.GetIsolate()))) {
         exceptionState.throwTypeError("The element provided was not an HTMLOptionElement.");
     } else {
         HTMLOptionsCollection* imp = V8HTMLOptionsCollection::toNative(info.Holder());
         HTMLOptionElement* option = V8HTMLOptionElement::toNative(v8::Handle<v8::Object>(v8::Handle<v8::Object>::Cast(info[0])));
 
         if (info.Length() < 2) {
             imp->add(option, exceptionState);
         } else {
-            bool ok;
-            V8TRYCATCH_VOID(int, index, toInt32(info[1], ok));
-            if (!ok)
-                exceptionState.throwTypeError("The index provided could not be interpreted as an integer.");
-            else
-                imp->add(option, index, exceptionState);
+            int index = toInt32(info[1], exceptionState);
+            if (exceptionState.throwIfNeeded())
+                return;
+
+            imp->add(option, index, exceptionState);
         }
     }
 
     exceptionState.throwIfNeeded();
 }
 
 void V8HTMLOptionsCollection::lengthAttributeSetterCustom(v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
 {
     HTMLOptionsCollection* imp = V8HTMLOptionsCollection::toNative(info.Holder());
     double v = value->NumberValue();
     unsigned newLength = 0;
     ExceptionState exceptionState(ExceptionState::SetterContext, "length", "HTMLOptionsCollection", info.Holder(), info.GetIsolate());
     if (!std::isnan(v) && !std::isinf(v)) {
         if (v < 0.0)
             exceptionState.throwDOMException(IndexSizeError, "The value provided (" + String::number(v) + ") is negative. Lengths must be greater than or equal to 0.");
         else if (v > static_cast<double>(UINT_MAX))
             newLength = UINT_MAX;
         else
             newLength = static_cast<unsigned>(v);
     }
 
     if (exceptionState.throwIfNeeded())
         return;
 
     imp->setLength(newLength, exceptionState);
 }
 
 } // namespace WebCore