src: pass along errors from i18n converter instantiation

PR-URL: #25734 Reviewed-By: James M Snell <[email protected]> Reviewed-By: Gus Caplan <[email protected]>
nodejs · Jan 29, 2019 · 8e6667f · 8e6667f
1 parent 2c18d97
commit 8e6667f
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/src/node_i18n.cc b/src/node_i18n.cc
@@ -171,6 +171,11 @@ class ConverterObject : public BaseObject, Converter {
     Environment* env = Environment::GetCurrent(args);
     HandleScope scope(env->isolate());
 
+    Local<ObjectTemplate> t = ObjectTemplate::New(env->isolate());
+    t->SetInternalFieldCount(1);
+    Local<Object> obj;
+    if (!t->NewInstance(env->context()).ToLocal(&obj)) return;
+
     CHECK_GE(args.Length(), 2);
     Utf8Value label(env->isolate(), args[0]);
     int flags = args[1]->Uint32Value(env->context()).ToChecked();
@@ -190,9 +195,6 @@ class ConverterObject : public BaseObject, Converter {
                           nullptr, nullptr, nullptr, &status);
     }
 
-    Local<ObjectTemplate> t = ObjectTemplate::New(env->isolate());
-    t->SetInternalFieldCount(1);
-    Local<Object> obj = t->NewInstance(env->context()).ToLocalChecked();
     new ConverterObject(env, obj, conv, ignoreBOM);
     args.GetReturnValue().Set(obj);
   }