Commit 9024ec2

Browse files
trivikraduh95
authored andcommitted
ffi: keep FFI functions non-constructible
Use concise method functions for Fast API and shared-buffer wrappers, and create native fallback functions with ConstructorBehavior::kThrow, so FFI functions remain non-constructible on all invocation paths. Signed-off-by: Kamat, Trivikram <16024985+trivikr@users.noreply.github.com> Assisted-by: codex:gpt-5.6-sol PR-URL: #65184Fixes: #65183 Reviewed-By: Paolo Insogna <paolo@cowtech.it>
1 parent fdc1e78 commit 9024ec2

4 files changed

Lines changed: 75 additions & 45 deletions

File tree

‎lib/internal/ffi-shared-buffer.js‎

Lines changed: 36 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,8 @@ function inheritMetadata(wrapper, rawFn, nargs) {
198198
// arguments out of it into invocation-local storage before `ffi_call` and
199199
// reads the return value back only after, so nested/reentrant calls into
200200
// the same function are safe.
201+
// Concise methods do not have [[Construct]], unlike function expressions, so
202+
// use them below to match the native FFI functions' non-constructible behavior.
201203
functionwrapWithSharedBuffer(rawFn,signature){
202204
if(rawFn==null)returnrawFn;
203205
constbuffer=rawFn[kSbSharedBuffer];
@@ -254,7 +256,7 @@ function wrapWithSharedBuffer(rawFn, signature) {
254256
// so arity specialization wouldn't buy much here.
255257
assert(slowInvoke!==undefined,
256258
'FFI: shared-buffer raw function with pointer arguments is missing kSbInvokeSlow');
257-
wrapper=function(...args){
259+
wrapper={invoke(...args){
258260
if(args.length!==nargs){
259261
throwFFIArgCountError(nargs,args.length);
260262
}
@@ -271,7 +273,7 @@ function wrapWithSharedBuffer(rawFn, signature) {
271273
}
272274
rawFn();
273275
returnretGetter===null ? undefined : retGetter(view,0,true);
274-
};
276+
}}.invoke;
275277
}else{
276278
// Arity specialization avoids the per-call `Array` allocation of
277279
// `...args`; the void/non-void split removes a per-call branch on
@@ -295,67 +297,67 @@ function buildNumericWrapper(
295297
/* c8 ignore start */
296298
if(nargs===0){
297299
if(retGetter===null){
298-
returnfunction(){
300+
return{invoke(){
299301
if(arguments.length!==0){
300302
throwFFIArgCountError(0,arguments.length);
301303
}
302304
rawFn();
303-
};
305+
}}.invoke;
304306
}
305-
returnfunction(){
307+
return{invoke(){
306308
if(arguments.length!==0){
307309
throwFFIArgCountError(0,arguments.length);
308310
}
309311
rawFn();
310312
returnretGetter(view,0,true);
311-
};
313+
}}.invoke;
312314
}
313315
/* c8 ignore stop */
314316
if(nargs===1){
315317
consti0=argInfos[0];
316318
consto0=argOffsets[0];
317319
if(retGetter===null){
318-
returnfunction(a0){
320+
return{invoke(a0){
319321
if(arguments.length!==1){
320322
throwFFIArgCountError(1,arguments.length);
321323
}
322324
writeNumericArg(view,i0,o0,a0,0);
323325
rawFn();
324-
};
326+
}}.invoke;
325327
}
326-
returnfunction(a0){
328+
return{invoke(a0){
327329
if(arguments.length!==1){
328330
throwFFIArgCountError(1,arguments.length);
329331
}
330332
writeNumericArg(view,i0,o0,a0,0);
331333
rawFn();
332334
returnretGetter(view,0,true);
333-
};
335+
}}.invoke;
334336
}
335337
if(nargs===2){
336338
consti0=argInfos[0];
337339
consti1=argInfos[1];
338340
consto0=argOffsets[0];
339341
consto1=argOffsets[1];
340342
if(retGetter===null){
341-
returnfunction(a0,a1){
343+
return{invoke(a0,a1){
342344
if(arguments.length!==2){
343345
throwFFIArgCountError(2,arguments.length);
344346
}
345347
writeNumericArg(view,i0,o0,a0,0);
346348
writeNumericArg(view,i1,o1,a1,1);
347349
rawFn();
348-
};
350+
}}.invoke;
349351
}
350-
returnfunction(a0,a1){
352+
return{invoke(a0,a1){
351353
if(arguments.length!==2){
352354
throwFFIArgCountError(2,arguments.length);
353355
}
354356
writeNumericArg(view,i0,o0,a0,0);
355357
writeNumericArg(view,i1,o1,a1,1);
356358
rawFn();
357359
returnretGetter(view,0,true);
358-
};
360+
}}.invoke;
359361
}
360362
if(nargs===3){
361363
consti0=argInfos[0];
@@ -365,17 +367,17 @@ function buildNumericWrapper(
365367
consto1=argOffsets[1];
366368
consto2=argOffsets[2];
367369
if(retGetter===null){
368-
returnfunction(a0,a1,a2){
370+
return{invoke(a0,a1,a2){
369371
if(arguments.length!==3){
370372
throwFFIArgCountError(3,arguments.length);
371373
}
372374
writeNumericArg(view,i0,o0,a0,0);
373375
writeNumericArg(view,i1,o1,a1,1);
374376
writeNumericArg(view,i2,o2,a2,2);
375377
rawFn();
376-
};
378+
}}.invoke;
377379
}
378-
returnfunction(a0,a1,a2){
380+
return{invoke(a0,a1,a2){
379381
if(arguments.length!==3){
380382
throwFFIArgCountError(3,arguments.length);
381383
}
@@ -384,7 +386,7 @@ function buildNumericWrapper(
384386
writeNumericArg(view,i2,o2,a2,2);
385387
rawFn();
386388
returnretGetter(view,0,true);
387-
};
389+
}}.invoke;
388390
}
389391
if(nargs===4){
390392
consti0=argInfos[0];
@@ -396,7 +398,7 @@ function buildNumericWrapper(
396398
consto2=argOffsets[2];
397399
consto3=argOffsets[3];
398400
if(retGetter===null){
399-
returnfunction(a0,a1,a2,a3){
401+
return{invoke(a0,a1,a2,a3){
400402
if(arguments.length!==4){
401403
throwFFIArgCountError(4,arguments.length);
402404
}
@@ -405,9 +407,9 @@ function buildNumericWrapper(
405407
writeNumericArg(view,i2,o2,a2,2);
406408
writeNumericArg(view,i3,o3,a3,3);
407409
rawFn();
408-
};
410+
}}.invoke;
409411
}
410-
returnfunction(a0,a1,a2,a3){
412+
return{invoke(a0,a1,a2,a3){
411413
if(arguments.length!==4){
412414
throwFFIArgCountError(4,arguments.length);
413415
}
@@ -417,7 +419,7 @@ function buildNumericWrapper(
417419
writeNumericArg(view,i3,o3,a3,3);
418420
rawFn();
419421
returnretGetter(view,0,true);
420-
};
422+
}}.invoke;
421423
}
422424
if(nargs===5){
423425
consti0=argInfos[0];
@@ -431,7 +433,7 @@ function buildNumericWrapper(
431433
consto3=argOffsets[3];
432434
consto4=argOffsets[4];
433435
if(retGetter===null){
434-
returnfunction(a0,a1,a2,a3,a4){
436+
return{invoke(a0,a1,a2,a3,a4){
435437
if(arguments.length!==5){
436438
throwFFIArgCountError(5,arguments.length);
437439
}
@@ -441,9 +443,9 @@ function buildNumericWrapper(
441443
writeNumericArg(view,i3,o3,a3,3);
442444
writeNumericArg(view,i4,o4,a4,4);
443445
rawFn();
444-
};
446+
}}.invoke;
445447
}
446-
returnfunction(a0,a1,a2,a3,a4){
448+
return{invoke(a0,a1,a2,a3,a4){
447449
if(arguments.length!==5){
448450
throwFFIArgCountError(5,arguments.length);
449451
}
@@ -454,7 +456,7 @@ function buildNumericWrapper(
454456
writeNumericArg(view,i4,o4,a4,4);
455457
rawFn();
456458
returnretGetter(view,0,true);
457-
};
459+
}}.invoke;
458460
}
459461
if(nargs===6){
460462
consti0=argInfos[0];
@@ -470,7 +472,7 @@ function buildNumericWrapper(
470472
consto4=argOffsets[4];
471473
consto5=argOffsets[5];
472474
if(retGetter===null){
473-
returnfunction(a0,a1,a2,a3,a4,a5){
475+
return{invoke(a0,a1,a2,a3,a4,a5){
474476
if(arguments.length!==6){
475477
throwFFIArgCountError(6,arguments.length);
476478
}
@@ -481,9 +483,9 @@ function buildNumericWrapper(
481483
writeNumericArg(view,i4,o4,a4,4);
482484
writeNumericArg(view,i5,o5,a5,5);
483485
rawFn();
484-
};
486+
}}.invoke;
485487
}
486-
returnfunction(a0,a1,a2,a3,a4,a5){
488+
return{invoke(a0,a1,a2,a3,a4,a5){
487489
if(arguments.length!==6){
488490
throwFFIArgCountError(6,arguments.length);
489491
}
@@ -495,22 +497,22 @@ function buildNumericWrapper(
495497
writeNumericArg(view,i5,o5,a5,5);
496498
rawFn();
497499
returnretGetter(view,0,true);
498-
};
500+
}}.invoke;
499501
}
500502
// 7+ args: further specialization is diminishing returns and bloats
501503
// this builder.
502504
if(retGetter===null){
503-
returnfunction(...args){
505+
return{invoke(...args){
504506
if(args.length!==nargs){
505507
throwFFIArgCountError(nargs,args.length);
506508
}
507509
for(leti=0;i<nargs;i++){
508510
writeNumericArg(view,argInfos[i],argOffsets[i],args[i],i);
509511
}
510512
rawFn();
511-
};
513+
}}.invoke;
512514
}
513-
returnfunction(...args){
515+
return{invoke(...args){
514516
if(args.length!==nargs){
515517
throwFFIArgCountError(nargs,args.length);
516518
}
@@ -519,7 +521,7 @@ function buildNumericWrapper(
519521
}
520522
rawFn();
521523
returnretGetter(view,0,true);
522-
};
524+
}}.invoke;
523525
}
524526

525527
module.exports={

‎lib/internal/ffi/fast-api.js‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -254,6 +254,8 @@ function throwIfFastLibraryClosed(state) {
254254
}
255255
}
256256

257+
// Concise methods do not have [[Construct]], unlike function expressions.
258+
// Keep wrappers non-constructible to match the native FFI functions.
257259
functionwrapWithRawPointerConversions(rawFn,argumentTypes,owner){
258260
if(rawFn===undefined||rawFn===null){
259261
returnrawFn;
@@ -287,7 +289,7 @@ function wrapWithRawPointerConversions(rawFn, argumentTypes, owner) {
287289
constmemory0=needsRawPointerConversion(t0)||string0;
288290
constfastBufferInvoke=needsPointerLikeConversion(t0) ?
289291
rawFn[kFastBufferInvoke] : undefined;
290-
wrapper=function(a0){
292+
wrapper={invoke(a0){
291293
throwIfFastLibraryClosed(state);
292294
if(arguments.length!==1){
293295
throwFFIArgCountError(1,arguments.length);
@@ -312,13 +314,13 @@ function wrapWithRawPointerConversions(rawFn, argumentTypes, owner) {
312314
arg=getRawPointerArg(arg,0);
313315
}
314316
returnrawFn(arg);
315-
};
317+
}}.invoke;
316318
}elseif(nargs===2){
317319
constc0=ArrayPrototypeIncludes(indexes,0);
318320
constc1=ArrayPrototypeIncludes(indexes,1);
319321
constt0=argumentTypes[0];
320322
constt1=argumentTypes[1];
321-
wrapper=function(a0,a1){
323+
wrapper={invoke(a0,a1){
322324
throwIfFastLibraryClosed(state);
323325
if(arguments.length!==2){
324326
throwFFIArgCountError(2,arguments.length);
@@ -332,15 +334,15 @@ function wrapWithRawPointerConversions(rawFn, argumentTypes, owner) {
332334
}finally{
333335
if(stringCall)exitStringConversion(stringState);
334336
}
335-
};
337+
}}.invoke;
336338
}elseif(nargs===3){
337339
constc0=ArrayPrototypeIncludes(indexes,0);
338340
constc1=ArrayPrototypeIncludes(indexes,1);
339341
constc2=ArrayPrototypeIncludes(indexes,2);
340342
constt0=argumentTypes[0];
341343
constt1=argumentTypes[1];
342344
constt2=argumentTypes[2];
343-
wrapper=function(a0,a1,a2){
345+
wrapper={invoke(a0,a1,a2){
344346
throwIfFastLibraryClosed(state);
345347
if(arguments.length!==3){
346348
throwFFIArgCountError(3,arguments.length);
@@ -356,9 +358,9 @@ function wrapWithRawPointerConversions(rawFn, argumentTypes, owner) {
356358
}finally{
357359
if(stringCall)exitStringConversion(stringState);
358360
}
359-
};
361+
}}.invoke;
360362
}else{
361-
wrapper=function(...args){
363+
wrapper={invoke(...args){
362364
throwIfFastLibraryClosed(state);
363365
if(args.length!==nargs){
364366
throwFFIArgCountError(nargs,args.length);
@@ -382,7 +384,7 @@ function wrapWithRawPointerConversions(rawFn, argumentTypes, owner) {
382384
}finally{
383385
if(stringCall)exitStringConversion(stringState);
384386
}
385-
};
387+
}}.invoke;
386388
}
387389

388390
returninheritMetadata(wrapper,rawFn,nargs);

‎src/node_ffi.cc‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,9 @@ MaybeLocal<Function> DynamicLibrary::CreateFunction(
324324
maybe_ret = Function::New(context,
325325
use_sb ? DynamicLibrary::InvokeFunctionSB
326326
: DynamicLibrary::InvokeFunction,
327-
info->object());
327+
info->object(),
328+
0,
329+
v8::ConstructorBehavior::kThrow);
328330
}
329331

330332
Local<Function> ret;
@@ -377,8 +379,11 @@ MaybeLocal<Function> DynamicLibrary::CreateFunction(
377379
// (strings, Buffers, ArrayBuffers, and ArrayBufferViews).
378380
if (has_ptr_args) {
379381
Local<Function> slow_fn;
380-
if (!Function::New(
381-
context, DynamicLibrary::InvokeFunction, info->object())
382+
if (!Function::New(context,
383+
DynamicLibrary::InvokeFunction,
384+
info->object(),
385+
0,
386+
v8::ConstructorBehavior::kThrow)
382387
.ToLocal(&slow_fn)) {
383388
return MaybeLocal<Function>();
384389
}

‎test/ffi/test-ffi-dynamic-library.js‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,27 @@ test('dlopen resolves functions from definitions', () => {
6767
}
6868
});
6969

70+
test('FFI functions are not constructible',()=>{
71+
const{ lib, functions }=ffi.dlopen(libraryPath,{
72+
add_i32: fixtureSymbols.add_i32,
73+
multiply_f64: fixtureSymbols.multiply_f64,
74+
});
75+
76+
try{
77+
assert.strictEqual(Object.hasOwn(functions.add_i32,'prototype'),false);
78+
assert.strictEqual(
79+
Object.hasOwn(functions.multiply_f64,'prototype'),false);
80+
assert.throws(
81+
()=>Reflect.construct(functions.add_i32,[20,22]),
82+
TypeError);
83+
assert.throws(
84+
()=>Reflect.construct(functions.multiply_f64,[6,7]),
85+
TypeError);
86+
}finally{
87+
lib.close();
88+
}
89+
});
90+
7091
test('DynamicLibrary exposes functions and symbols',()=>{
7192
constlib=newffi.DynamicLibrary(libraryPath);
7293

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content

Commit 9024ec2

Browse files
trivikraduh95
authored andcommitted
ffi: keep FFI functions non-constructible
Use concise method functions for Fast API and shared-buffer wrappers, and create native fallback functions with ConstructorBehavior::kThrow, so FFI functions remain non-constructible on all invocation paths. Signed-off-by: Kamat, Trivikram <16024985+trivikr@users.noreply.github.com> Assisted-by: codex:gpt-5.6-sol PR-URL: #65184Fixes: #65183 Reviewed-By: Paolo Insogna <paolo@cowtech.it>
1 parent fdc1e78 commit 9024ec2

4 files changed

Lines changed: 75 additions & 45 deletions

File tree

‎lib/internal/ffi-shared-buffer.js‎

Lines changed: 36 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,8 @@ function inheritMetadata(wrapper, rawFn, nargs) {
198198
// arguments out of it into invocation-local storage before `ffi_call` and
199199
// reads the return value back only after, so nested/reentrant calls into
200200
// the same function are safe.
201+
// Concise methods do not have [[Construct]], unlike function expressions, so
202+
// use them below to match the native FFI functions' non-constructible behavior.
201203
functionwrapWithSharedBuffer(rawFn,signature){
202204
if(rawFn==null)returnrawFn;
203205
constbuffer=rawFn[kSbSharedBuffer];
@@ -254,7 +256,7 @@ function wrapWithSharedBuffer(rawFn, signature) {
254256
// so arity specialization wouldn't buy much here.
255257
assert(slowInvoke!==undefined,
256258
'FFI: shared-buffer raw function with pointer arguments is missing kSbInvokeSlow');
257-
wrapper=function(...args){
259+
wrapper={invoke(...args){
258260
if(args.length!==nargs){
259261
throwFFIArgCountError(nargs,args.length);
260262
}
@@ -271,7 +273,7 @@ function wrapWithSharedBuffer(rawFn, signature) {
271273
}
272274
rawFn();
273275
returnretGetter===null ? undefined : retGetter(view,0,true);
274-
};
276+
}}.invoke;
275277
}else{
276278
// Arity specialization avoids the per-call `Array` allocation of
277279
// `...args`; the void/non-void split removes a per-call branch on
@@ -295,67 +297,67 @@ function buildNumericWrapper(
295297
/* c8 ignore start */
296298
if(nargs===0){
297299
if(retGetter===null){
298-
returnfunction(){
300+
return{invoke(){
299301
if(arguments.length!==0){
300302
throwFFIArgCountError(0,arguments.length);
301303
}
302304
rawFn();
303-
};
305+
}}.invoke;
304306
}
305-
returnfunction(){
307+
return{invoke(){
306308
if(arguments.length!==0){
307309
throwFFIArgCountError(0,arguments.length);
308310
}
309311
rawFn();
310312
returnretGetter(view,0,true);
311-
};
313+
}}.invoke;
312314
}
313315
/* c8 ignore stop */
314316
if(nargs===1){
315317
consti0=argInfos[0];
316318
consto0=argOffsets[0];
317319
if(retGetter===null){
318-
returnfunction(a0){
320+
return{invoke(a0){
319321
if(arguments.length!==1){
320322
throwFFIArgCountError(1,arguments.length);
321323
}
322324
writeNumericArg(view,i0,o0,a0,0);
323325
rawFn();
324-
};
326+
}}.invoke;
325327
}
326-
returnfunction(a0){
328+
return{invoke(a0){
327329
if(arguments.length!==1){
328330
throwFFIArgCountError(1,arguments.length);
329331
}
330332
writeNumericArg(view,i0,o0,a0,0);
331333
rawFn();
332334
returnretGetter(view,0,true);
333-
};
335+
}}.invoke;
334336
}
335337
if(nargs===2){
336338
consti0=argInfos[0];
337339
consti1=argInfos[1];
338340
consto0=argOffsets[0];
339341
consto1=argOffsets[1];
340342
if(retGetter===null){
341-
returnfunction(a0,a1){
343+
return{invoke(a0,a1){
342344
if(arguments.length!==2){
343345
throwFFIArgCountError(2,arguments.length);
344346
}
345347
writeNumericArg(view,i0,o0,a0,0);
346348
writeNumericArg(view,i1,o1,a1,1);
347349
rawFn();
348-
};
350+
}}.invoke;
349351
}
350-
returnfunction(a0,a1){
352+
return{invoke(a0,a1){
351353
if(arguments.length!==2){
352354
throwFFIArgCountError(2,arguments.length);
353355
}
354356
writeNumericArg(view,i0,o0,a0,0);
355357
writeNumericArg(view,i1,o1,a1,1);
356358
rawFn();
357359
returnretGetter(view,0,true);
358-
};
360+
}}.invoke;
359361
}
360362
if(nargs===3){
361363
consti0=argInfos[0];
@@ -365,17 +367,17 @@ function buildNumericWrapper(
365367
consto1=argOffsets[1];
366368
consto2=argOffsets[2];
367369
if(retGetter===null){
368-
returnfunction(a0,a1,a2){
370+
return{invoke(a0,a1,a2){
369371
if(arguments.length!==3){
370372
throwFFIArgCountError(3,arguments.length);
371373
}
372374
writeNumericArg(view,i0,o0,a0,0);
373375
writeNumericArg(view,i1,o1,a1,1);
374376
writeNumericArg(view,i2,o2,a2,2);
375377
rawFn();
376-
};
378+
}}.invoke;
377379
}
378-
returnfunction(a0,a1,a2){
380+
return{invoke(a0,a1,a2){
379381
if(arguments.length!==3){
380382
throwFFIArgCountError(3,arguments.length);
381383
}
@@ -384,7 +386,7 @@ function buildNumericWrapper(
384386
writeNumericArg(view,i2,o2,a2,2);
385387
rawFn();
386388
returnretGetter(view,0,true);
387-
};
389+
}}.invoke;
388390
}
389391
if(nargs===4){
390392
consti0=argInfos[0];
@@ -396,7 +398,7 @@ function buildNumericWrapper(
396398
consto2=argOffsets[2];
397399
consto3=argOffsets[3];
398400
if(retGetter===null){
399-
returnfunction(a0,a1,a2,a3){
401+
return{invoke(a0,a1,a2,a3){
400402
if(arguments.length!==4){
401403
throwFFIArgCountError(4,arguments.length);
402404
}
@@ -405,9 +407,9 @@ function buildNumericWrapper(
405407
writeNumericArg(view,i2,o2,a2,2);
406408
writeNumericArg(view,i3,o3,a3,3);
407409
rawFn();
408-
};
410+
}}.invoke;
409411
}
410-
returnfunction(a0,a1,a2,a3){
412+
return{invoke(a0,a1,a2,a3){
411413
if(arguments.length!==4){
412414
throwFFIArgCountError(4,arguments.length);
413415
}
@@ -417,7 +419,7 @@ function buildNumericWrapper(
417419
writeNumericArg(view,i3,o3,a3,3);
418420
rawFn();
419421
returnretGetter(view,0,true);
420-
};
422+
}}.invoke;
421423
}
422424
if(nargs===5){
423425
consti0=argInfos[0];
@@ -431,7 +433,7 @@ function buildNumericWrapper(
431433
consto3=argOffsets[3];
432434
consto4=argOffsets[4];
433435
if(retGetter===null){
434-
returnfunction(a0,a1,a2,a3,a4){
436+
return{invoke(a0,a1,a2,a3,a4){
435437
if(arguments.length!==5){
436438
throwFFIArgCountError(5,arguments.length);
437439
}
@@ -441,9 +443,9 @@ function buildNumericWrapper(
441443
writeNumericArg(view,i3,o3,a3,3);
442444
writeNumericArg(view,i4,o4,a4,4);
443445
rawFn();
444-
};
446+
}}.invoke;
445447
}
446-
returnfunction(a0,a1,a2,a3,a4){
448+
return{invoke(a0,a1,a2,a3,a4){
447449
if(arguments.length!==5){
448450
throwFFIArgCountError(5,arguments.length);
449451
}
@@ -454,7 +456,7 @@ function buildNumericWrapper(
454456
writeNumericArg(view,i4,o4,a4,4);
455457
rawFn();
456458
returnretGetter(view,0,true);
457-
};
459+
}}.invoke;
458460
}
459461
if(nargs===6){
460462
consti0=argInfos[0];
@@ -470,7 +472,7 @@ function buildNumericWrapper(
470472
consto4=argOffsets[4];
471473
consto5=argOffsets[5];
472474
if(retGetter===null){
473-
returnfunction(a0,a1,a2,a3,a4,a5){
475+
return{invoke(a0,a1,a2,a3,a4,a5){
474476
if(arguments.length!==6){
475477
throwFFIArgCountError(6,arguments.length);
476478
}
@@ -481,9 +483,9 @@ function buildNumericWrapper(
481483
writeNumericArg(view,i4,o4,a4,4);
482484
writeNumericArg(view,i5,o5,a5,5);
483485
rawFn();
484-
};
486+
}}.invoke;
485487
}
486-
returnfunction(a0,a1,a2,a3,a4,a5){
488+
return{invoke(a0,a1,a2,a3,a4,a5){
487489
if(arguments.length!==6){
488490
throwFFIArgCountError(6,arguments.length);
489491
}
@@ -495,22 +497,22 @@ function buildNumericWrapper(
495497
writeNumericArg(view,i5,o5,a5,5);
496498
rawFn();
497499
returnretGetter(view,0,true);
498-
};
500+
}}.invoke;
499501
}
500502
// 7+ args: further specialization is diminishing returns and bloats
501503
// this builder.
502504
if(retGetter===null){
503-
returnfunction(...args){
505+
return{invoke(...args){
504506
if(args.length!==nargs){
505507
throwFFIArgCountError(nargs,args.length);
506508
}
507509
for(leti=0;i<nargs;i++){
508510
writeNumericArg(view,argInfos[i],argOffsets[i],args[i],i);
509511
}
510512
rawFn();
511-
};
513+
}}.invoke;
512514
}
513-
returnfunction(...args){
515+
return{invoke(...args){
514516
if(args.length!==nargs){
515517
throwFFIArgCountError(nargs,args.length);
516518
}
@@ -519,7 +521,7 @@ function buildNumericWrapper(
519521
}
520522
rawFn();
521523
returnretGetter(view,0,true);
522-
};
524+
}}.invoke;
523525
}
524526

525527
module.exports={

‎lib/internal/ffi/fast-api.js‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -254,6 +254,8 @@ function throwIfFastLibraryClosed(state) {
254254
}
255255
}
256256

257+
// Concise methods do not have [[Construct]], unlike function expressions.
258+
// Keep wrappers non-constructible to match the native FFI functions.
257259
functionwrapWithRawPointerConversions(rawFn,argumentTypes,owner){
258260
if(rawFn===undefined||rawFn===null){
259261
returnrawFn;
@@ -287,7 +289,7 @@ function wrapWithRawPointerConversions(rawFn, argumentTypes, owner) {
287289
constmemory0=needsRawPointerConversion(t0)||string0;
288290
constfastBufferInvoke=needsPointerLikeConversion(t0) ?
289291
rawFn[kFastBufferInvoke] : undefined;
290-
wrapper=function(a0){
292+
wrapper={invoke(a0){
291293
throwIfFastLibraryClosed(state);
292294
if(arguments.length!==1){
293295
throwFFIArgCountError(1,arguments.length);
@@ -312,13 +314,13 @@ function wrapWithRawPointerConversions(rawFn, argumentTypes, owner) {
312314
arg=getRawPointerArg(arg,0);
313315
}
314316
returnrawFn(arg);
315-
};
317+
}}.invoke;
316318
}elseif(nargs===2){
317319
constc0=ArrayPrototypeIncludes(indexes,0);
318320
constc1=ArrayPrototypeIncludes(indexes,1);
319321
constt0=argumentTypes[0];
320322
constt1=argumentTypes[1];
321-
wrapper=function(a0,a1){
323+
wrapper={invoke(a0,a1){
322324
throwIfFastLibraryClosed(state);
323325
if(arguments.length!==2){
324326
throwFFIArgCountError(2,arguments.length);
@@ -332,15 +334,15 @@ function wrapWithRawPointerConversions(rawFn, argumentTypes, owner) {
332334
}finally{
333335
if(stringCall)exitStringConversion(stringState);
334336
}
335-
};
337+
}}.invoke;
336338
}elseif(nargs===3){
337339
constc0=ArrayPrototypeIncludes(indexes,0);
338340
constc1=ArrayPrototypeIncludes(indexes,1);
339341
constc2=ArrayPrototypeIncludes(indexes,2);
340342
constt0=argumentTypes[0];
341343
constt1=argumentTypes[1];
342344
constt2=argumentTypes[2];
343-
wrapper=function(a0,a1,a2){
345+
wrapper={invoke(a0,a1,a2){
344346
throwIfFastLibraryClosed(state);
345347
if(arguments.length!==3){
346348
throwFFIArgCountError(3,arguments.length);
@@ -356,9 +358,9 @@ function wrapWithRawPointerConversions(rawFn, argumentTypes, owner) {
356358
}finally{
357359
if(stringCall)exitStringConversion(stringState);
358360
}
359-
};
361+
}}.invoke;
360362
}else{
361-
wrapper=function(...args){
363+
wrapper={invoke(...args){
362364
throwIfFastLibraryClosed(state);
363365
if(args.length!==nargs){
364366
throwFFIArgCountError(nargs,args.length);
@@ -382,7 +384,7 @@ function wrapWithRawPointerConversions(rawFn, argumentTypes, owner) {
382384
}finally{
383385
if(stringCall)exitStringConversion(stringState);
384386
}
385-
};
387+
}}.invoke;
386388
}
387389

388390
returninheritMetadata(wrapper,rawFn,nargs);

‎src/node_ffi.cc‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,9 @@ MaybeLocal<Function> DynamicLibrary::CreateFunction(
324324
maybe_ret = Function::New(context,
325325
use_sb ? DynamicLibrary::InvokeFunctionSB
326326
: DynamicLibrary::InvokeFunction,
327-
info->object());
327+
info->object(),
328+
0,
329+
v8::ConstructorBehavior::kThrow);
328330
}
329331

330332
Local<Function> ret;
@@ -377,8 +379,11 @@ MaybeLocal<Function> DynamicLibrary::CreateFunction(
377379
// (strings, Buffers, ArrayBuffers, and ArrayBufferViews).
378380
if (has_ptr_args) {
379381
Local<Function> slow_fn;
380-
if (!Function::New(
381-
context, DynamicLibrary::InvokeFunction, info->object())
382+
if (!Function::New(context,
383+
DynamicLibrary::InvokeFunction,
384+
info->object(),
385+
0,
386+
v8::ConstructorBehavior::kThrow)
382387
.ToLocal(&slow_fn)) {
383388
return MaybeLocal<Function>();
384389
}

‎test/ffi/test-ffi-dynamic-library.js‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,27 @@ test('dlopen resolves functions from definitions', () => {
6767
}
6868
});
6969

70+
test('FFI functions are not constructible',()=>{
71+
const{ lib, functions }=ffi.dlopen(libraryPath,{
72+
add_i32: fixtureSymbols.add_i32,
73+
multiply_f64: fixtureSymbols.multiply_f64,
74+
});
75+
76+
try{
77+
assert.strictEqual(Object.hasOwn(functions.add_i32,'prototype'),false);
78+
assert.strictEqual(
79+
Object.hasOwn(functions.multiply_f64,'prototype'),false);
80+
assert.throws(
81+
()=>Reflect.construct(functions.add_i32,[20,22]),
82+
TypeError);
83+
assert.throws(
84+
()=>Reflect.construct(functions.multiply_f64,[6,7]),
85+
TypeError);
86+
}finally{
87+
lib.close();
88+
}
89+
});
90+
7091
test('DynamicLibrary exposes functions and symbols',()=>{
7192
constlib=newffi.DynamicLibrary(libraryPath);
7293

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Commit 9024ec2

Browse files
trivikraduh95
authored andcommitted
ffi: keep FFI functions non-constructible
Use concise method functions for Fast API and shared-buffer wrappers, and create native fallback functions with ConstructorBehavior::kThrow, so FFI functions remain non-constructible on all invocation paths. Signed-off-by: Kamat, Trivikram <16024985+trivikr@users.noreply.github.com> Assisted-by: codex:gpt-5.6-sol PR-URL: #65184Fixes: #65183 Reviewed-By: Paolo Insogna <paolo@cowtech.it>
1 parent fdc1e78 commit 9024ec2

4 files changed

Lines changed: 75 additions & 45 deletions

File tree

‎lib/internal/ffi-shared-buffer.js‎

Lines changed: 36 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,8 @@ function inheritMetadata(wrapper, rawFn, nargs) {
198198
// arguments out of it into invocation-local storage before `ffi_call` and
199199
// reads the return value back only after, so nested/reentrant calls into
200200
// the same function are safe.
201+
// Concise methods do not have [[Construct]], unlike function expressions, so
202+
// use them below to match the native FFI functions' non-constructible behavior.
201203
functionwrapWithSharedBuffer(rawFn,signature){
202204
if(rawFn==null)returnrawFn;
203205
constbuffer=rawFn[kSbSharedBuffer];
@@ -254,7 +256,7 @@ function wrapWithSharedBuffer(rawFn, signature) {
254256
// so arity specialization wouldn't buy much here.
255257
assert(slowInvoke!==undefined,
256258
'FFI: shared-buffer raw function with pointer arguments is missing kSbInvokeSlow');
257-
wrapper=function(...args){
259+
wrapper={invoke(...args){
258260
if(args.length!==nargs){
259261
throwFFIArgCountError(nargs,args.length);
260262
}
@@ -271,7 +273,7 @@ function wrapWithSharedBuffer(rawFn, signature) {
271273
}
272274
rawFn();
273275
returnretGetter===null ? undefined : retGetter(view,0,true);
274-
};
276+
}}.invoke;
275277
}else{
276278
// Arity specialization avoids the per-call `Array` allocation of
277279
// `...args`; the void/non-void split removes a per-call branch on
@@ -295,67 +297,67 @@ function buildNumericWrapper(
295297
/* c8 ignore start */
296298
if(nargs===0){
297299
if(retGetter===null){
298-
returnfunction(){
300+
return{invoke(){
299301
if(arguments.length!==0){
300302
throwFFIArgCountError(0,arguments.length);
301303
}
302304
rawFn();
303-
};
305+
}}.invoke;
304306
}
305-
returnfunction(){
307+
return{invoke(){
306308
if(arguments.length!==0){
307309
throwFFIArgCountError(0,arguments.length);
308310
}
309311
rawFn();
310312
returnretGetter(view,0,true);
311-
};
313+
}}.invoke;
312314
}
313315
/* c8 ignore stop */
314316
if(nargs===1){
315317
consti0=argInfos[0];
316318
consto0=argOffsets[0];
317319
if(retGetter===null){
318-
returnfunction(a0){
320+
return{invoke(a0){
319321
if(arguments.length!==1){
320322
throwFFIArgCountError(1,arguments.length);
321323
}
322324
writeNumericArg(view,i0,o0,a0,0);
323325
rawFn();
324-
};
326+
}}.invoke;
325327
}
326-
returnfunction(a0){
328+
return{invoke(a0){
327329
if(arguments.length!==1){
328330
throwFFIArgCountError(1,arguments.length);
329331
}
330332
writeNumericArg(view,i0,o0,a0,0);
331333
rawFn();
332334
returnretGetter(view,0,true);
333-
};
335+
}}.invoke;
334336
}
335337
if(nargs===2){
336338
consti0=argInfos[0];
337339
consti1=argInfos[1];
338340
consto0=argOffsets[0];
339341
consto1=argOffsets[1];
340342
if(retGetter===null){
341-
returnfunction(a0,a1){
343+
return{invoke(a0,a1){
342344
if(arguments.length!==2){
343345
throwFFIArgCountError(2,arguments.length);
344346
}
345347
writeNumericArg(view,i0,o0,a0,0);
346348
writeNumericArg(view,i1,o1,a1,1);
347349
rawFn();
348-
};
350+
}}.invoke;
349351
}
350-
returnfunction(a0,a1){
352+
return{invoke(a0,a1){
351353
if(arguments.length!==2){
352354
throwFFIArgCountError(2,arguments.length);
353355
}
354356
writeNumericArg(view,i0,o0,a0,0);
355357
writeNumericArg(view,i1,o1,a1,1);
356358
rawFn();
357359
returnretGetter(view,0,true);
358-
};
360+
}}.invoke;
359361
}
360362
if(nargs===3){
361363
consti0=argInfos[0];
@@ -365,17 +367,17 @@ function buildNumericWrapper(
365367
consto1=argOffsets[1];
366368
consto2=argOffsets[2];
367369
if(retGetter===null){
368-
returnfunction(a0,a1,a2){
370+
return{invoke(a0,a1,a2){
369371
if(arguments.length!==3){
370372
throwFFIArgCountError(3,arguments.length);
371373
}
372374
writeNumericArg(view,i0,o0,a0,0);
373375
writeNumericArg(view,i1,o1,a1,1);
374376
writeNumericArg(view,i2,o2,a2,2);
375377
rawFn();
376-
};
378+
}}.invoke;
377379
}
378-
returnfunction(a0,a1,a2){
380+
return{invoke(a0,a1,a2){
379381
if(arguments.length!==3){
380382
throwFFIArgCountError(3,arguments.length);
381383
}
@@ -384,7 +386,7 @@ function buildNumericWrapper(
384386
writeNumericArg(view,i2,o2,a2,2);
385387
rawFn();
386388
returnretGetter(view,0,true);
387-
};
389+
}}.invoke;
388390
}
389391
if(nargs===4){
390392
consti0=argInfos[0];
@@ -396,7 +398,7 @@ function buildNumericWrapper(
396398
consto2=argOffsets[2];
397399
consto3=argOffsets[3];
398400
if(retGetter===null){
399-
returnfunction(a0,a1,a2,a3){
401+
return{invoke(a0,a1,a2,a3){
400402
if(arguments.length!==4){
401403
throwFFIArgCountError(4,arguments.length);
402404
}
@@ -405,9 +407,9 @@ function buildNumericWrapper(
405407
writeNumericArg(view,i2,o2,a2,2);
406408
writeNumericArg(view,i3,o3,a3,3);
407409
rawFn();
408-
};
410+
}}.invoke;
409411
}
410-
returnfunction(a0,a1,a2,a3){
412+
return{invoke(a0,a1,a2,a3){
411413
if(arguments.length!==4){
412414
throwFFIArgCountError(4,arguments.length);
413415
}
@@ -417,7 +419,7 @@ function buildNumericWrapper(
417419
writeNumericArg(view,i3,o3,a3,3);
418420
rawFn();
419421
returnretGetter(view,0,true);
420-
};
422+
}}.invoke;
421423
}
422424
if(nargs===5){
423425
consti0=argInfos[0];
@@ -431,7 +433,7 @@ function buildNumericWrapper(
431433
consto3=argOffsets[3];
432434
consto4=argOffsets[4];
433435
if(retGetter===null){
434-
returnfunction(a0,a1,a2,a3,a4){
436+
return{invoke(a0,a1,a2,a3,a4){
435437
if(arguments.length!==5){
436438
throwFFIArgCountError(5,arguments.length);
437439
}
@@ -441,9 +443,9 @@ function buildNumericWrapper(
441443
writeNumericArg(view,i3,o3,a3,3);
442444
writeNumericArg(view,i4,o4,a4,4);
443445
rawFn();
444-
};
446+
}}.invoke;
445447
}
446-
returnfunction(a0,a1,a2,a3,a4){
448+
return{invoke(a0,a1,a2,a3,a4){
447449
if(arguments.length!==5){
448450
throwFFIArgCountError(5,arguments.length);
449451
}
@@ -454,7 +456,7 @@ function buildNumericWrapper(
454456
writeNumericArg(view,i4,o4,a4,4);
455457
rawFn();
456458
returnretGetter(view,0,true);
457-
};
459+
}}.invoke;
458460
}
459461
if(nargs===6){
460462
consti0=argInfos[0];
@@ -470,7 +472,7 @@ function buildNumericWrapper(
470472
consto4=argOffsets[4];
471473
consto5=argOffsets[5];
472474
if(retGetter===null){
473-
returnfunction(a0,a1,a2,a3,a4,a5){
475+
return{invoke(a0,a1,a2,a3,a4,a5){
474476
if(arguments.length!==6){
475477
throwFFIArgCountError(6,arguments.length);
476478
}
@@ -481,9 +483,9 @@ function buildNumericWrapper(
481483
writeNumericArg(view,i4,o4,a4,4);
482484
writeNumericArg(view,i5,o5,a5,5);
483485
rawFn();
484-
};
486+
}}.invoke;
485487
}
486-
returnfunction(a0,a1,a2,a3,a4,a5){
488+
return{invoke(a0,a1,a2,a3,a4,a5){
487489
if(arguments.length!==6){
488490
throwFFIArgCountError(6,arguments.length);
489491
}
@@ -495,22 +497,22 @@ function buildNumericWrapper(
495497
writeNumericArg(view,i5,o5,a5,5);
496498
rawFn();
497499
returnretGetter(view,0,true);
498-
};
500+
}}.invoke;
499501
}
500502
// 7+ args: further specialization is diminishing returns and bloats
501503
// this builder.
502504
if(retGetter===null){
503-
returnfunction(...args){
505+
return{invoke(...args){
504506
if(args.length!==nargs){
505507
throwFFIArgCountError(nargs,args.length);
506508
}
507509
for(leti=0;i<nargs;i++){
508510
writeNumericArg(view,argInfos[i],argOffsets[i],args[i],i);
509511
}
510512
rawFn();
511-
};
513+
}}.invoke;
512514
}
513-
returnfunction(...args){
515+
return{invoke(...args){
514516
if(args.length!==nargs){
515517
throwFFIArgCountError(nargs,args.length);
516518
}
@@ -519,7 +521,7 @@ function buildNumericWrapper(
519521
}
520522
rawFn();
521523
returnretGetter(view,0,true);
522-
};
524+
}}.invoke;
523525
}
524526

525527
module.exports={

‎lib/internal/ffi/fast-api.js‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -254,6 +254,8 @@ function throwIfFastLibraryClosed(state) {
254254
}
255255
}
256256

257+
// Concise methods do not have [[Construct]], unlike function expressions.
258+
// Keep wrappers non-constructible to match the native FFI functions.
257259
functionwrapWithRawPointerConversions(rawFn,argumentTypes,owner){
258260
if(rawFn===undefined||rawFn===null){
259261
returnrawFn;
@@ -287,7 +289,7 @@ function wrapWithRawPointerConversions(rawFn, argumentTypes, owner) {
287289
constmemory0=needsRawPointerConversion(t0)||string0;
288290
constfastBufferInvoke=needsPointerLikeConversion(t0) ?
289291
rawFn[kFastBufferInvoke] : undefined;
290-
wrapper=function(a0){
292+
wrapper={invoke(a0){
291293
throwIfFastLibraryClosed(state);
292294
if(arguments.length!==1){
293295
throwFFIArgCountError(1,arguments.length);
@@ -312,13 +314,13 @@ function wrapWithRawPointerConversions(rawFn, argumentTypes, owner) {
312314
arg=getRawPointerArg(arg,0);
313315
}
314316
returnrawFn(arg);
315-
};
317+
}}.invoke;
316318
}elseif(nargs===2){
317319
constc0=ArrayPrototypeIncludes(indexes,0);
318320
constc1=ArrayPrototypeIncludes(indexes,1);
319321
constt0=argumentTypes[0];
320322
constt1=argumentTypes[1];
321-
wrapper=function(a0,a1){
323+
wrapper={invoke(a0,a1){
322324
throwIfFastLibraryClosed(state);
323325
if(arguments.length!==2){
324326
throwFFIArgCountError(2,arguments.length);
@@ -332,15 +334,15 @@ function wrapWithRawPointerConversions(rawFn, argumentTypes, owner) {
332334
}finally{
333335
if(stringCall)exitStringConversion(stringState);
334336
}
335-
};
337+
}}.invoke;
336338
}elseif(nargs===3){
337339
constc0=ArrayPrototypeIncludes(indexes,0);
338340
constc1=ArrayPrototypeIncludes(indexes,1);
339341
constc2=ArrayPrototypeIncludes(indexes,2);
340342
constt0=argumentTypes[0];
341343
constt1=argumentTypes[1];
342344
constt2=argumentTypes[2];
343-
wrapper=function(a0,a1,a2){
345+
wrapper={invoke(a0,a1,a2){
344346
throwIfFastLibraryClosed(state);
345347
if(arguments.length!==3){
346348
throwFFIArgCountError(3,arguments.length);
@@ -356,9 +358,9 @@ function wrapWithRawPointerConversions(rawFn, argumentTypes, owner) {
356358
}finally{
357359
if(stringCall)exitStringConversion(stringState);
358360
}
359-
};
361+
}}.invoke;
360362
}else{
361-
wrapper=function(...args){
363+
wrapper={invoke(...args){
362364
throwIfFastLibraryClosed(state);
363365
if(args.length!==nargs){
364366
throwFFIArgCountError(nargs,args.length);
@@ -382,7 +384,7 @@ function wrapWithRawPointerConversions(rawFn, argumentTypes, owner) {
382384
}finally{
383385
if(stringCall)exitStringConversion(stringState);
384386
}
385-
};
387+
}}.invoke;
386388
}
387389

388390
returninheritMetadata(wrapper,rawFn,nargs);

‎src/node_ffi.cc‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,9 @@ MaybeLocal<Function> DynamicLibrary::CreateFunction(
324324
maybe_ret = Function::New(context,
325325
use_sb ? DynamicLibrary::InvokeFunctionSB
326326
: DynamicLibrary::InvokeFunction,
327-
info->object());
327+
info->object(),
328+
0,
329+
v8::ConstructorBehavior::kThrow);
328330
}
329331

330332
Local<Function> ret;
@@ -377,8 +379,11 @@ MaybeLocal<Function> DynamicLibrary::CreateFunction(
377379
// (strings, Buffers, ArrayBuffers, and ArrayBufferViews).
378380
if (has_ptr_args) {
379381
Local<Function> slow_fn;
380-
if (!Function::New(
381-
context, DynamicLibrary::InvokeFunction, info->object())
382+
if (!Function::New(context,
383+
DynamicLibrary::InvokeFunction,
384+
info->object(),
385+
0,
386+
v8::ConstructorBehavior::kThrow)
382387
.ToLocal(&slow_fn)) {
383388
return MaybeLocal<Function>();
384389
}

‎test/ffi/test-ffi-dynamic-library.js‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,27 @@ test('dlopen resolves functions from definitions', () => {
6767
}
6868
});
6969

70+
test('FFI functions are not constructible',()=>{
71+
const{ lib, functions }=ffi.dlopen(libraryPath,{
72+
add_i32: fixtureSymbols.add_i32,
73+
multiply_f64: fixtureSymbols.multiply_f64,
74+
});
75+
76+
try{
77+
assert.strictEqual(Object.hasOwn(functions.add_i32,'prototype'),false);
78+
assert.strictEqual(
79+
Object.hasOwn(functions.multiply_f64,'prototype'),false);
80+
assert.throws(
81+
()=>Reflect.construct(functions.add_i32,[20,22]),
82+
TypeError);
83+
assert.throws(
84+
()=>Reflect.construct(functions.multiply_f64,[6,7]),
85+
TypeError);
86+
}finally{
87+
lib.close();
88+
}
89+
});
90+
7091
test('DynamicLibrary exposes functions and symbols',()=>{
7192
constlib=newffi.DynamicLibrary(libraryPath);
7293

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Commit 9024ec2

Browse files
trivikraduh95
authored andcommitted
ffi: keep FFI functions non-constructible
Use concise method functions for Fast API and shared-buffer wrappers, and create native fallback functions with ConstructorBehavior::kThrow, so FFI functions remain non-constructible on all invocation paths. Signed-off-by: Kamat, Trivikram <16024985+trivikr@users.noreply.github.com> Assisted-by: codex:gpt-5.6-sol PR-URL: #65184Fixes: #65183 Reviewed-By: Paolo Insogna <paolo@cowtech.it>
1 parent fdc1e78 commit 9024ec2

4 files changed

Lines changed: 75 additions & 45 deletions

File tree

‎lib/internal/ffi-shared-buffer.js‎

Lines changed: 36 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,8 @@ function inheritMetadata(wrapper, rawFn, nargs) {
198198
// arguments out of it into invocation-local storage before `ffi_call` and
199199
// reads the return value back only after, so nested/reentrant calls into
200200
// the same function are safe.
201+
// Concise methods do not have [[Construct]], unlike function expressions, so
202+
// use them below to match the native FFI functions' non-constructible behavior.
201203
functionwrapWithSharedBuffer(rawFn,signature){
202204
if(rawFn==null)returnrawFn;
203205
constbuffer=rawFn[kSbSharedBuffer];
@@ -254,7 +256,7 @@ function wrapWithSharedBuffer(rawFn, signature) {
254256
// so arity specialization wouldn't buy much here.
255257
assert(slowInvoke!==undefined,
256258
'FFI: shared-buffer raw function with pointer arguments is missing kSbInvokeSlow');
257-
wrapper=function(...args){
259+
wrapper={invoke(...args){
258260
if(args.length!==nargs){
259261
throwFFIArgCountError(nargs,args.length);
260262
}
@@ -271,7 +273,7 @@ function wrapWithSharedBuffer(rawFn, signature) {
271273
}
272274
rawFn();
273275
returnretGetter===null ? undefined : retGetter(view,0,true);
274-
};
276+
}}.invoke;
275277
}else{
276278
// Arity specialization avoids the per-call `Array` allocation of
277279
// `...args`; the void/non-void split removes a per-call branch on
@@ -295,67 +297,67 @@ function buildNumericWrapper(
295297
/* c8 ignore start */
296298
if(nargs===0){
297299
if(retGetter===null){
298-
returnfunction(){
300+
return{invoke(){
299301
if(arguments.length!==0){
300302
throwFFIArgCountError(0,arguments.length);
301303
}
302304
rawFn();
303-
};
305+
}}.invoke;
304306
}
305-
returnfunction(){
307+
return{invoke(){
306308
if(arguments.length!==0){
307309
throwFFIArgCountError(0,arguments.length);
308310
}
309311
rawFn();
310312
returnretGetter(view,0,true);
311-
};
313+
}}.invoke;
312314
}
313315
/* c8 ignore stop */
314316
if(nargs===1){
315317
consti0=argInfos[0];
316318
consto0=argOffsets[0];
317319
if(retGetter===null){
318-
returnfunction(a0){
320+
return{invoke(a0){
319321
if(arguments.length!==1){
320322
throwFFIArgCountError(1,arguments.length);
321323
}
322324
writeNumericArg(view,i0,o0,a0,0);
323325
rawFn();
324-
};
326+
}}.invoke;
325327
}
326-
returnfunction(a0){
328+
return{invoke(a0){
327329
if(arguments.length!==1){
328330
throwFFIArgCountError(1,arguments.length);
329331
}
330332
writeNumericArg(view,i0,o0,a0,0);
331333
rawFn();
332334
returnretGetter(view,0,true);
333-
};
335+
}}.invoke;
334336
}
335337
if(nargs===2){
336338
consti0=argInfos[0];
337339
consti1=argInfos[1];
338340
consto0=argOffsets[0];
339341
consto1=argOffsets[1];
340342
if(retGetter===null){
341-
returnfunction(a0,a1){
343+
return{invoke(a0,a1){
342344
if(arguments.length!==2){
343345
throwFFIArgCountError(2,arguments.length);
344346
}
345347
writeNumericArg(view,i0,o0,a0,0);
346348
writeNumericArg(view,i1,o1,a1,1);
347349
rawFn();
348-
};
350+
}}.invoke;
349351
}
350-
returnfunction(a0,a1){
352+
return{invoke(a0,a1){
351353
if(arguments.length!==2){
352354
throwFFIArgCountError(2,arguments.length);
353355
}
354356
writeNumericArg(view,i0,o0,a0,0);
355357
writeNumericArg(view,i1,o1,a1,1);
356358
rawFn();
357359
returnretGetter(view,0,true);
358-
};
360+
}}.invoke;
359361
}
360362
if(nargs===3){
361363
consti0=argInfos[0];
@@ -365,17 +367,17 @@ function buildNumericWrapper(
365367
consto1=argOffsets[1];
366368
consto2=argOffsets[2];
367369
if(retGetter===null){
368-
returnfunction(a0,a1,a2){
370+
return{invoke(a0,a1,a2){
369371
if(arguments.length!==3){
370372
throwFFIArgCountError(3,arguments.length);
371373
}
372374
writeNumericArg(view,i0,o0,a0,0);
373375
writeNumericArg(view,i1,o1,a1,1);
374376
writeNumericArg(view,i2,o2,a2,2);
375377
rawFn();
376-
};
378+
}}.invoke;
377379
}
378-
returnfunction(a0,a1,a2){
380+
return{invoke(a0,a1,a2){
379381
if(arguments.length!==3){
380382
throwFFIArgCountError(3,arguments.length);
381383
}
@@ -384,7 +386,7 @@ function buildNumericWrapper(
384386
writeNumericArg(view,i2,o2,a2,2);
385387
rawFn();
386388
returnretGetter(view,0,true);
387-
};
389+
}}.invoke;
388390
}
389391
if(nargs===4){
390392
consti0=argInfos[0];
@@ -396,7 +398,7 @@ function buildNumericWrapper(
396398
consto2=argOffsets[2];
397399
consto3=argOffsets[3];
398400
if(retGetter===null){
399-
returnfunction(a0,a1,a2,a3){
401+
return{invoke(a0,a1,a2,a3){
400402
if(arguments.length!==4){
401403
throwFFIArgCountError(4,arguments.length);
402404
}
@@ -405,9 +407,9 @@ function buildNumericWrapper(
405407
writeNumericArg(view,i2,o2,a2,2);
406408
writeNumericArg(view,i3,o3,a3,3);
407409
rawFn();
408-
};
410+
}}.invoke;
409411
}
410-
returnfunction(a0,a1,a2,a3){
412+
return{invoke(a0,a1,a2,a3){
411413
if(arguments.length!==4){
412414
throwFFIArgCountError(4,arguments.length);
413415
}
@@ -417,7 +419,7 @@ function buildNumericWrapper(
417419
writeNumericArg(view,i3,o3,a3,3);
418420
rawFn();
419421
returnretGetter(view,0,true);
420-
};
422+
}}.invoke;
421423
}
422424
if(nargs===5){
423425
consti0=argInfos[0];
@@ -431,7 +433,7 @@ function buildNumericWrapper(
431433
consto3=argOffsets[3];
432434
consto4=argOffsets[4];
433435
if(retGetter===null){
434-
returnfunction(a0,a1,a2,a3,a4){
436+
return{invoke(a0,a1,a2,a3,a4){
435437
if(arguments.length!==5){
436438
throwFFIArgCountError(5,arguments.length);
437439
}
@@ -441,9 +443,9 @@ function buildNumericWrapper(
441443
writeNumericArg(view,i3,o3,a3,3);
442444
writeNumericArg(view,i4,o4,a4,4);
443445
rawFn();
444-
};
446+
}}.invoke;
445447
}
446-
returnfunction(a0,a1,a2,a3,a4){
448+
return{invoke(a0,a1,a2,a3,a4){
447449
if(arguments.length!==5){
448450
throwFFIArgCountError(5,arguments.length);
449451
}
@@ -454,7 +456,7 @@ function buildNumericWrapper(
454456
writeNumericArg(view,i4,o4,a4,4);
455457
rawFn();
456458
returnretGetter(view,0,true);
457-
};
459+
}}.invoke;
458460
}
459461
if(nargs===6){
460462
consti0=argInfos[0];
@@ -470,7 +472,7 @@ function buildNumericWrapper(
470472
consto4=argOffsets[4];
471473
consto5=argOffsets[5];
472474
if(retGetter===null){
473-
returnfunction(a0,a1,a2,a3,a4,a5){
475+
return{invoke(a0,a1,a2,a3,a4,a5){
474476
if(arguments.length!==6){
475477
throwFFIArgCountError(6,arguments.length);
476478
}
@@ -481,9 +483,9 @@ function buildNumericWrapper(
481483
writeNumericArg(view,i4,o4,a4,4);
482484
writeNumericArg(view,i5,o5,a5,5);
483485
rawFn();
484-
};
486+
}}.invoke;
485487
}
486-
returnfunction(a0,a1,a2,a3,a4,a5){
488+
return{invoke(a0,a1,a2,a3,a4,a5){
487489
if(arguments.length!==6){
488490
throwFFIArgCountError(6,arguments.length);
489491
}
@@ -495,22 +497,22 @@ function buildNumericWrapper(
495497
writeNumericArg(view,i5,o5,a5,5);
496498
rawFn();
497499
returnretGetter(view,0,true);
498-
};
500+
}}.invoke;
499501
}
500502
// 7+ args: further specialization is diminishing returns and bloats
501503
// this builder.
502504
if(retGetter===null){
503-
returnfunction(...args){
505+
return{invoke(...args){
504506
if(args.length!==nargs){
505507
throwFFIArgCountError(nargs,args.length);
506508
}
507509
for(leti=0;i<nargs;i++){
508510
writeNumericArg(view,argInfos[i],argOffsets[i],args[i],i);
509511
}
510512
rawFn();
511-
};
513+
}}.invoke;
512514
}
513-
returnfunction(...args){
515+
return{invoke(...args){
514516
if(args.length!==nargs){
515517
throwFFIArgCountError(nargs,args.length);
516518
}
@@ -519,7 +521,7 @@ function buildNumericWrapper(
519521
}
520522
rawFn();
521523
returnretGetter(view,0,true);
522-
};
524+
}}.invoke;
523525
}
524526

525527
module.exports={

‎lib/internal/ffi/fast-api.js‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -254,6 +254,8 @@ function throwIfFastLibraryClosed(state) {
254254
}
255255
}
256256

257+
// Concise methods do not have [[Construct]], unlike function expressions.
258+
// Keep wrappers non-constructible to match the native FFI functions.
257259
functionwrapWithRawPointerConversions(rawFn,argumentTypes,owner){
258260
if(rawFn===undefined||rawFn===null){
259261
returnrawFn;
@@ -287,7 +289,7 @@ function wrapWithRawPointerConversions(rawFn, argumentTypes, owner) {
287289
constmemory0=needsRawPointerConversion(t0)||string0;
288290
constfastBufferInvoke=needsPointerLikeConversion(t0) ?
289291
rawFn[kFastBufferInvoke] : undefined;
290-
wrapper=function(a0){
292+
wrapper={invoke(a0){
291293
throwIfFastLibraryClosed(state);
292294
if(arguments.length!==1){
293295
throwFFIArgCountError(1,arguments.length);
@@ -312,13 +314,13 @@ function wrapWithRawPointerConversions(rawFn, argumentTypes, owner) {
312314
arg=getRawPointerArg(arg,0);
313315
}
314316
returnrawFn(arg);
315-
};
317+
}}.invoke;
316318
}elseif(nargs===2){
317319
constc0=ArrayPrototypeIncludes(indexes,0);
318320
constc1=ArrayPrototypeIncludes(indexes,1);
319321
constt0=argumentTypes[0];
320322
constt1=argumentTypes[1];
321-
wrapper=function(a0,a1){
323+
wrapper={invoke(a0,a1){
322324
throwIfFastLibraryClosed(state);
323325
if(arguments.length!==2){
324326
throwFFIArgCountError(2,arguments.length);
@@ -332,15 +334,15 @@ function wrapWithRawPointerConversions(rawFn, argumentTypes, owner) {
332334
}finally{
333335
if(stringCall)exitStringConversion(stringState);
334336
}
335-
};
337+
}}.invoke;
336338
}elseif(nargs===3){
337339
constc0=ArrayPrototypeIncludes(indexes,0);
338340
constc1=ArrayPrototypeIncludes(indexes,1);
339341
constc2=ArrayPrototypeIncludes(indexes,2);
340342
constt0=argumentTypes[0];
341343
constt1=argumentTypes[1];
342344
constt2=argumentTypes[2];
343-
wrapper=function(a0,a1,a2){
345+
wrapper={invoke(a0,a1,a2){
344346
throwIfFastLibraryClosed(state);
345347
if(arguments.length!==3){
346348
throwFFIArgCountError(3,arguments.length);
@@ -356,9 +358,9 @@ function wrapWithRawPointerConversions(rawFn, argumentTypes, owner) {
356358
}finally{
357359
if(stringCall)exitStringConversion(stringState);
358360
}
359-
};
361+
}}.invoke;
360362
}else{
361-
wrapper=function(...args){
363+
wrapper={invoke(...args){
362364
throwIfFastLibraryClosed(state);
363365
if(args.length!==nargs){
364366
throwFFIArgCountError(nargs,args.length);
@@ -382,7 +384,7 @@ function wrapWithRawPointerConversions(rawFn, argumentTypes, owner) {
382384
}finally{
383385
if(stringCall)exitStringConversion(stringState);
384386
}
385-
};
387+
}}.invoke;
386388
}
387389

388390
returninheritMetadata(wrapper,rawFn,nargs);

‎src/node_ffi.cc‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,9 @@ MaybeLocal<Function> DynamicLibrary::CreateFunction(
324324
maybe_ret = Function::New(context,
325325
use_sb ? DynamicLibrary::InvokeFunctionSB
326326
: DynamicLibrary::InvokeFunction,
327-
info->object());
327+
info->object(),
328+
0,
329+
v8::ConstructorBehavior::kThrow);
328330
}
329331

330332
Local<Function> ret;
@@ -377,8 +379,11 @@ MaybeLocal<Function> DynamicLibrary::CreateFunction(
377379
// (strings, Buffers, ArrayBuffers, and ArrayBufferViews).
378380
if (has_ptr_args) {
379381
Local<Function> slow_fn;
380-
if (!Function::New(
381-
context, DynamicLibrary::InvokeFunction, info->object())
382+
if (!Function::New(context,
383+
DynamicLibrary::InvokeFunction,
384+
info->object(),
385+
0,
386+
v8::ConstructorBehavior::kThrow)
382387
.ToLocal(&slow_fn)) {
383388
return MaybeLocal<Function>();
384389
}

‎test/ffi/test-ffi-dynamic-library.js‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,27 @@ test('dlopen resolves functions from definitions', () => {
6767
}
6868
});
6969

70+
test('FFI functions are not constructible',()=>{
71+
const{ lib, functions }=ffi.dlopen(libraryPath,{
72+
add_i32: fixtureSymbols.add_i32,
73+
multiply_f64: fixtureSymbols.multiply_f64,
74+
});
75+
76+
try{
77+
assert.strictEqual(Object.hasOwn(functions.add_i32,'prototype'),false);
78+
assert.strictEqual(
79+
Object.hasOwn(functions.multiply_f64,'prototype'),false);
80+
assert.throws(
81+
()=>Reflect.construct(functions.add_i32,[20,22]),
82+
TypeError);
83+
assert.throws(
84+
()=>Reflect.construct(functions.multiply_f64,[6,7]),
85+
TypeError);
86+
}finally{
87+
lib.close();
88+
}
89+
});
90+
7091
test('DynamicLibrary exposes functions and symbols',()=>{
7192
constlib=newffi.DynamicLibrary(libraryPath);
7293

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content

Commit 9024ec2

Browse files
trivikraduh95
authored andcommitted
ffi: keep FFI functions non-constructible
Use concise method functions for Fast API and shared-buffer wrappers, and create native fallback functions with ConstructorBehavior::kThrow, so FFI functions remain non-constructible on all invocation paths. Signed-off-by: Kamat, Trivikram <16024985+trivikr@users.noreply.github.com> Assisted-by: codex:gpt-5.6-sol PR-URL: #65184Fixes: #65183 Reviewed-By: Paolo Insogna <paolo@cowtech.it>
1 parent fdc1e78 commit 9024ec2

4 files changed

Lines changed: 75 additions & 45 deletions

File tree

‎lib/internal/ffi-shared-buffer.js‎

Lines changed: 36 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,8 @@ function inheritMetadata(wrapper, rawFn, nargs) {
198198
// arguments out of it into invocation-local storage before `ffi_call` and
199199
// reads the return value back only after, so nested/reentrant calls into
200200
// the same function are safe.
201+
// Concise methods do not have [[Construct]], unlike function expressions, so
202+
// use them below to match the native FFI functions' non-constructible behavior.
201203
functionwrapWithSharedBuffer(rawFn,signature){
202204
if(rawFn==null)returnrawFn;
203205
constbuffer=rawFn[kSbSharedBuffer];
@@ -254,7 +256,7 @@ function wrapWithSharedBuffer(rawFn, signature) {
254256
// so arity specialization wouldn't buy much here.
255257
assert(slowInvoke!==undefined,
256258
'FFI: shared-buffer raw function with pointer arguments is missing kSbInvokeSlow');
257-
wrapper=function(...args){
259+
wrapper={invoke(...args){
258260
if(args.length!==nargs){
259261
throwFFIArgCountError(nargs,args.length);
260262
}
@@ -271,7 +273,7 @@ function wrapWithSharedBuffer(rawFn, signature) {
271273
}
272274
rawFn();
273275
returnretGetter===null ? undefined : retGetter(view,0,true);
274-
};
276+
}}.invoke;
275277
}else{
276278
// Arity specialization avoids the per-call `Array` allocation of
277279
// `...args`; the void/non-void split removes a per-call branch on
@@ -295,67 +297,67 @@ function buildNumericWrapper(
295297
/* c8 ignore start */
296298
if(nargs===0){
297299
if(retGetter===null){
298-
returnfunction(){
300+
return{invoke(){
299301
if(arguments.length!==0){
300302
throwFFIArgCountError(0,arguments.length);
301303
}
302304
rawFn();
303-
};
305+
}}.invoke;
304306
}
305-
returnfunction(){
307+
return{invoke(){
306308
if(arguments.length!==0){
307309
throwFFIArgCountError(0,arguments.length);
308310
}
309311
rawFn();
310312
returnretGetter(view,0,true);
311-
};
313+
}}.invoke;
312314
}
313315
/* c8 ignore stop */
314316
if(nargs===1){
315317
consti0=argInfos[0];
316318
consto0=argOffsets[0];
317319
if(retGetter===null){
318-
returnfunction(a0){
320+
return{invoke(a0){
319321
if(arguments.length!==1){
320322
throwFFIArgCountError(1,arguments.length);
321323
}
322324
writeNumericArg(view,i0,o0,a0,0);
323325
rawFn();
324-
};
326+
}}.invoke;
325327
}
326-
returnfunction(a0){
328+
return{invoke(a0){
327329
if(arguments.length!==1){
328330
throwFFIArgCountError(1,arguments.length);
329331
}
330332
writeNumericArg(view,i0,o0,a0,0);
331333
rawFn();
332334
returnretGetter(view,0,true);
333-
};
335+
}}.invoke;
334336
}
335337
if(nargs===2){
336338
consti0=argInfos[0];
337339
consti1=argInfos[1];
338340
consto0=argOffsets[0];
339341
consto1=argOffsets[1];
340342
if(retGetter===null){
341-
returnfunction(a0,a1){
343+
return{invoke(a0,a1){
342344
if(arguments.length!==2){
343345
throwFFIArgCountError(2,arguments.length);
344346
}
345347
writeNumericArg(view,i0,o0,a0,0);
346348
writeNumericArg(view,i1,o1,a1,1);
347349
rawFn();
348-
};
350+
}}.invoke;
349351
}
350-
returnfunction(a0,a1){
352+
return{invoke(a0,a1){
351353
if(arguments.length!==2){
352354
throwFFIArgCountError(2,arguments.length);
353355
}
354356
writeNumericArg(view,i0,o0,a0,0);
355357
writeNumericArg(view,i1,o1,a1,1);
356358
rawFn();
357359
returnretGetter(view,0,true);
358-
};
360+
}}.invoke;
359361
}
360362
if(nargs===3){
361363
consti0=argInfos[0];
@@ -365,17 +367,17 @@ function buildNumericWrapper(
365367
consto1=argOffsets[1];
366368
consto2=argOffsets[2];
367369
if(retGetter===null){
368-
returnfunction(a0,a1,a2){
370+
return{invoke(a0,a1,a2){
369371
if(arguments.length!==3){
370372
throwFFIArgCountError(3,arguments.length);
371373
}
372374
writeNumericArg(view,i0,o0,a0,0);
373375
writeNumericArg(view,i1,o1,a1,1);
374376
writeNumericArg(view,i2,o2,a2,2);
375377
rawFn();
376-
};
378+
}}.invoke;
377379
}
378-
returnfunction(a0,a1,a2){
380+
return{invoke(a0,a1,a2){
379381
if(arguments.length!==3){
380382
throwFFIArgCountError(3,arguments.length);
381383
}
@@ -384,7 +386,7 @@ function buildNumericWrapper(
384386
writeNumericArg(view,i2,o2,a2,2);
385387
rawFn();
386388
returnretGetter(view,0,true);
387-
};
389+
}}.invoke;
388390
}
389391
if(nargs===4){
390392
consti0=argInfos[0];
@@ -396,7 +398,7 @@ function buildNumericWrapper(
396398
consto2=argOffsets[2];
397399
consto3=argOffsets[3];
398400
if(retGetter===null){
399-
returnfunction(a0,a1,a2,a3){
401+
return{invoke(a0,a1,a2,a3){
400402
if(arguments.length!==4){
401403
throwFFIArgCountError(4,arguments.length);
402404
}
@@ -405,9 +407,9 @@ function buildNumericWrapper(
405407
writeNumericArg(view,i2,o2,a2,2);
406408
writeNumericArg(view,i3,o3,a3,3);
407409
rawFn();
408-
};
410+
}}.invoke;
409411
}
410-
returnfunction(a0,a1,a2,a3){
412+
return{invoke(a0,a1,a2,a3){
411413
if(arguments.length!==4){
412414
throwFFIArgCountError(4,arguments.length);
413415
}
@@ -417,7 +419,7 @@ function buildNumericWrapper(
417419
writeNumericArg(view,i3,o3,a3,3);
418420
rawFn();
419421
returnretGetter(view,0,true);
420-
};
422+
}}.invoke;
421423
}
422424
if(nargs===5){
423425
consti0=argInfos[0];
@@ -431,7 +433,7 @@ function buildNumericWrapper(
431433
consto3=argOffsets[3];
432434
consto4=argOffsets[4];
433435
if(retGetter===null){
434-
returnfunction(a0,a1,a2,a3,a4){
436+
return{invoke(a0,a1,a2,a3,a4){
435437
if(arguments.length!==5){
436438
throwFFIArgCountError(5,arguments.length);
437439
}
@@ -441,9 +443,9 @@ function buildNumericWrapper(
441443
writeNumericArg(view,i3,o3,a3,3);
442444
writeNumericArg(view,i4,o4,a4,4);
443445
rawFn();
444-
};
446+
}}.invoke;
445447
}
446-
returnfunction(a0,a1,a2,a3,a4){
448+
return{invoke(a0,a1,a2,a3,a4){
447449
if(arguments.length!==5){
448450
throwFFIArgCountError(5,arguments.length);
449451
}
@@ -454,7 +456,7 @@ function buildNumericWrapper(
454456
writeNumericArg(view,i4,o4,a4,4);
455457
rawFn();
456458
returnretGetter(view,0,true);
457-
};
459+
}}.invoke;
458460
}
459461
if(nargs===6){
460462
consti0=argInfos[0];
@@ -470,7 +472,7 @@ function buildNumericWrapper(
470472
consto4=argOffsets[4];
471473
consto5=argOffsets[5];
472474
if(retGetter===null){
473-
returnfunction(a0,a1,a2,a3,a4,a5){
475+
return{invoke(a0,a1,a2,a3,a4,a5){
474476
if(arguments.length!==6){
475477
throwFFIArgCountError(6,arguments.length);
476478
}
@@ -481,9 +483,9 @@ function buildNumericWrapper(
481483
writeNumericArg(view,i4,o4,a4,4);
482484
writeNumericArg(view,i5,o5,a5,5);
483485
rawFn();
484-
};
486+
}}.invoke;
485487
}
486-
returnfunction(a0,a1,a2,a3,a4,a5){
488+
return{invoke(a0,a1,a2,a3,a4,a5){
487489
if(arguments.length!==6){
488490
throwFFIArgCountError(6,arguments.length);
489491
}
@@ -495,22 +497,22 @@ function buildNumericWrapper(
495497
writeNumericArg(view,i5,o5,a5,5);
496498
rawFn();
497499
returnretGetter(view,0,true);
498-
};
500+
}}.invoke;
499501
}
500502
// 7+ args: further specialization is diminishing returns and bloats
501503
// this builder.
502504
if(retGetter===null){
503-
returnfunction(...args){
505+
return{invoke(...args){
504506
if(args.length!==nargs){
505507
throwFFIArgCountError(nargs,args.length);
506508
}
507509
for(leti=0;i<nargs;i++){
508510
writeNumericArg(view,argInfos[i],argOffsets[i],args[i],i);
509511
}
510512
rawFn();
511-
};
513+
}}.invoke;
512514
}
513-
returnfunction(...args){
515+
return{invoke(...args){
514516
if(args.length!==nargs){
515517
throwFFIArgCountError(nargs,args.length);
516518
}
@@ -519,7 +521,7 @@ function buildNumericWrapper(
519521
}
520522
rawFn();
521523
returnretGetter(view,0,true);
522-
};
524+
}}.invoke;
523525
}
524526

525527
module.exports={

‎lib/internal/ffi/fast-api.js‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -254,6 +254,8 @@ function throwIfFastLibraryClosed(state) {
254254
}
255255
}
256256

257+
// Concise methods do not have [[Construct]], unlike function expressions.
258+
// Keep wrappers non-constructible to match the native FFI functions.
257259
functionwrapWithRawPointerConversions(rawFn,argumentTypes,owner){
258260
if(rawFn===undefined||rawFn===null){
259261
returnrawFn;
@@ -287,7 +289,7 @@ function wrapWithRawPointerConversions(rawFn, argumentTypes, owner) {
287289
constmemory0=needsRawPointerConversion(t0)||string0;
288290
constfastBufferInvoke=needsPointerLikeConversion(t0) ?
289291
rawFn[kFastBufferInvoke] : undefined;
290-
wrapper=function(a0){
292+
wrapper={invoke(a0){
291293
throwIfFastLibraryClosed(state);
292294
if(arguments.length!==1){
293295
throwFFIArgCountError(1,arguments.length);
@@ -312,13 +314,13 @@ function wrapWithRawPointerConversions(rawFn, argumentTypes, owner) {
312314
arg=getRawPointerArg(arg,0);
313315
}
314316
returnrawFn(arg);
315-
};
317+
}}.invoke;
316318
}elseif(nargs===2){
317319
constc0=ArrayPrototypeIncludes(indexes,0);
318320
constc1=ArrayPrototypeIncludes(indexes,1);
319321
constt0=argumentTypes[0];
320322
constt1=argumentTypes[1];
321-
wrapper=function(a0,a1){
323+
wrapper={invoke(a0,a1){
322324
throwIfFastLibraryClosed(state);
323325
if(arguments.length!==2){
324326
throwFFIArgCountError(2,arguments.length);
@@ -332,15 +334,15 @@ function wrapWithRawPointerConversions(rawFn, argumentTypes, owner) {
332334
}finally{
333335
if(stringCall)exitStringConversion(stringState);
334336
}
335-
};
337+
}}.invoke;
336338
}elseif(nargs===3){
337339
constc0=ArrayPrototypeIncludes(indexes,0);
338340
constc1=ArrayPrototypeIncludes(indexes,1);
339341
constc2=ArrayPrototypeIncludes(indexes,2);
340342
constt0=argumentTypes[0];
341343
constt1=argumentTypes[1];
342344
constt2=argumentTypes[2];
343-
wrapper=function(a0,a1,a2){
345+
wrapper={invoke(a0,a1,a2){
344346
throwIfFastLibraryClosed(state);
345347
if(arguments.length!==3){
346348
throwFFIArgCountError(3,arguments.length);
@@ -356,9 +358,9 @@ function wrapWithRawPointerConversions(rawFn, argumentTypes, owner) {
356358
}finally{
357359
if(stringCall)exitStringConversion(stringState);
358360
}
359-
};
361+
}}.invoke;
360362
}else{
361-
wrapper=function(...args){
363+
wrapper={invoke(...args){
362364
throwIfFastLibraryClosed(state);
363365
if(args.length!==nargs){
364366
throwFFIArgCountError(nargs,args.length);
@@ -382,7 +384,7 @@ function wrapWithRawPointerConversions(rawFn, argumentTypes, owner) {
382384
}finally{
383385
if(stringCall)exitStringConversion(stringState);
384386
}
385-
};
387+
}}.invoke;
386388
}
387389

388390
returninheritMetadata(wrapper,rawFn,nargs);

‎src/node_ffi.cc‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,9 @@ MaybeLocal<Function> DynamicLibrary::CreateFunction(
324324
maybe_ret = Function::New(context,
325325
use_sb ? DynamicLibrary::InvokeFunctionSB
326326
: DynamicLibrary::InvokeFunction,
327-
info->object());
327+
info->object(),
328+
0,
329+
v8::ConstructorBehavior::kThrow);
328330
}
329331

330332
Local<Function> ret;
@@ -377,8 +379,11 @@ MaybeLocal<Function> DynamicLibrary::CreateFunction(
377379
// (strings, Buffers, ArrayBuffers, and ArrayBufferViews).
378380
if (has_ptr_args) {
379381
Local<Function> slow_fn;
380-
if (!Function::New(
381-
context, DynamicLibrary::InvokeFunction, info->object())
382+
if (!Function::New(context,
383+
DynamicLibrary::InvokeFunction,
384+
info->object(),
385+
0,
386+
v8::ConstructorBehavior::kThrow)
382387
.ToLocal(&slow_fn)) {
383388
return MaybeLocal<Function>();
384389
}

‎test/ffi/test-ffi-dynamic-library.js‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,27 @@ test('dlopen resolves functions from definitions', () => {
6767
}
6868
});
6969

70+
test('FFI functions are not constructible',()=>{
71+
const{ lib, functions }=ffi.dlopen(libraryPath,{
72+
add_i32: fixtureSymbols.add_i32,
73+
multiply_f64: fixtureSymbols.multiply_f64,
74+
});
75+
76+
try{
77+
assert.strictEqual(Object.hasOwn(functions.add_i32,'prototype'),false);
78+
assert.strictEqual(
79+
Object.hasOwn(functions.multiply_f64,'prototype'),false);
80+
assert.throws(
81+
()=>Reflect.construct(functions.add_i32,[20,22]),
82+
TypeError);
83+
assert.throws(
84+
()=>Reflect.construct(functions.multiply_f64,[6,7]),
85+
TypeError);
86+
}finally{
87+
lib.close();
88+
}
89+
});
90+
7091
test('DynamicLibrary exposes functions and symbols',()=>{
7192
constlib=newffi.DynamicLibrary(libraryPath);
7293

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Commit 9024ec2

Browse files
trivikraduh95
authored andcommitted
ffi: keep FFI functions non-constructible
Use concise method functions for Fast API and shared-buffer wrappers, and create native fallback functions with ConstructorBehavior::kThrow, so FFI functions remain non-constructible on all invocation paths. Signed-off-by: Kamat, Trivikram <16024985+trivikr@users.noreply.github.com> Assisted-by: codex:gpt-5.6-sol PR-URL: #65184Fixes: #65183 Reviewed-By: Paolo Insogna <paolo@cowtech.it>
1 parent fdc1e78 commit 9024ec2

4 files changed

Lines changed: 75 additions & 45 deletions

File tree

‎lib/internal/ffi-shared-buffer.js‎

Lines changed: 36 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,8 @@ function inheritMetadata(wrapper, rawFn, nargs) {
198198
// arguments out of it into invocation-local storage before `ffi_call` and
199199
// reads the return value back only after, so nested/reentrant calls into
200200
// the same function are safe.
201+
// Concise methods do not have [[Construct]], unlike function expressions, so
202+
// use them below to match the native FFI functions' non-constructible behavior.
201203
functionwrapWithSharedBuffer(rawFn,signature){
202204
if(rawFn==null)returnrawFn;
203205
constbuffer=rawFn[kSbSharedBuffer];
@@ -254,7 +256,7 @@ function wrapWithSharedBuffer(rawFn, signature) {
254256
// so arity specialization wouldn't buy much here.
255257
assert(slowInvoke!==undefined,
256258
'FFI: shared-buffer raw function with pointer arguments is missing kSbInvokeSlow');
257-
wrapper=function(...args){
259+
wrapper={invoke(...args){
258260
if(args.length!==nargs){
259261
throwFFIArgCountError(nargs,args.length);
260262
}
@@ -271,7 +273,7 @@ function wrapWithSharedBuffer(rawFn, signature) {
271273
}
272274
rawFn();
273275
returnretGetter===null ? undefined : retGetter(view,0,true);
274-
};
276+
}}.invoke;
275277
}else{
276278
// Arity specialization avoids the per-call `Array` allocation of
277279
// `...args`; the void/non-void split removes a per-call branch on
@@ -295,67 +297,67 @@ function buildNumericWrapper(
295297
/* c8 ignore start */
296298
if(nargs===0){
297299
if(retGetter===null){
298-
returnfunction(){
300+
return{invoke(){
299301
if(arguments.length!==0){
300302
throwFFIArgCountError(0,arguments.length);
301303
}
302304
rawFn();
303-
};
305+
}}.invoke;
304306
}
305-
returnfunction(){
307+
return{invoke(){
306308
if(arguments.length!==0){
307309
throwFFIArgCountError(0,arguments.length);
308310
}
309311
rawFn();
310312
returnretGetter(view,0,true);
311-
};
313+
}}.invoke;
312314
}
313315
/* c8 ignore stop */
314316
if(nargs===1){
315317
consti0=argInfos[0];
316318
consto0=argOffsets[0];
317319
if(retGetter===null){
318-
returnfunction(a0){
320+
return{invoke(a0){
319321
if(arguments.length!==1){
320322
throwFFIArgCountError(1,arguments.length);
321323
}
322324
writeNumericArg(view,i0,o0,a0,0);
323325
rawFn();
324-
};
326+
}}.invoke;
325327
}
326-
returnfunction(a0){
328+
return{invoke(a0){
327329
if(arguments.length!==1){
328330
throwFFIArgCountError(1,arguments.length);
329331
}
330332
writeNumericArg(view,i0,o0,a0,0);
331333
rawFn();
332334
returnretGetter(view,0,true);
333-
};
335+
}}.invoke;
334336
}
335337
if(nargs===2){
336338
consti0=argInfos[0];
337339
consti1=argInfos[1];
338340
consto0=argOffsets[0];
339341
consto1=argOffsets[1];
340342
if(retGetter===null){
341-
returnfunction(a0,a1){
343+
return{invoke(a0,a1){
342344
if(arguments.length!==2){
343345
throwFFIArgCountError(2,arguments.length);
344346
}
345347
writeNumericArg(view,i0,o0,a0,0);
346348
writeNumericArg(view,i1,o1,a1,1);
347349
rawFn();
348-
};
350+
}}.invoke;
349351
}
350-
returnfunction(a0,a1){
352+
return{invoke(a0,a1){
351353
if(arguments.length!==2){
352354
throwFFIArgCountError(2,arguments.length);
353355
}
354356
writeNumericArg(view,i0,o0,a0,0);
355357
writeNumericArg(view,i1,o1,a1,1);
356358
rawFn();
357359
returnretGetter(view,0,true);
358-
};
360+
}}.invoke;
359361
}
360362
if(nargs===3){
361363
consti0=argInfos[0];
@@ -365,17 +367,17 @@ function buildNumericWrapper(
365367
consto1=argOffsets[1];
366368
consto2=argOffsets[2];
367369
if(retGetter===null){
368-
returnfunction(a0,a1,a2){
370+
return{invoke(a0,a1,a2){
369371
if(arguments.length!==3){
370372
throwFFIArgCountError(3,arguments.length);
371373
}
372374
writeNumericArg(view,i0,o0,a0,0);
373375
writeNumericArg(view,i1,o1,a1,1);
374376
writeNumericArg(view,i2,o2,a2,2);
375377
rawFn();
376-
};
378+
}}.invoke;
377379
}
378-
returnfunction(a0,a1,a2){
380+
return{invoke(a0,a1,a2){
379381
if(arguments.length!==3){
380382
throwFFIArgCountError(3,arguments.length);
381383
}
@@ -384,7 +386,7 @@ function buildNumericWrapper(
384386
writeNumericArg(view,i2,o2,a2,2);
385387
rawFn();
386388
returnretGetter(view,0,true);
387-
};
389+
}}.invoke;
388390
}
389391
if(nargs===4){
390392
consti0=argInfos[0];
@@ -396,7 +398,7 @@ function buildNumericWrapper(
396398
consto2=argOffsets[2];
397399
consto3=argOffsets[3];
398400
if(retGetter===null){
399-
returnfunction(a0,a1,a2,a3){
401+
return{invoke(a0,a1,a2,a3){
400402
if(arguments.length!==4){
401403
throwFFIArgCountError(4,arguments.length);
402404
}
@@ -405,9 +407,9 @@ function buildNumericWrapper(
405407
writeNumericArg(view,i2,o2,a2,2);
406408
writeNumericArg(view,i3,o3,a3,3);
407409
rawFn();
408-
};
410+
}}.invoke;
409411
}
410-
returnfunction(a0,a1,a2,a3){
412+
return{invoke(a0,a1,a2,a3){
411413
if(arguments.length!==4){
412414
throwFFIArgCountError(4,arguments.length);
413415
}
@@ -417,7 +419,7 @@ function buildNumericWrapper(
417419
writeNumericArg(view,i3,o3,a3,3);
418420
rawFn();
419421
returnretGetter(view,0,true);
420-
};
422+
}}.invoke;
421423
}
422424
if(nargs===5){
423425
consti0=argInfos[0];
@@ -431,7 +433,7 @@ function buildNumericWrapper(
431433
consto3=argOffsets[3];
432434
consto4=argOffsets[4];
433435
if(retGetter===null){
434-
returnfunction(a0,a1,a2,a3,a4){
436+
return{invoke(a0,a1,a2,a3,a4){
435437
if(arguments.length!==5){
436438
throwFFIArgCountError(5,arguments.length);
437439
}
@@ -441,9 +443,9 @@ function buildNumericWrapper(
441443
writeNumericArg(view,i3,o3,a3,3);
442444
writeNumericArg(view,i4,o4,a4,4);
443445
rawFn();
444-
};
446+
}}.invoke;
445447
}
446-
returnfunction(a0,a1,a2,a3,a4){
448+
return{invoke(a0,a1,a2,a3,a4){
447449
if(arguments.length!==5){
448450
throwFFIArgCountError(5,arguments.length);
449451
}
@@ -454,7 +456,7 @@ function buildNumericWrapper(
454456
writeNumericArg(view,i4,o4,a4,4);
455457
rawFn();
456458
returnretGetter(view,0,true);
457-
};
459+
}}.invoke;
458460
}
459461
if(nargs===6){
460462
consti0=argInfos[0];
@@ -470,7 +472,7 @@ function buildNumericWrapper(
470472
consto4=argOffsets[4];
471473
consto5=argOffsets[5];
472474
if(retGetter===null){
473-
returnfunction(a0,a1,a2,a3,a4,a5){
475+
return{invoke(a0,a1,a2,a3,a4,a5){
474476
if(arguments.length!==6){
475477
throwFFIArgCountError(6,arguments.length);
476478
}
@@ -481,9 +483,9 @@ function buildNumericWrapper(
481483
writeNumericArg(view,i4,o4,a4,4);
482484
writeNumericArg(view,i5,o5,a5,5);
483485
rawFn();
484-
};
486+
}}.invoke;
485487
}
486-
returnfunction(a0,a1,a2,a3,a4,a5){
488+
return{invoke(a0,a1,a2,a3,a4,a5){
487489
if(arguments.length!==6){
488490
throwFFIArgCountError(6,arguments.length);
489491
}
@@ -495,22 +497,22 @@ function buildNumericWrapper(
495497
writeNumericArg(view,i5,o5,a5,5);
496498
rawFn();
497499
returnretGetter(view,0,true);
498-
};
500+
}}.invoke;
499501
}
500502
// 7+ args: further specialization is diminishing returns and bloats
501503
// this builder.
502504
if(retGetter===null){
503-
returnfunction(...args){
505+
return{invoke(...args){
504506
if(args.length!==nargs){
505507
throwFFIArgCountError(nargs,args.length);
506508
}
507509
for(leti=0;i<nargs;i++){
508510
writeNumericArg(view,argInfos[i],argOffsets[i],args[i],i);
509511
}
510512
rawFn();
511-
};
513+
}}.invoke;
512514
}
513-
returnfunction(...args){
515+
return{invoke(...args){
514516
if(args.length!==nargs){
515517
throwFFIArgCountError(nargs,args.length);
516518
}
@@ -519,7 +521,7 @@ function buildNumericWrapper(
519521
}
520522
rawFn();
521523
returnretGetter(view,0,true);
522-
};
524+
}}.invoke;
523525
}
524526

525527
module.exports={

‎lib/internal/ffi/fast-api.js‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -254,6 +254,8 @@ function throwIfFastLibraryClosed(state) {
254254
}
255255
}
256256

257+
// Concise methods do not have [[Construct]], unlike function expressions.
258+
// Keep wrappers non-constructible to match the native FFI functions.
257259
functionwrapWithRawPointerConversions(rawFn,argumentTypes,owner){
258260
if(rawFn===undefined||rawFn===null){
259261
returnrawFn;
@@ -287,7 +289,7 @@ function wrapWithRawPointerConversions(rawFn, argumentTypes, owner) {
287289
constmemory0=needsRawPointerConversion(t0)||string0;
288290
constfastBufferInvoke=needsPointerLikeConversion(t0) ?
289291
rawFn[kFastBufferInvoke] : undefined;
290-
wrapper=function(a0){
292+
wrapper={invoke(a0){
291293
throwIfFastLibraryClosed(state);
292294
if(arguments.length!==1){
293295
throwFFIArgCountError(1,arguments.length);
@@ -312,13 +314,13 @@ function wrapWithRawPointerConversions(rawFn, argumentTypes, owner) {
312314
arg=getRawPointerArg(arg,0);
313315
}
314316
returnrawFn(arg);
315-
};
317+
}}.invoke;
316318
}elseif(nargs===2){
317319
constc0=ArrayPrototypeIncludes(indexes,0);
318320
constc1=ArrayPrototypeIncludes(indexes,1);
319321
constt0=argumentTypes[0];
320322
constt1=argumentTypes[1];
321-
wrapper=function(a0,a1){
323+
wrapper={invoke(a0,a1){
322324
throwIfFastLibraryClosed(state);
323325
if(arguments.length!==2){
324326
throwFFIArgCountError(2,arguments.length);
@@ -332,15 +334,15 @@ function wrapWithRawPointerConversions(rawFn, argumentTypes, owner) {
332334
}finally{
333335
if(stringCall)exitStringConversion(stringState);
334336
}
335-
};
337+
}}.invoke;
336338
}elseif(nargs===3){
337339
constc0=ArrayPrototypeIncludes(indexes,0);
338340
constc1=ArrayPrototypeIncludes(indexes,1);
339341
constc2=ArrayPrototypeIncludes(indexes,2);
340342
constt0=argumentTypes[0];
341343
constt1=argumentTypes[1];
342344
constt2=argumentTypes[2];
343-
wrapper=function(a0,a1,a2){
345+
wrapper={invoke(a0,a1,a2){
344346
throwIfFastLibraryClosed(state);
345347
if(arguments.length!==3){
346348
throwFFIArgCountError(3,arguments.length);
@@ -356,9 +358,9 @@ function wrapWithRawPointerConversions(rawFn, argumentTypes, owner) {
356358
}finally{
357359
if(stringCall)exitStringConversion(stringState);
358360
}
359-
};
361+
}}.invoke;
360362
}else{
361-
wrapper=function(...args){
363+
wrapper={invoke(...args){
362364
throwIfFastLibraryClosed(state);
363365
if(args.length!==nargs){
364366
throwFFIArgCountError(nargs,args.length);
@@ -382,7 +384,7 @@ function wrapWithRawPointerConversions(rawFn, argumentTypes, owner) {
382384
}finally{
383385
if(stringCall)exitStringConversion(stringState);
384386
}
385-
};
387+
}}.invoke;
386388
}
387389

388390
returninheritMetadata(wrapper,rawFn,nargs);

‎src/node_ffi.cc‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,9 @@ MaybeLocal<Function> DynamicLibrary::CreateFunction(
324324
maybe_ret = Function::New(context,
325325
use_sb ? DynamicLibrary::InvokeFunctionSB
326326
: DynamicLibrary::InvokeFunction,
327-
info->object());
327+
info->object(),
328+
0,
329+
v8::ConstructorBehavior::kThrow);
328330
}
329331

330332
Local<Function> ret;
@@ -377,8 +379,11 @@ MaybeLocal<Function> DynamicLibrary::CreateFunction(
377379
// (strings, Buffers, ArrayBuffers, and ArrayBufferViews).
378380
if (has_ptr_args) {
379381
Local<Function> slow_fn;
380-
if (!Function::New(
381-
context, DynamicLibrary::InvokeFunction, info->object())
382+
if (!Function::New(context,
383+
DynamicLibrary::InvokeFunction,
384+
info->object(),
385+
0,
386+
v8::ConstructorBehavior::kThrow)
382387
.ToLocal(&slow_fn)) {
383388
return MaybeLocal<Function>();
384389
}

‎test/ffi/test-ffi-dynamic-library.js‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,27 @@ test('dlopen resolves functions from definitions', () => {
6767
}
6868
});
6969

70+
test('FFI functions are not constructible',()=>{
71+
const{ lib, functions }=ffi.dlopen(libraryPath,{
72+
add_i32: fixtureSymbols.add_i32,
73+
multiply_f64: fixtureSymbols.multiply_f64,
74+
});
75+
76+
try{
77+
assert.strictEqual(Object.hasOwn(functions.add_i32,'prototype'),false);
78+
assert.strictEqual(
79+
Object.hasOwn(functions.multiply_f64,'prototype'),false);
80+
assert.throws(
81+
()=>Reflect.construct(functions.add_i32,[20,22]),
82+
TypeError);
83+
assert.throws(
84+
()=>Reflect.construct(functions.multiply_f64,[6,7]),
85+
TypeError);
86+
}finally{
87+
lib.close();
88+
}
89+
});
90+
7091
test('DynamicLibrary exposes functions and symbols',()=>{
7192
constlib=newffi.DynamicLibrary(libraryPath);
7293

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Commit 9024ec2

Browse files
trivikraduh95
authored andcommitted
ffi: keep FFI functions non-constructible
Use concise method functions for Fast API and shared-buffer wrappers, and create native fallback functions with ConstructorBehavior::kThrow, so FFI functions remain non-constructible on all invocation paths. Signed-off-by: Kamat, Trivikram <16024985+trivikr@users.noreply.github.com> Assisted-by: codex:gpt-5.6-sol PR-URL: #65184Fixes: #65183 Reviewed-By: Paolo Insogna <paolo@cowtech.it>
1 parent fdc1e78 commit 9024ec2

4 files changed

Lines changed: 75 additions & 45 deletions

File tree

‎lib/internal/ffi-shared-buffer.js‎

Lines changed: 36 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,8 @@ function inheritMetadata(wrapper, rawFn, nargs) {
198198
// arguments out of it into invocation-local storage before `ffi_call` and
199199
// reads the return value back only after, so nested/reentrant calls into
200200
// the same function are safe.
201+
// Concise methods do not have [[Construct]], unlike function expressions, so
202+
// use them below to match the native FFI functions' non-constructible behavior.
201203
functionwrapWithSharedBuffer(rawFn,signature){
202204
if(rawFn==null)returnrawFn;
203205
constbuffer=rawFn[kSbSharedBuffer];
@@ -254,7 +256,7 @@ function wrapWithSharedBuffer(rawFn, signature) {
254256
// so arity specialization wouldn't buy much here.
255257
assert(slowInvoke!==undefined,
256258
'FFI: shared-buffer raw function with pointer arguments is missing kSbInvokeSlow');
257-
wrapper=function(...args){
259+
wrapper={invoke(...args){
258260
if(args.length!==nargs){
259261
throwFFIArgCountError(nargs,args.length);
260262
}
@@ -271,7 +273,7 @@ function wrapWithSharedBuffer(rawFn, signature) {
271273
}
272274
rawFn();
273275
returnretGetter===null ? undefined : retGetter(view,0,true);
274-
};
276+
}}.invoke;
275277
}else{
276278
// Arity specialization avoids the per-call `Array` allocation of
277279
// `...args`; the void/non-void split removes a per-call branch on
@@ -295,67 +297,67 @@ function buildNumericWrapper(
295297
/* c8 ignore start */
296298
if(nargs===0){
297299
if(retGetter===null){
298-
returnfunction(){
300+
return{invoke(){
299301
if(arguments.length!==0){
300302
throwFFIArgCountError(0,arguments.length);
301303
}
302304
rawFn();
303-
};
305+
}}.invoke;
304306
}
305-
returnfunction(){
307+
return{invoke(){
306308
if(arguments.length!==0){
307309
throwFFIArgCountError(0,arguments.length);
308310
}
309311
rawFn();
310312
returnretGetter(view,0,true);
311-
};
313+
}}.invoke;
312314
}
313315
/* c8 ignore stop */
314316
if(nargs===1){
315317
consti0=argInfos[0];
316318
consto0=argOffsets[0];
317319
if(retGetter===null){
318-
returnfunction(a0){
320+
return{invoke(a0){
319321
if(arguments.length!==1){
320322
throwFFIArgCountError(1,arguments.length);
321323
}
322324
writeNumericArg(view,i0,o0,a0,0);
323325
rawFn();
324-
};
326+
}}.invoke;
325327
}
326-
returnfunction(a0){
328+
return{invoke(a0){
327329
if(arguments.length!==1){
328330
throwFFIArgCountError(1,arguments.length);
329331
}
330332
writeNumericArg(view,i0,o0,a0,0);
331333
rawFn();
332334
returnretGetter(view,0,true);
333-
};
335+
}}.invoke;
334336
}
335337
if(nargs===2){
336338
consti0=argInfos[0];
337339
consti1=argInfos[1];
338340
consto0=argOffsets[0];
339341
consto1=argOffsets[1];
340342
if(retGetter===null){
341-
returnfunction(a0,a1){
343+
return{invoke(a0,a1){
342344
if(arguments.length!==2){
343345
throwFFIArgCountError(2,arguments.length);
344346
}
345347
writeNumericArg(view,i0,o0,a0,0);
346348
writeNumericArg(view,i1,o1,a1,1);
347349
rawFn();
348-
};
350+
}}.invoke;
349351
}
350-
returnfunction(a0,a1){
352+
return{invoke(a0,a1){
351353
if(arguments.length!==2){
352354
throwFFIArgCountError(2,arguments.length);
353355
}
354356
writeNumericArg(view,i0,o0,a0,0);
355357
writeNumericArg(view,i1,o1,a1,1);
356358
rawFn();
357359
returnretGetter(view,0,true);
358-
};
360+
}}.invoke;
359361
}
360362
if(nargs===3){
361363
consti0=argInfos[0];
@@ -365,17 +367,17 @@ function buildNumericWrapper(
365367
consto1=argOffsets[1];
366368
consto2=argOffsets[2];
367369
if(retGetter===null){
368-
returnfunction(a0,a1,a2){
370+
return{invoke(a0,a1,a2){
369371
if(arguments.length!==3){
370372
throwFFIArgCountError(3,arguments.length);
371373
}
372374
writeNumericArg(view,i0,o0,a0,0);
373375
writeNumericArg(view,i1,o1,a1,1);
374376
writeNumericArg(view,i2,o2,a2,2);
375377
rawFn();
376-
};
378+
}}.invoke;
377379
}
378-
returnfunction(a0,a1,a2){
380+
return{invoke(a0,a1,a2){
379381
if(arguments.length!==3){
380382
throwFFIArgCountError(3,arguments.length);
381383
}
@@ -384,7 +386,7 @@ function buildNumericWrapper(
384386
writeNumericArg(view,i2,o2,a2,2);
385387
rawFn();
386388
returnretGetter(view,0,true);
387-
};
389+
}}.invoke;
388390
}
389391
if(nargs===4){
390392
consti0=argInfos[0];
@@ -396,7 +398,7 @@ function buildNumericWrapper(
396398
consto2=argOffsets[2];
397399
consto3=argOffsets[3];
398400
if(retGetter===null){
399-
returnfunction(a0,a1,a2,a3){
401+
return{invoke(a0,a1,a2,a3){
400402
if(arguments.length!==4){
401403
throwFFIArgCountError(4,arguments.length);
402404
}
@@ -405,9 +407,9 @@ function buildNumericWrapper(
405407
writeNumericArg(view,i2,o2,a2,2);
406408
writeNumericArg(view,i3,o3,a3,3);
407409
rawFn();
408-
};
410+
}}.invoke;
409411
}
410-
returnfunction(a0,a1,a2,a3){
412+
return{invoke(a0,a1,a2,a3){
411413
if(arguments.length!==4){
412414
throwFFIArgCountError(4,arguments.length);
413415
}
@@ -417,7 +419,7 @@ function buildNumericWrapper(
417419
writeNumericArg(view,i3,o3,a3,3);
418420
rawFn();
419421
returnretGetter(view,0,true);
420-
};
422+
}}.invoke;
421423
}
422424
if(nargs===5){
423425
consti0=argInfos[0];
@@ -431,7 +433,7 @@ function buildNumericWrapper(
431433
consto3=argOffsets[3];
432434
consto4=argOffsets[4];
433435
if(retGetter===null){
434-
returnfunction(a0,a1,a2,a3,a4){
436+
return{invoke(a0,a1,a2,a3,a4){
435437
if(arguments.length!==5){
436438
throwFFIArgCountError(5,arguments.length);
437439
}
@@ -441,9 +443,9 @@ function buildNumericWrapper(
441443
writeNumericArg(view,i3,o3,a3,3);
442444
writeNumericArg(view,i4,o4,a4,4);
443445
rawFn();
444-
};
446+
}}.invoke;
445447
}
446-
returnfunction(a0,a1,a2,a3,a4){
448+
return{invoke(a0,a1,a2,a3,a4){
447449
if(arguments.length!==5){
448450
throwFFIArgCountError(5,arguments.length);
449451
}
@@ -454,7 +456,7 @@ function buildNumericWrapper(
454456
writeNumericArg(view,i4,o4,a4,4);
455457
rawFn();
456458
returnretGetter(view,0,true);
457-
};
459+
}}.invoke;
458460
}
459461
if(nargs===6){
460462
consti0=argInfos[0];
@@ -470,7 +472,7 @@ function buildNumericWrapper(
470472
consto4=argOffsets[4];
471473
consto5=argOffsets[5];
472474
if(retGetter===null){
473-
returnfunction(a0,a1,a2,a3,a4,a5){
475+
return{invoke(a0,a1,a2,a3,a4,a5){
474476
if(arguments.length!==6){
475477
throwFFIArgCountError(6,arguments.length);
476478
}
@@ -481,9 +483,9 @@ function buildNumericWrapper(
481483
writeNumericArg(view,i4,o4,a4,4);
482484
writeNumericArg(view,i5,o5,a5,5);
483485
rawFn();
484-
};
486+
}}.invoke;
485487
}
486-
returnfunction(a0,a1,a2,a3,a4,a5){
488+
return{invoke(a0,a1,a2,a3,a4,a5){
487489
if(arguments.length!==6){
488490
throwFFIArgCountError(6,arguments.length);
489491
}
@@ -495,22 +497,22 @@ function buildNumericWrapper(
495497
writeNumericArg(view,i5,o5,a5,5);
496498
rawFn();
497499
returnretGetter(view,0,true);
498-
};
500+
}}.invoke;
499501
}
500502
// 7+ args: further specialization is diminishing returns and bloats
501503
// this builder.
502504
if(retGetter===null){
503-
returnfunction(...args){
505+
return{invoke(...args){
504506
if(args.length!==nargs){
505507
throwFFIArgCountError(nargs,args.length);
506508
}
507509
for(leti=0;i<nargs;i++){
508510
writeNumericArg(view,argInfos[i],argOffsets[i],args[i],i);
509511
}
510512
rawFn();
511-
};
513+
}}.invoke;
512514
}
513-
returnfunction(...args){
515+
return{invoke(...args){
514516
if(args.length!==nargs){
515517
throwFFIArgCountError(nargs,args.length);
516518
}
@@ -519,7 +521,7 @@ function buildNumericWrapper(
519521
}
520522
rawFn();
521523
returnretGetter(view,0,true);
522-
};
524+
}}.invoke;
523525
}
524526

525527
module.exports={

‎lib/internal/ffi/fast-api.js‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -254,6 +254,8 @@ function throwIfFastLibraryClosed(state) {
254254
}
255255
}
256256

257+
// Concise methods do not have [[Construct]], unlike function expressions.
258+
// Keep wrappers non-constructible to match the native FFI functions.
257259
functionwrapWithRawPointerConversions(rawFn,argumentTypes,owner){
258260
if(rawFn===undefined||rawFn===null){
259261
returnrawFn;
@@ -287,7 +289,7 @@ function wrapWithRawPointerConversions(rawFn, argumentTypes, owner) {
287289
constmemory0=needsRawPointerConversion(t0)||string0;
288290
constfastBufferInvoke=needsPointerLikeConversion(t0) ?
289291
rawFn[kFastBufferInvoke] : undefined;
290-
wrapper=function(a0){
292+
wrapper={invoke(a0){
291293
throwIfFastLibraryClosed(state);
292294
if(arguments.length!==1){
293295
throwFFIArgCountError(1,arguments.length);
@@ -312,13 +314,13 @@ function wrapWithRawPointerConversions(rawFn, argumentTypes, owner) {
312314
arg=getRawPointerArg(arg,0);
313315
}
314316
returnrawFn(arg);
315-
};
317+
}}.invoke;
316318
}elseif(nargs===2){
317319
constc0=ArrayPrototypeIncludes(indexes,0);
318320
constc1=ArrayPrototypeIncludes(indexes,1);
319321
constt0=argumentTypes[0];
320322
constt1=argumentTypes[1];
321-
wrapper=function(a0,a1){
323+
wrapper={invoke(a0,a1){
322324
throwIfFastLibraryClosed(state);
323325
if(arguments.length!==2){
324326
throwFFIArgCountError(2,arguments.length);
@@ -332,15 +334,15 @@ function wrapWithRawPointerConversions(rawFn, argumentTypes, owner) {
332334
}finally{
333335
if(stringCall)exitStringConversion(stringState);
334336
}
335-
};
337+
}}.invoke;
336338
}elseif(nargs===3){
337339
constc0=ArrayPrototypeIncludes(indexes,0);
338340
constc1=ArrayPrototypeIncludes(indexes,1);
339341
constc2=ArrayPrototypeIncludes(indexes,2);
340342
constt0=argumentTypes[0];
341343
constt1=argumentTypes[1];
342344
constt2=argumentTypes[2];
343-
wrapper=function(a0,a1,a2){
345+
wrapper={invoke(a0,a1,a2){
344346
throwIfFastLibraryClosed(state);
345347
if(arguments.length!==3){
346348
throwFFIArgCountError(3,arguments.length);
@@ -356,9 +358,9 @@ function wrapWithRawPointerConversions(rawFn, argumentTypes, owner) {
356358
}finally{
357359
if(stringCall)exitStringConversion(stringState);
358360
}
359-
};
361+
}}.invoke;
360362
}else{
361-
wrapper=function(...args){
363+
wrapper={invoke(...args){
362364
throwIfFastLibraryClosed(state);
363365
if(args.length!==nargs){
364366
throwFFIArgCountError(nargs,args.length);
@@ -382,7 +384,7 @@ function wrapWithRawPointerConversions(rawFn, argumentTypes, owner) {
382384
}finally{
383385
if(stringCall)exitStringConversion(stringState);
384386
}
385-
};
387+
}}.invoke;
386388
}
387389

388390
returninheritMetadata(wrapper,rawFn,nargs);

‎src/node_ffi.cc‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,9 @@ MaybeLocal<Function> DynamicLibrary::CreateFunction(
324324
maybe_ret = Function::New(context,
325325
use_sb ? DynamicLibrary::InvokeFunctionSB
326326
: DynamicLibrary::InvokeFunction,
327-
info->object());
327+
info->object(),
328+
0,
329+
v8::ConstructorBehavior::kThrow);
328330
}
329331

330332
Local<Function> ret;
@@ -377,8 +379,11 @@ MaybeLocal<Function> DynamicLibrary::CreateFunction(
377379
// (strings, Buffers, ArrayBuffers, and ArrayBufferViews).
378380
if (has_ptr_args) {
379381
Local<Function> slow_fn;
380-
if (!Function::New(
381-
context, DynamicLibrary::InvokeFunction, info->object())
382+
if (!Function::New(context,
383+
DynamicLibrary::InvokeFunction,
384+
info->object(),
385+
0,
386+
v8::ConstructorBehavior::kThrow)
382387
.ToLocal(&slow_fn)) {
383388
return MaybeLocal<Function>();
384389
}

‎test/ffi/test-ffi-dynamic-library.js‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,27 @@ test('dlopen resolves functions from definitions', () => {
6767
}
6868
});
6969

70+
test('FFI functions are not constructible',()=>{
71+
const{ lib, functions }=ffi.dlopen(libraryPath,{
72+
add_i32: fixtureSymbols.add_i32,
73+
multiply_f64: fixtureSymbols.multiply_f64,
74+
});
75+
76+
try{
77+
assert.strictEqual(Object.hasOwn(functions.add_i32,'prototype'),false);
78+
assert.strictEqual(
79+
Object.hasOwn(functions.multiply_f64,'prototype'),false);
80+
assert.throws(
81+
()=>Reflect.construct(functions.add_i32,[20,22]),
82+
TypeError);
83+
assert.throws(
84+
()=>Reflect.construct(functions.multiply_f64,[6,7]),
85+
TypeError);
86+
}finally{
87+
lib.close();
88+
}
89+
});
90+
7091
test('DynamicLibrary exposes functions and symbols',()=>{
7192
constlib=newffi.DynamicLibrary(libraryPath);
7293

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content

Commit 9024ec2

Browse files
trivikraduh95
authored andcommitted
ffi: keep FFI functions non-constructible
Use concise method functions for Fast API and shared-buffer wrappers, and create native fallback functions with ConstructorBehavior::kThrow, so FFI functions remain non-constructible on all invocation paths. Signed-off-by: Kamat, Trivikram <16024985+trivikr@users.noreply.github.com> Assisted-by: codex:gpt-5.6-sol PR-URL: #65184Fixes: #65183 Reviewed-By: Paolo Insogna <paolo@cowtech.it>
1 parent fdc1e78 commit 9024ec2

4 files changed

Lines changed: 75 additions & 45 deletions

File tree

‎lib/internal/ffi-shared-buffer.js‎

Lines changed: 36 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,8 @@ function inheritMetadata(wrapper, rawFn, nargs) {
198198
// arguments out of it into invocation-local storage before `ffi_call` and
199199
// reads the return value back only after, so nested/reentrant calls into
200200
// the same function are safe.
201+
// Concise methods do not have [[Construct]], unlike function expressions, so
202+
// use them below to match the native FFI functions' non-constructible behavior.
201203
functionwrapWithSharedBuffer(rawFn,signature){
202204
if(rawFn==null)returnrawFn;
203205
constbuffer=rawFn[kSbSharedBuffer];
@@ -254,7 +256,7 @@ function wrapWithSharedBuffer(rawFn, signature) {
254256
// so arity specialization wouldn't buy much here.
255257
assert(slowInvoke!==undefined,
256258
'FFI: shared-buffer raw function with pointer arguments is missing kSbInvokeSlow');
257-
wrapper=function(...args){
259+
wrapper={invoke(...args){
258260
if(args.length!==nargs){
259261
throwFFIArgCountError(nargs,args.length);
260262
}
@@ -271,7 +273,7 @@ function wrapWithSharedBuffer(rawFn, signature) {
271273
}
272274
rawFn();
273275
returnretGetter===null ? undefined : retGetter(view,0,true);
274-
};
276+
}}.invoke;
275277
}else{
276278
// Arity specialization avoids the per-call `Array` allocation of
277279
// `...args`; the void/non-void split removes a per-call branch on
@@ -295,67 +297,67 @@ function buildNumericWrapper(
295297
/* c8 ignore start */
296298
if(nargs===0){
297299
if(retGetter===null){
298-
returnfunction(){
300+
return{invoke(){
299301
if(arguments.length!==0){
300302
throwFFIArgCountError(0,arguments.length);
301303
}
302304
rawFn();
303-
};
305+
}}.invoke;
304306
}
305-
returnfunction(){
307+
return{invoke(){
306308
if(arguments.length!==0){
307309
throwFFIArgCountError(0,arguments.length);
308310
}
309311
rawFn();
310312
returnretGetter(view,0,true);
311-
};
313+
}}.invoke;
312314
}
313315
/* c8 ignore stop */
314316
if(nargs===1){
315317
consti0=argInfos[0];
316318
consto0=argOffsets[0];
317319
if(retGetter===null){
318-
returnfunction(a0){
320+
return{invoke(a0){
319321
if(arguments.length!==1){
320322
throwFFIArgCountError(1,arguments.length);
321323
}
322324
writeNumericArg(view,i0,o0,a0,0);
323325
rawFn();
324-
};
326+
}}.invoke;
325327
}
326-
returnfunction(a0){
328+
return{invoke(a0){
327329
if(arguments.length!==1){
328330
throwFFIArgCountError(1,arguments.length);
329331
}
330332
writeNumericArg(view,i0,o0,a0,0);
331333
rawFn();
332334
returnretGetter(view,0,true);
333-
};
335+
}}.invoke;
334336
}
335337
if(nargs===2){
336338
consti0=argInfos[0];
337339
consti1=argInfos[1];
338340
consto0=argOffsets[0];
339341
consto1=argOffsets[1];
340342
if(retGetter===null){
341-
returnfunction(a0,a1){
343+
return{invoke(a0,a1){
342344
if(arguments.length!==2){
343345
throwFFIArgCountError(2,arguments.length);
344346
}
345347
writeNumericArg(view,i0,o0,a0,0);
346348
writeNumericArg(view,i1,o1,a1,1);
347349
rawFn();
348-
};
350+
}}.invoke;
349351
}
350-
returnfunction(a0,a1){
352+
return{invoke(a0,a1){
351353
if(arguments.length!==2){
352354
throwFFIArgCountError(2,arguments.length);
353355
}
354356
writeNumericArg(view,i0,o0,a0,0);
355357
writeNumericArg(view,i1,o1,a1,1);
356358
rawFn();
357359
returnretGetter(view,0,true);
358-
};
360+
}}.invoke;
359361
}
360362
if(nargs===3){
361363
consti0=argInfos[0];
@@ -365,17 +367,17 @@ function buildNumericWrapper(
365367
consto1=argOffsets[1];
366368
consto2=argOffsets[2];
367369
if(retGetter===null){
368-
returnfunction(a0,a1,a2){
370+
return{invoke(a0,a1,a2){
369371
if(arguments.length!==3){
370372
throwFFIArgCountError(3,arguments.length);
371373
}
372374
writeNumericArg(view,i0,o0,a0,0);
373375
writeNumericArg(view,i1,o1,a1,1);
374376
writeNumericArg(view,i2,o2,a2,2);
375377
rawFn();
376-
};
378+
}}.invoke;
377379
}
378-
returnfunction(a0,a1,a2){
380+
return{invoke(a0,a1,a2){
379381
if(arguments.length!==3){
380382
throwFFIArgCountError(3,arguments.length);
381383
}
@@ -384,7 +386,7 @@ function buildNumericWrapper(
384386
writeNumericArg(view,i2,o2,a2,2);
385387
rawFn();
386388
returnretGetter(view,0,true);
387-
};
389+
}}.invoke;
388390
}
389391
if(nargs===4){
390392
consti0=argInfos[0];
@@ -396,7 +398,7 @@ function buildNumericWrapper(
396398
consto2=argOffsets[2];
397399
consto3=argOffsets[3];
398400
if(retGetter===null){
399-
returnfunction(a0,a1,a2,a3){
401+
return{invoke(a0,a1,a2,a3){
400402
if(arguments.length!==4){
401403
throwFFIArgCountError(4,arguments.length);
402404
}
@@ -405,9 +407,9 @@ function buildNumericWrapper(
405407
writeNumericArg(view,i2,o2,a2,2);
406408
writeNumericArg(view,i3,o3,a3,3);
407409
rawFn();
408-
};
410+
}}.invoke;
409411
}
410-
returnfunction(a0,a1,a2,a3){
412+
return{invoke(a0,a1,a2,a3){
411413
if(arguments.length!==4){
412414
throwFFIArgCountError(4,arguments.length);
413415
}
@@ -417,7 +419,7 @@ function buildNumericWrapper(
417419
writeNumericArg(view,i3,o3,a3,3);
418420
rawFn();
419421
returnretGetter(view,0,true);
420-
};
422+
}}.invoke;
421423
}
422424
if(nargs===5){
423425
consti0=argInfos[0];
@@ -431,7 +433,7 @@ function buildNumericWrapper(
431433
consto3=argOffsets[3];
432434
consto4=argOffsets[4];
433435
if(retGetter===null){
434-
returnfunction(a0,a1,a2,a3,a4){
436+
return{invoke(a0,a1,a2,a3,a4){
435437
if(arguments.length!==5){
436438
throwFFIArgCountError(5,arguments.length);
437439
}
@@ -441,9 +443,9 @@ function buildNumericWrapper(
441443
writeNumericArg(view,i3,o3,a3,3);
442444
writeNumericArg(view,i4,o4,a4,4);
443445
rawFn();
444-
};
446+
}}.invoke;
445447
}
446-
returnfunction(a0,a1,a2,a3,a4){
448+
return{invoke(a0,a1,a2,a3,a4){
447449
if(arguments.length!==5){
448450
throwFFIArgCountError(5,arguments.length);
449451
}
@@ -454,7 +456,7 @@ function buildNumericWrapper(
454456
writeNumericArg(view,i4,o4,a4,4);
455457
rawFn();
456458
returnretGetter(view,0,true);
457-
};
459+
}}.invoke;
458460
}
459461
if(nargs===6){
460462
consti0=argInfos[0];
@@ -470,7 +472,7 @@ function buildNumericWrapper(
470472
consto4=argOffsets[4];
471473
consto5=argOffsets[5];
472474
if(retGetter===null){
473-
returnfunction(a0,a1,a2,a3,a4,a5){
475+
return{invoke(a0,a1,a2,a3,a4,a5){
474476
if(arguments.length!==6){
475477
throwFFIArgCountError(6,arguments.length);
476478
}
@@ -481,9 +483,9 @@ function buildNumericWrapper(
481483
writeNumericArg(view,i4,o4,a4,4);
482484
writeNumericArg(view,i5,o5,a5,5);
483485
rawFn();
484-
};
486+
}}.invoke;
485487
}
486-
returnfunction(a0,a1,a2,a3,a4,a5){
488+
return{invoke(a0,a1,a2,a3,a4,a5){
487489
if(arguments.length!==6){
488490
throwFFIArgCountError(6,arguments.length);
489491
}
@@ -495,22 +497,22 @@ function buildNumericWrapper(
495497
writeNumericArg(view,i5,o5,a5,5);
496498
rawFn();
497499
returnretGetter(view,0,true);
498-
};
500+
}}.invoke;
499501
}
500502
// 7+ args: further specialization is diminishing returns and bloats
501503
// this builder.
502504
if(retGetter===null){
503-
returnfunction(...args){
505+
return{invoke(...args){
504506
if(args.length!==nargs){
505507
throwFFIArgCountError(nargs,args.length);
506508
}
507509
for(leti=0;i<nargs;i++){
508510
writeNumericArg(view,argInfos[i],argOffsets[i],args[i],i);
509511
}
510512
rawFn();
511-
};
513+
}}.invoke;
512514
}
513-
returnfunction(...args){
515+
return{invoke(...args){
514516
if(args.length!==nargs){
515517
throwFFIArgCountError(nargs,args.length);
516518
}
@@ -519,7 +521,7 @@ function buildNumericWrapper(
519521
}
520522
rawFn();
521523
returnretGetter(view,0,true);
522-
};
524+
}}.invoke;
523525
}
524526

525527
module.exports={

‎lib/internal/ffi/fast-api.js‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -254,6 +254,8 @@ function throwIfFastLibraryClosed(state) {
254254
}
255255
}
256256

257+
// Concise methods do not have [[Construct]], unlike function expressions.
258+
// Keep wrappers non-constructible to match the native FFI functions.
257259
functionwrapWithRawPointerConversions(rawFn,argumentTypes,owner){
258260
if(rawFn===undefined||rawFn===null){
259261
returnrawFn;
@@ -287,7 +289,7 @@ function wrapWithRawPointerConversions(rawFn, argumentTypes, owner) {
287289
constmemory0=needsRawPointerConversion(t0)||string0;
288290
constfastBufferInvoke=needsPointerLikeConversion(t0) ?
289291
rawFn[kFastBufferInvoke] : undefined;
290-
wrapper=function(a0){
292+
wrapper={invoke(a0){
291293
throwIfFastLibraryClosed(state);
292294
if(arguments.length!==1){
293295
throwFFIArgCountError(1,arguments.length);
@@ -312,13 +314,13 @@ function wrapWithRawPointerConversions(rawFn, argumentTypes, owner) {
312314
arg=getRawPointerArg(arg,0);
313315
}
314316
returnrawFn(arg);
315-
};
317+
}}.invoke;
316318
}elseif(nargs===2){
317319
constc0=ArrayPrototypeIncludes(indexes,0);
318320
constc1=ArrayPrototypeIncludes(indexes,1);
319321
constt0=argumentTypes[0];
320322
constt1=argumentTypes[1];
321-
wrapper=function(a0,a1){
323+
wrapper={invoke(a0,a1){
322324
throwIfFastLibraryClosed(state);
323325
if(arguments.length!==2){
324326
throwFFIArgCountError(2,arguments.length);
@@ -332,15 +334,15 @@ function wrapWithRawPointerConversions(rawFn, argumentTypes, owner) {
332334
}finally{
333335
if(stringCall)exitStringConversion(stringState);
334336
}
335-
};
337+
}}.invoke;
336338
}elseif(nargs===3){
337339
constc0=ArrayPrototypeIncludes(indexes,0);
338340
constc1=ArrayPrototypeIncludes(indexes,1);
339341
constc2=ArrayPrototypeIncludes(indexes,2);
340342
constt0=argumentTypes[0];
341343
constt1=argumentTypes[1];
342344
constt2=argumentTypes[2];
343-
wrapper=function(a0,a1,a2){
345+
wrapper={invoke(a0,a1,a2){
344346
throwIfFastLibraryClosed(state);
345347
if(arguments.length!==3){
346348
throwFFIArgCountError(3,arguments.length);
@@ -356,9 +358,9 @@ function wrapWithRawPointerConversions(rawFn, argumentTypes, owner) {
356358
}finally{
357359
if(stringCall)exitStringConversion(stringState);
358360
}
359-
};
361+
}}.invoke;
360362
}else{
361-
wrapper=function(...args){
363+
wrapper={invoke(...args){
362364
throwIfFastLibraryClosed(state);
363365
if(args.length!==nargs){
364366
throwFFIArgCountError(nargs,args.length);
@@ -382,7 +384,7 @@ function wrapWithRawPointerConversions(rawFn, argumentTypes, owner) {
382384
}finally{
383385
if(stringCall)exitStringConversion(stringState);
384386
}
385-
};
387+
}}.invoke;
386388
}
387389

388390
returninheritMetadata(wrapper,rawFn,nargs);

‎src/node_ffi.cc‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,9 @@ MaybeLocal<Function> DynamicLibrary::CreateFunction(
324324
maybe_ret = Function::New(context,
325325
use_sb ? DynamicLibrary::InvokeFunctionSB
326326
: DynamicLibrary::InvokeFunction,
327-
info->object());
327+
info->object(),
328+
0,
329+
v8::ConstructorBehavior::kThrow);
328330
}
329331

330332
Local<Function> ret;
@@ -377,8 +379,11 @@ MaybeLocal<Function> DynamicLibrary::CreateFunction(
377379
// (strings, Buffers, ArrayBuffers, and ArrayBufferViews).
378380
if (has_ptr_args) {
379381
Local<Function> slow_fn;
380-
if (!Function::New(
381-
context, DynamicLibrary::InvokeFunction, info->object())
382+
if (!Function::New(context,
383+
DynamicLibrary::InvokeFunction,
384+
info->object(),
385+
0,
386+
v8::ConstructorBehavior::kThrow)
382387
.ToLocal(&slow_fn)) {
383388
return MaybeLocal<Function>();
384389
}

‎test/ffi/test-ffi-dynamic-library.js‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,27 @@ test('dlopen resolves functions from definitions', () => {
6767
}
6868
});
6969

70+
test('FFI functions are not constructible',()=>{
71+
const{ lib, functions }=ffi.dlopen(libraryPath,{
72+
add_i32: fixtureSymbols.add_i32,
73+
multiply_f64: fixtureSymbols.multiply_f64,
74+
});
75+
76+
try{
77+
assert.strictEqual(Object.hasOwn(functions.add_i32,'prototype'),false);
78+
assert.strictEqual(
79+
Object.hasOwn(functions.multiply_f64,'prototype'),false);
80+
assert.throws(
81+
()=>Reflect.construct(functions.add_i32,[20,22]),
82+
TypeError);
83+
assert.throws(
84+
()=>Reflect.construct(functions.multiply_f64,[6,7]),
85+
TypeError);
86+
}finally{
87+
lib.close();
88+
}
89+
});
90+
7091
test('DynamicLibrary exposes functions and symbols',()=>{
7192
constlib=newffi.DynamicLibrary(libraryPath);
7293

0 commit comments

Comments
 (0)