fixup: handle c++ error properly

BridgeAR · BridgeAR · commit 3c83e47e2287 · 2018-08-19T20:30:32.000+02:00
diff --git a/src/node_util.cc b/src/node_util.cc
@@ -21,14 +21,21 @@ static void GetOwnNonIndicesProperties(
   Environment* env = Environment::GetCurrent(args);
   Local<Context> context = env->context();
 
+  if (!args[0]->IsObject())
+    return;
+
   v8::Local<v8::Object> object = args[0].As<v8::Object>();
 
   // Return only non-enumerable properties by default.
-  v8::Local<v8::Array> properties = object
-    ->GetPropertyNames(context, v8::KeyCollectionMode::kOwnOnly,
-                       v8::ONLY_ENUMERABLE,
-                       v8::IndexFilter::kSkipIndices)
-      .ToLocalChecked();
+  v8::Local<v8::Array> properties;
+
+  if (!object->GetPropertyNames(
+        context, v8::KeyCollectionMode::kOwnOnly,
+        v8::ONLY_ENUMERABLE,
+        v8::IndexFilter::kSkipIndices)
+          .ToLocal(&properties)) {
+    return;
+  }
   args.GetReturnValue().Set(properties);
 }
 
diff --git a/test/parallel/test-assert-deep.js b/test/parallel/test-assert-deep.js
@@ -893,6 +893,17 @@ assert.deepStrictEqual(obj1, obj2);
                '  [\n    1,\n+   2\n-   2,\n-   3\n  ]' }
   );
   util.inspect.defaultOptions = tmp;
+
+  const invalidTrap = new Proxy([1, 2, 3], {
+    ownKeys() { return []; }
+  });
+  assert.throws(
+    () => assert.deepStrictEqual(invalidTrap, [1, 2, 3]),
+    {
+      name: 'TypeError',
+      message: "'ownKeys' on proxy: trap result did not include 'length'"
+    }
+  );
 }
 
 // Basic valueOf check.
