Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/node_ffi.cc
Original file line number Diff line number Diff line change
Expand Up @@ -602,7 +602,6 @@ void DynamicLibrary::InvokeFunction(const FunctionCallbackInfo<Value>& args) {
std::vector<uint64_t> values(expected_args, 0);
std::vector<void*> ffi_args(expected_args, nullptr);
std::vector<std::string> strings;
strings.reserve(expected_args);

for (unsigned int i = 0; i < expected_args; i++) {
FFIArgumentCategory res;
Expand All @@ -624,6 +623,10 @@ void DynamicLibrary::InvokeFunction(const FunctionCallbackInfo<Value>& args) {
return;
}

if (strings.empty()) {
// Keep string pointers stable as subsequent arguments are converted.
strings.reserve(expected_args);
}
strings.push_back(*str);
values[i] = reinterpret_cast<uint64_t>(strings.back().c_str());
ffi_args[i] = &values[i];
Expand Down
57 changes: 57 additions & 0 deletions test/ffi/test-ffi-invoke-string-storage.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
// Flags: --expose-internals
'use strict';

const common = require('../common');
common.skipIfFFIMissing();

const assert = require('node:assert');
const { internalBinding } = require('internal/test/binding');
const { DynamicLibrary, kSbInvokeSlow } = internalBinding('ffi');
// Capture the native method before node:ffi installs argument conversions.
const getFunction = DynamicLibrary.prototype.getFunction;
const ffi = require('node:ffi');
const { libraryPath, cString } = require('./ffi-test-common');

const lib = new ffi.DynamicLibrary(libraryPath);
const rawConcat = getFunction.call(lib, 'string_concat', {
arguments: ['pointer', 'pointer'],
return: 'pointer',
});
// String and Buffer arguments cannot use the scalar Fast API entrypoint.
// On SharedBuffer platforms, select its native fallback explicitly.
const concat = rawConcat[kSbInvokeSlow] ?? rawConcat;
const free = lib.getFunction('free_string', {
arguments: ['pointer'],
return: 'void',
});

try {
for (const [left, right] of [
['', ''],
['hello ', 'world'],
['a'.repeat(128), 'b'.repeat(128)],
['\u03b1', '\u03b2'],
]) {
for (const [a, b] of [
[left, right],
[cString(left), right],
[left, cString(right)],
[cString(left), cString(right)],
]) {
const result = concat(a, b);
try {
assert.strictEqual(ffi.toString(result), left + right);
} finally {
free(result);
}
}
}
assert.throws(() => concat('hello', 'bad\0string'), {
code: 'ERR_INVALID_ARG_VALUE',
});
assert.throws(() => concat('hello', 42), {
code: 'ERR_INVALID_ARG_VALUE',
});
} finally {
lib.close();
}
Loading