Commit 3abbc38
authored
src: fix useless call in permission.cc
FromMaybe() has no side effects and the return value is ignored.
Instead, if Set() fails, then another exception is pending, so
return early.
PR-URL: #46833
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Anatoli Papirovski <apapirovski@mac.com>
Reviewed-By: Yagiz Nizipli <yagiz@nizipli.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Darshan Sen <raisinten@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>1 parent d610096 commit 3abbc38
1 file changed
Lines changed: 17 additions & 16 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -136,22 +136,23 @@ void Permission::ThrowAccessDenied(Environment* env, | |||
| 136 | 136 | const std::string_view& res) { | |
| 137 | 137 | Local<Value> err = ERR_ACCESS_DENIED(env->isolate()); | |
| 138 | 138 | CHECK(err->IsObject()); | |
| 139 | - err.As<Object>() | ||
| 140 | - ->Set(env->context(), | ||
| 141 | - env->permission_string(), | ||
| 142 | - v8::String::NewFromUtf8(env->isolate(), | ||
| 143 | - PermissionToString(perm), | ||
| 144 | - v8::NewStringType::kNormal) | ||
| 145 | - .ToLocalChecked()) | ||
| 146 | - .FromMaybe(false); | ||
| 147 | - err.As<Object>() | ||
| 148 | - ->Set(env->context(), | ||
| 149 | - env->resource_string(), | ||
| 150 | - v8::String::NewFromUtf8(env->isolate(), | ||
| 151 | - std::string(res).c_str(), | ||
| 152 | - v8::NewStringType::kNormal) | ||
| 153 | - .ToLocalChecked()) | ||
| 154 | - .FromMaybe(false); | ||
| 139 | + if (err.As<Object>() | ||
| 140 | + ->Set(env->context(), | ||
| 141 | + env->permission_string(), | ||
| 142 | + v8::String::NewFromUtf8(env->isolate(), | ||
| 143 | + PermissionToString(perm), | ||
| 144 | + v8::NewStringType::kNormal) | ||
| 145 | + .ToLocalChecked()) | ||
| 146 | + .IsNothing() || | ||
| 147 | + err.As<Object>() | ||
| 148 | + ->Set(env->context(), | ||
| 149 | + env->resource_string(), | ||
| 150 | + v8::String::NewFromUtf8(env->isolate(), | ||
| 151 | + std::string(res).c_str(), | ||
| 152 | + v8::NewStringType::kNormal) | ||
| 153 | + .ToLocalChecked()) | ||
| 154 | + .IsNothing()) | ||
| 155 | + return; | ||
| 155 | 156 | env->isolate()->ThrowException(err); | |
| 156 | 157 | } | |
| 157 | 158 | ||
0 commit comments