Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/node_sqlite.cc
Original file line number Diff line number Diff line change
Expand Up @@ -332,11 +332,12 @@ void JSValueToSQLiteResult(Isolate* isolate,
sqlite3_result_double(ctx, value.As<Number>()->Value());
} else if (value->IsString()) {
Utf8Value val(isolate, value.As<String>());
sqlite3_result_text(ctx, *val, val.length(), SQLITE_TRANSIENT);
sqlite3_result_text64(
ctx, *val, val.length(), SQLITE_TRANSIENT, SQLITE_UTF8);
} else if (value->IsArrayBufferView() || value->IsArrayBuffer() ||
value->IsSharedArrayBuffer()) {
ArrayBufferViewContents<uint8_t> buf(value);
sqlite3_result_blob(ctx, buf.data(), buf.length(), SQLITE_TRANSIENT);
sqlite3_result_blob64(ctx, buf.data(), buf.length(), SQLITE_TRANSIENT);
} else if (value->IsBigInt()) {
bool lossless;
int64_t as_int = value.As<BigInt>()->Int64Value(&lossless);
Expand Down
24 changes: 23 additions & 1 deletion test/parallel/test-sqlite-custom-functions.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
'use strict';
const { skipIfSQLiteMissing, mustCall } = require('../common');
const { skipIfSQLiteMissing, mustCall, enoughTestMem } = require('../common');
skipIfSQLiteMissing();
const assert = require('node:assert');
const { Database } = require('node:sqlite');
Expand Down Expand Up @@ -347,6 +347,28 @@ suite('Database.prototype.function()', () => {
});
});

test('throws if returned buffer exceeds INT_MAX bytes', {
skip: !enoughTestMem && 'insufficient memory',
}, (t) => {
const db = new Database(':memory:');
for (const size of [2 ** 31, 2 ** 32 + 5]) {
let buf;
try {
buf = new ArrayBuffer(size);
} catch {
return t.skip('insufficient memory');
}
db.function('retLargeBuffer', () => buf);
const stmt = db.prepare('SELECT retLargeBuffer() AS retLargeBuffer');
assert.throws(() => {
stmt.get();
}, {
code: 'ERR_SQLITE_ERROR',
message: /string or blob too big/,
});
}
});

test('throws on unsupported return types', () => {
const db = new Database(':memory:');
db.function('retFunction', () => {
Expand Down
Loading