Fix memory leak on php_odbc_fetch_hash() failure

nielsdos · nielsdos · commit ef92e06de19b · 2025-06-09T11:24:13.000+02:00
The array is initialized but not freed. Closes GH-18787.
diff --git a/NEWS b/NEWS
@@ -21,6 +21,9 @@ PHP                                                                        NEWS
   . Fix memory leak in intl_datetime_decompose() on failure. (nielsdos)
   . Fix memory leak in locale lookup on failure. (nielsdos)
 
+- ODBC:
+  . Fix memory leak on php_odbc_fetch_hash() failure. (nielsdos)
+
 - OpenSSL:
   . Fix memory leak of X509_STORE in php_openssl_setup_verify() on failure.
     (nielsdos)
diff --git a/ext/odbc/php_odbc.c b/ext/odbc/php_odbc.c
@@ -1370,6 +1370,7 @@ static void php_odbc_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, int result_type)
 				if (rc == SQL_ERROR) {
 					odbc_sql_error(result->conn_ptr, result->stmt, "SQLGetData");
 					efree(buf);
+					zval_ptr_dtor(return_value);
 					RETURN_FALSE;
 				}
 

Original file line number	Diff line number	Diff line change
`@@ -1370,6 +1370,7 @@ static void php_odbc_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, int result_type)`
`1370`	`1370`	`if (rc == SQL_ERROR) {`
`1371`	`1371`	`odbc_sql_error(result->conn_ptr, result->stmt, "SQLGetData");`
`1372`	`1372`	`efree(buf);`
	`1373`	`+ zval_ptr_dtor(return_value);`
`1373`	`1374`	`RETURN_FALSE;`
`1374`	`1375`	`}`
`1375`	`1376`