Commit a6112dd
src: fix time-of-use vs time-of-check "bugs"
Refs: #40128
PR-URL: #40128
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>1 parent e040f2c commit a6112dd
2 files changed
Lines changed: 6 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1114,7 +1114,7 @@ int SecureContext::TicketKeyCallback(SSL* ssl, | |||
| 1114 | 1114 | return -1; | |
| 1115 | 1115 | } | |
| 1116 | 1116 | ||
| 1117 | - argv[2] = env != 0 ? v8::True(env->isolate()) : v8::False(env->isolate()); | ||
| 1117 | + argv[2] = v8::True(env->isolate()); | ||
| 1118 | 1118 | ||
| 1119 | 1119 | Local<Value> ret; | |
| 1120 | 1120 | if (!node::MakeCallback( | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -371,13 +371,17 @@ void UDPWrap::Disconnect(const FunctionCallbackInfo<Value>& args) { | |||
| 371 | 371 | #define X(name, fn) \ | |
| 372 | 372 | void UDPWrap::name(const FunctionCallbackInfo<Value>& args) { \ | |
| 373 | 373 | UDPWrap* wrap = Unwrap<UDPWrap>(args.Holder()); \ | |
| 374 | + if (wrap == nullptr) { \ | ||
| 375 | + args.GetReturnValue().Set(UV_EBADF); \ | ||
| 376 | + return; \ | ||
| 377 | + } \ | ||
| 374 | 378 | Environment* env = wrap->env(); \ | |
| 375 | 379 | CHECK_EQ(args.Length(), 1); \ | |
| 376 | 380 | int flag; \ | |
| 377 | 381 | if (!args[0]->Int32Value(env->context()).To(&flag)) { \ | |
| 378 | 382 | return; \ | |
| 379 | 383 | } \ | |
| 380 | - int err = wrap == nullptr ? UV_EBADF : fn(&wrap->handle_, flag); \ | ||
| 384 | + int err = fn(&wrap->handle_, flag); \ | ||
| 381 | 385 | args.GetReturnValue().Set(err); \ | |
| 382 | 386 | } | |
| 383 | 387 | ||
0 commit comments