Skip to content

Commit e6ab93d

Browse files
committed
sqlite: refactor ToLocalChecked usage
1 parent a1553ef commit e6ab93d

File tree

2 files changed

+18
-10
lines changed

2 files changed

+18
-10
lines changed

src/node_sqlite.cc

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1966,25 +1966,33 @@ int DatabaseSync::AuthorizerCallback(void* user_data,
19661966
return SQLITE_DENY;
19671967
}
19681968

1969+
Local<String> error_message;
19691970
Local<Value> result;
19701971
if (!retval.ToLocal(&result) || result->IsUndefined() || result->IsNull() ||
19711972
!result->IsInt32()) {
1972-
Local<Value> err = Exception::TypeError(
1973-
String::NewFromUtf8(
1974-
isolate,
1975-
"Authorizer callback must return an integer authorization code")
1976-
.ToLocalChecked());
1973+
if (!String::NewFromUtf8(
1974+
isolate,
1975+
"Authorizer callback must return an integer authorization code")
1976+
.ToLocal(&error_message)) {
1977+
return SQLITE_DENY;
1978+
}
1979+
1980+
Local<Value> err = Exception::TypeError(error_message);
19771981
db->StoreAuthorizerError(err);
19781982
return SQLITE_DENY;
19791983
}
19801984

19811985
int32_t int_result = result.As<Int32>()->Value();
19821986
if (int_result != SQLITE_OK && int_result != SQLITE_DENY &&
19831987
int_result != SQLITE_IGNORE) {
1984-
Local<Value> err = Exception::RangeError(
1985-
String::NewFromUtf8(
1986-
isolate, "Authorizer callback returned invalid authorization code")
1987-
.ToLocalChecked());
1988+
if (!String::NewFromUtf8(
1989+
isolate,
1990+
"Authorizer callback returned a invalid authorization code")
1991+
.ToLocal(&error_message)) {
1992+
return SQLITE_DENY;
1993+
}
1994+
1995+
Local<Value> err = Exception::RangeError(error_message);
19881996
db->StoreAuthorizerError(err);
19891997
return SQLITE_DENY;
19901998
}

test/parallel/test-sqlite-authz.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ suite('DatabaseSync.prototype.setAuthorizer()', () => {
118118
assert.throws(() => {
119119
db.exec('SELECT 1');
120120
}, {
121-
message: 'Authorizer callback returned invalid authorization code'
121+
message: 'Authorizer callback returned a invalid authorization code'
122122
});
123123
});
124124

0 commit comments

Comments
 (0)