Commit 153f292
src: handle empty Maybe(Local) in node_util.cc
PR-URL: #33867
Refs: https://github.com/nodejs/node/blob/master/src/README.md#checked-conversion
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: James M Snell <jasnell@gmail.com>1 parent 817f659 commit 153f292
1 file changed
Lines changed: 10 additions & 10 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -148,11 +148,11 @@ static void GetHiddenValue(const FunctionCallbackInfo<Value>& args) { | |||
| 148 | 148 | CHECK(args[1]->IsUint32()); | |
| 149 | 149 | ||
| 150 | 150 | Local<Object> obj = args[0].As<Object>(); | |
| 151 | - auto index = args[1]->Uint32Value(env->context()).FromJust(); | ||
| 152 | - auto private_symbol = IndexToPrivateSymbol(env, index); | ||
| 153 | - auto maybe_value = obj->GetPrivate(env->context(), private_symbol); | ||
| 154 | - | ||
| 155 | - args.GetReturnValue().Set(maybe_value.ToLocalChecked()); | ||
| 151 | + uint32_t index = args[1].As<Uint32>()->Value(); | ||
| 152 | + Local<Private> private_symbol = IndexToPrivateSymbol(env, index); | ||
| 153 | + Local<Value> ret; | ||
| 154 | + if (obj->GetPrivate(env->context(), private_symbol).ToLocal(&ret)) | ||
| 155 | + args.GetReturnValue().Set(ret); | ||
| 156 | 156 | } | |
| 157 | 157 | ||
| 158 | 158 | static void SetHiddenValue(const FunctionCallbackInfo<Value>& args) { | |
@@ -162,11 +162,11 @@ static void SetHiddenValue(const FunctionCallbackInfo<Value>& args) { | |||
| 162 | 162 | CHECK(args[1]->IsUint32()); | |
| 163 | 163 | ||
| 164 | 164 | Local<Object> obj = args[0].As<Object>(); | |
| 165 | - auto index = args[1]->Uint32Value(env->context()).FromJust(); | ||
| 166 | - auto private_symbol = IndexToPrivateSymbol(env, index); | ||
| 167 | - auto maybe_value = obj->SetPrivate(env->context(), private_symbol, args[2]); | ||
| 168 | - | ||
| 169 | - args.GetReturnValue().Set(maybe_value.FromJust()); | ||
| 165 | + uint32_t index = args[1].As<Uint32>()->Value(); | ||
| 166 | + Local<Private> private_symbol = IndexToPrivateSymbol(env, index); | ||
| 167 | + bool ret; | ||
| 168 | + if (obj->SetPrivate(env->context(), private_symbol, args[2]).To(&ret)) | ||
| 169 | + args.GetReturnValue().Set(ret); | ||
| 170 | 170 | } | |
| 171 | 171 | ||
| 172 | 172 | static void Sleep(const FunctionCallbackInfo<Value>& args) { | |
0 commit comments