Skip to content

sqlite: fix error checks for column retrieval #22045

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ndossche wants to merge 1 commit into
base: PHP-8.4
Choose a base branch
from
+35 −9
Open

sqlite: fix error checks for column retrieval #22045

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
44 changes: 35 additions & 9 deletions ext/sqlite3/sqlite3.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -627,7 +627,7 @@ PHP_METHOD(SQLite3, query)
}
/* }}} */

static void sqlite_value_to_zval(sqlite3_stmt *stmt, int column, zval *data) /* {{{ */
static void sqlite_value_to_zval(php_sqlite3_db_object *db_obj, sqlite3_stmt *stmt, int column, zval *data) /* {{{ */
{
sqlite3_int64 val;

Expand All @@ -636,7 +636,13 @@ static void sqlite_value_to_zval(sqlite3_stmt *stmt, int column, zval *data) /*
val = sqlite3_column_int64(stmt, column);
#if LONG_MAX <= 2147483647
if (val > ZEND_LONG_MAX || val < ZEND_LONG_MIN) {
ZVAL_STRINGL(data, (char *)sqlite3_column_text(stmt, column), sqlite3_column_bytes(stmt, column));
const char *text = (const char *) sqlite3_column_text(stmt, column);
if (UNEXPECTED(text == NULL)) {
php_sqlite3_error(db_obj, SQLITE_NOMEM, "Failed to retrieve column value due to out of memory");
ZVAL_NULL(data);
} else {
ZVAL_STRINGL(data, text, sqlite3_column_bytes(stmt, column));
}
} else {
#endif
ZVAL_LONG(data, (zend_long) val);
Expand All @@ -653,13 +659,33 @@ static void sqlite_value_to_zval(sqlite3_stmt *stmt, int column, zval *data) /*
ZVAL_NULL(data);
break;

case SQLITE3_TEXT:
ZVAL_STRING(data, (char*)sqlite3_column_text(stmt, column));
case SQLITE3_TEXT: {
const char *text = (const char *) sqlite3_column_text(stmt, column);
if (UNEXPECTED(text == NULL)) {
php_sqlite3_error(db_obj, SQLITE_NOMEM, "Failed to retrieve column value due to out of memory");
ZVAL_NULL(data);
} else {
ZVAL_STRING(data, text);
}
break;
}

case SQLITE_BLOB:
default:
ZVAL_STRINGL(data, (char*)sqlite3_column_blob(stmt, column), sqlite3_column_bytes(stmt, column));
default: {
const char *blob = (const char *) sqlite3_column_blob(stmt, column);
if (UNEXPECTED(blob == NULL)) {
if (sqlite3_errcode(sqlite3_db_handle(stmt)) == SQLITE_NOMEM) {
php_sqlite3_error(db_obj, SQLITE_NOMEM, "Failed to retrieve column value due to out of memory");
ZVAL_NULL(data);
} else {
/* Zero-length BLOB */
ZVAL_EMPTY_STRING(data);
}
} else {
ZVAL_STRINGL(data, blob, sqlite3_column_bytes(stmt, column));
}
break;
}
}
}
/* }}} */
Expand Down Expand Up @@ -709,13 +735,13 @@ PHP_METHOD(SQLite3, querySingle)
case SQLITE_ROW: /* Valid Row */
{
if (!entire_row) {
sqlite_value_to_zval(stmt, 0, return_value);
sqlite_value_to_zval(db_obj, stmt, 0, return_value);
} else {
int i = 0;
array_init(return_value);
for (i = 0; i < sqlite3_data_count(stmt); i++) {
zval data;
sqlite_value_to_zval(stmt, i, &data);
sqlite_value_to_zval(db_obj, stmt, i, &data);
add_assoc_zval(return_value, (char*)sqlite3_column_name(stmt, i), &data);
}
}
Expand Down Expand Up @@ -1973,7 +1999,7 @@ PHP_METHOD(SQLite3Result, fetchArray)
for (i = 0; i < n_cols; i++) {
zval data;

sqlite_value_to_zval(result_obj->stmt_obj->stmt, i, &data);
sqlite_value_to_zval(result_obj->db_obj, result_obj->stmt_obj->stmt, i, &data);

if (mode & PHP_SQLITE3_NUM) {
add_index_zval(return_value, i, &data);
Expand Down
Loading