frida 16.3.1 → 16.3.3

package/dist/device.js

@@ -97,11 +97,8 @@ class Device {
         return this.impl.spawn(program, argv, envp, env, cwd, stdio, aux, cancellable);
         function consumeOption(name) {
             const value = pendingOptions[name];
-            if (value === undefined) {
-                return null;
-            }
             delete pendingOptions[name];
-            return value;
+            return value !== null && value !== void 0 ? value : null;
         }
     }
     async input(target, data, cancellable) {

package/lib/device.ts

@@ -141,11 +141,8 @@ export class Device {
 
         function consumeOption(name) {
             const value = pendingOptions[name];
-            if (value === undefined) {
-                return null;
-            }
             delete pendingOptions[name];
-            return value;
+            return value ?? null;
         }
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "frida",
-  "version": "16.3.1",
+  "version": "16.3.3",
   "authors": [
     "Frida Developers"
   ],

package/src/device.cc

@@ -759,11 +759,19 @@ NAN_METHOD(Device::Spawn) {
       for (uint32_t i = 0; i != n; i++) {
         auto key = Nan::Get(keys, i).ToLocalChecked();
         auto value = Nan::Get(object, key).ToLocalChecked();
+        if (value->IsUndefined()) {
+          continue;
+        }
 
-        Nan::Utf8String key_str(key);
+        Nan::Utf8String k(key);
 
-        g_hash_table_insert(aux, g_strdup(*key_str),
-            g_variant_ref_sink(Runtime::ValueToVariant(value)));
+        auto v = Runtime::ValueToVariant(value);
+        if (v == NULL) {
+          valid = false;
+          break;
+        }
+
+        g_hash_table_insert(aux, g_strdup(*k), g_variant_ref_sink(v));
       }
     } else {
       Nan::ThrowTypeError("Bad argument, 'aux' must be an object");

package/src/runtime.cc

@@ -280,8 +280,12 @@ GVariant* Runtime::ValueToVariant(Local<Value> value) {
     auto array = Local<Array>::Cast(value);
     uint32_t n = array->Length();
     for (uint32_t i = 0; i != n; i++) {
-      auto element_value = Nan::Get(array, i).ToLocalChecked();
-      g_variant_builder_add(&builder, "v", ValueToVariant(element_value));
+      auto v = ValueToVariant(Nan::Get(array, i).ToLocalChecked());
+      if (v == NULL) {
+        g_variant_builder_clear(&builder);
+        return NULL;
+      }
+      g_variant_builder_add(&builder, "v", v);
     }
 
     return g_variant_builder_end(&builder);
@@ -302,9 +306,19 @@ GVariant* Runtime::ValueToVariant(Local<Value> value) {
     for (uint32_t i = 0; i != n; i++) {
       auto key = Nan::Get(names, i).ToLocalChecked();
       auto val = Nan::Get(object, key).ToLocalChecked();
+      if (val->IsUndefined()) {
+        continue;
+      }
+
+      Nan::Utf8String k(key);
+
+      auto v = ValueToVariant(val);
+      if (v == NULL) {
+        g_variant_builder_clear(&builder);
+        return NULL;
+      }
 
-      Nan::Utf8String key_str(key);
-      g_variant_builder_add(&builder, "{sv}", *key_str, ValueToVariant(val));
+      g_variant_builder_add(&builder, "{sv}", *k, v);
     }
 
     return g_variant_builder_end(&builder);

package/subprojects/frida-core.wrap

@@ -1,6 +1,6 @@
 [wrap-git]
 url = https://github.com/frida/frida-core.git
-revision = 16.3.1
+revision = 16.3.3
 depth = 1
 
 [provide]