fixup local checks

nodejs · Feb 10, 2020 · f6d4dac · f6d4dac
1 parent 61c5de0
commit f6d4dac
Showing 1 changed file with 24 additions and 10 deletions.
diff --git a/src/module_wrap.cc b/src/module_wrap.cc
@@ -997,11 +997,18 @@ Maybe<URL> ResolveExportsTarget(Environment* env,
           Maybe<URL> resolved = ResolveExportsTarget(env, pjson_url,
               target_item, subpath, pkg_subpath, base);
           if (resolved.IsNothing()) {
-            CHECK(try_catch.HasCaught() && !try_catch.Exception().IsEmpty());
-            auto e = try_catch.Exception()->ToObject(context).ToLocalChecked();
-            auto code = e->Get(context, env->code_string()).ToLocalChecked();
-            Utf8Value code_utf8(env->isolate(),
-                                code->ToString(context).ToLocalChecked());
+            CHECK(try_catch.HasCaught());
+            if (try_catch.Exception().IsEmpty()) return Nothing<URL>();
+            Local<Object> e;
+            if (!try_catch.Exception()->ToObject(context).ToLocal(&e))
+              return Nothing<URL>();
+            Local<Value> code;
+            if (!e->Get(context, env->code_string()).ToLocal(&code))
+              return Nothing<URL>();
+            Local<String> code_string;
+            if (!code->ToString(context).ToLocal(&code_string))
+              return Nothing<URL>();
+            Utf8Value code_utf8(env->isolate(), code_string);
             if (strcmp(*code_utf8, "ERR_PACKAGE_PATH_NOT_EXPORTED") == 0 ||
                 strcmp(*code_utf8, "ERR_INVALID_PACKAGE_TARGET") == 0) {
               continue;
@@ -1046,11 +1053,18 @@ Maybe<URL> ResolveExportsTarget(Environment* env,
           Maybe<URL> resolved = ResolveExportsTarget(env, pjson_url,
               conditionalTarget, subpath, pkg_subpath, base);
           if (resolved.IsNothing()) {
-            CHECK(try_catch.HasCaught() && !try_catch.Exception().IsEmpty());
-            auto e = try_catch.Exception()->ToObject(context).ToLocalChecked();
-            auto code = e->Get(context, env->code_string()).ToLocalChecked();
-            Utf8Value code_utf8(env->isolate(),
-                                code->ToString(context).ToLocalChecked());
+            CHECK(try_catch.HasCaught());
+            if (try_catch.Exception().IsEmpty()) return Nothing<URL>();
+            Local<Object> e;
+            if (!try_catch.Exception()->ToObject(context).ToLocal(&e))
+              return Nothing<URL>();
+            Local<Value> code;
+            if (!e->Get(context, env->code_string()).ToLocal(&code))
+              return Nothing<URL>();
+            Local<String> code_string;
+            if (!code->ToString(context).ToLocal(&code_string))
+              return Nothing<URL>();
+            Utf8Value code_utf8(env->isolate(), code_string);
             if (strcmp(*code_utf8, "ERR_PACKAGE_PATH_NOT_EXPORTED") == 0)
               continue;
             try_catch.ReThrow();