Skip to content

Fix GH-25036: odbc_prepare() double free when SQLDescribeParam() fails #447

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

Closed
iliaal wants to merge 1 commit into from
Closed

Fix GH-25036: odbc_prepare() double free when SQLDescribeParam() fails #447

Show file tree
Hide file tree
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
2 changes: 2 additions & 0 deletions NEWS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,8 @@ PHP NEWS
- ODBC:
. Fixed bug GH-24736 (php_odbc_connstr_is_quoted() treats a value with no
closing brace as quoted). (lazerg)
. Fixed bug GH-25036 (odbc_prepare() corrupts the heap when the driver
cannot describe a parameter). (Ilia Alshanetsky)

- Opcache:
. Fixed tracing JIT returning a wrapped integer instead of a float on
Expand Down
6 changes: 2 additions & 4 deletions ext/odbc/php_odbc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -997,21 +997,19 @@ PHP_FUNCTION(odbc_prepare)
}
result->conn_ptr = conn;
result->fetched = 0;
odbc_insert_new_result(conn, return_value);

result->param_info = (odbc_param_info *) safe_emalloc(sizeof(odbc_param_info), result->numparams, 0);
for (i=0;i<result->numparams;i++) {
rc = SQLDescribeParam(result->stmt, (SQLUSMALLINT)(i+1), &result->param_info[i].sqltype, &result->param_info[i].precision,
&result->param_info[i].scale, &result->param_info[i].nullable);
if (rc == SQL_ERROR) {
odbc_sql_error(result->conn_ptr, result->stmt, "SQLDescribeParameter");
SQLFreeStmt(result->stmt, SQL_RESET_PARAMS);
efree(result->param_info);
odbc_result_free(result);
zval_ptr_dtor(return_value);
RETURN_FALSE;
}
}

odbc_insert_new_result(conn, return_value);
}
/* }}} */

Expand Down
39 changes: 39 additions & 0 deletions ext/odbc/tests/gh25036.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
--TEST--
GH-25036 (odbc_prepare() double free when SQLDescribeParam() fails)
--EXTENSIONS--
odbc
--SKIPIF--
<?php include 'skipif.inc'; ?>
--FILE--
<?php

include 'config.inc';

$conn = odbc_connect($dsn, $user, $pass);

$live = odbc_exec($conn, 'SELECT 1 AS a');

var_dump(odbc_prepare($conn, 'SELECT ? FROM gh25036_missing'));
var_dump(odbc_prepare($conn, 'SELECT ?, ? FROM gh25036_missing'));

var_dump(odbc_fetch_array($live));

odbc_close($conn);

try {
odbc_fetch_row($live);
} catch (Error $e) {
echo $e::class, ": ", $e->getMessage(), PHP_EOL;
}
?>
--EXPECTF--
Warning: odbc_prepare(): SQL error: %s, SQL state %s in SQLDescribeParameter in %s on line %d
bool(false)

Warning: odbc_prepare(): SQL error: %s, SQL state %s in SQLDescribeParameter in %s on line %d
bool(false)
array(1) {
["a"]=>
string(1) "1"
}
Error: ODBC result has already been closed
Loading