frida 16.3.0 → 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/meson.build

@@ -5,6 +5,9 @@ project('frida-node', 'cpp',
   meson_version: '>=1.1.0',
 )
 
+cpp = meson.get_compiler('cpp')
+strip = (cpp.get_argument_syntax() == 'msvc') ? '' : find_program('strip')
+
 node = find_program('node')
 npm = find_program('npm')
 python = import('python').find_installation()
@@ -75,6 +78,7 @@ endforeach
 
 extra_cpp_args = []
 extra_link_args = []
+extra_link_depends = []
 
 foreach d : node_defines
   extra_cpp_args += '-D' + d
@@ -125,6 +129,7 @@ binding = shared_module('frida_binding', frida_binding_sources,
     '-DFRIDA_' + runtime.underscorify().to_upper(),
   ] + extra_cpp_args,
   link_args: node_libs + extra_link_args,
+  link_depends: extra_link_depends,
   dependencies: [frida_core_dep, nan_dep],
   install: true,
   install_dir: pkg_install_dir / 'build',
@@ -136,6 +141,8 @@ custom_target('prebuild',
   command: [
     python,
     files('scripts' / 'package.py'),
+    '>>>', strip, '<<<',
+    get_option('strip').to_string(),
     '@INPUT@',
     '@OUTPUT@',
   ],

package/package.json

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

package/scripts/package.py

@@ -1,14 +1,54 @@
-from pathlib import Path
+import os
+import shutil
+import subprocess
 import sys
 import tarfile
+from pathlib import Path
+from typing import Optional
 
 
 def main(argv: list[str]):
-    binding = Path(argv[1])
-    outfile = Path(argv[2])
+    args = argv[1:]
+    strip_command = pop_cmd_array_arg(args)
+    strip_enabled = args.pop(0) == "true"
+    binding = Path(args.pop(0))
+    outfile = Path(args.pop(0))
+
+    intermediate_path = outfile.parent / f"{outfile.name}.tmp"
+    shutil.copy(binding, intermediate_path)
+
+    try:
+        if strip_enabled and strip_command is not None:
+            subprocess.run(
+                strip_command + [intermediate_path],
+                stdout=subprocess.PIPE,
+                stderr=subprocess.STDOUT,
+                encoding="utf-8",
+                check=True,
+            )
+
+        with tarfile.open(outfile, "w:gz") as tar:
+            tar.add(intermediate_path, arcname="build/frida_binding.node")
+    except subprocess.CalledProcessError as e:
+        print(e, file=sys.stderr)
+        print("Output:\n\t| " + "\n\t| ".join(e.output.strip().split("\n")), file=sys.stderr)
+        sys.exit(1)
+    finally:
+        os.unlink(intermediate_path)
+
 
-    with tarfile.open(outfile, "w:gz") as tar:
-        tar.add(binding, arcname="build/frida_binding.node")
+def pop_cmd_array_arg(args: list[str]) -> Optional[list[str]]:
+    result = []
+    first = args.pop(0)
+    assert first == ">>>"
+    while True:
+        cur = args.pop(0)
+        if cur == "<<<":
+            break
+        result.append(cur)
+    if len(result) == 1 and not result[0]:
+        return None
+    return result
 
 
 if __name__ == "__main__":

package/src/addon.symbols

@@ -0,0 +1 @@
+# No exported symbols.

package/src/addon.version

@@ -0,0 +1,4 @@
+{
+  local:
+    *;
+};

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/meson.build

@@ -25,3 +25,19 @@ frida_binding_sources = files(
   'glib_context.cc',
   'win_delay_load_hook.cc',
 )
+
+if system == 'windows'
+  if cpp.get_argument_syntax() != 'msvc'
+    symfile = 'addon.symbols'
+    extra_link_args += '-Wl,--retain-symbols-file,' + meson.current_source_dir() / symfile
+    extra_link_depends += files(symfile)
+  endif
+elif system == 'darwin'
+  symlist = 'addon.symbols'
+  extra_link_args += '-Wl,-exported_symbols_list,' + meson.current_source_dir() / symlist
+  extra_link_depends += files(symlist)
+else
+  symscript = 'addon.version'
+  extra_link_args += '-Wl,--version-script,' + meson.current_source_dir() / symscript
+  extra_link_depends += files(symscript)
+endif

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.0
+revision = 16.3.3
 depth = 1
 
 [provide]