Skip to content

ext/pdo_firebird: (master) Fixed GH-18276 - persistent connection - "zend_mm_heap corrupted" with setAttribute() #18292

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
wants to merge 3 commits into from
+74 −15
Closed

ext/pdo_firebird: (master) Fixed GH-18276 - persistent connection - "zend_mm_heap corrupted" with setAttribute() #18292

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fd16327
Added a test
SakiTakamachi Apr 10, 2025
69fce03
Modified to use zend_string_dup to copy string
SakiTakamachi Apr 10, 2025
27d41f8
fixed get_attribute
SakiTakamachi Apr 10, 2025
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
54 changes: 39 additions & 15 deletions ext/pdo_firebird/firebird_driver.c
View file
Original file line number Diff line number Diff line change
@@ -599,13 +599,13 @@ static void firebird_handle_closer(pdo_dbh_t *dbh) /* {{{ */
}

if (H->date_format) {
zend_string_release_ex(H->date_format, false);
zend_string_release(H->date_format);
}
if (H->time_format) {
zend_string_release_ex(H->time_format, false);
zend_string_release(H->time_format);
}
if (H->timestamp_format) {
zend_string_release_ex(H->timestamp_format, false);
zend_string_release(H->timestamp_format);
}

if (H->einfo.errmsg) {
@@ -1086,38 +1086,47 @@ static bool pdo_firebird_set_attribute(pdo_dbh_t *dbh, zend_long attr, zval *val

case PDO_FB_ATTR_DATE_FORMAT:
{
zend_string *str = zval_try_get_string(val);
if (UNEXPECTED(!str)) {
zend_string *strval = zval_try_get_string(val);
if (UNEXPECTED(!strval)) {
return false;
}
zend_string *str = zend_string_dup(strval, dbh->is_persistent);
zend_string_release_ex(strval, false);

if (H->date_format) {
zend_string_release_ex(H->date_format, false);
zend_string_release(H->date_format);
}
H->date_format = str;
}
return true;

case PDO_FB_ATTR_TIME_FORMAT:
{
zend_string *str = zval_try_get_string(val);
if (UNEXPECTED(!str)) {
zend_string *strval = zval_try_get_string(val);
if (UNEXPECTED(!strval)) {
return false;
}
zend_string *str = zend_string_dup(strval, dbh->is_persistent);
zend_string_release_ex(strval, false);

if (H->time_format) {
zend_string_release_ex(H->time_format, false);
zend_string_release(H->time_format);
}
H->time_format = str;
}
return true;

case PDO_FB_ATTR_TIMESTAMP_FORMAT:
{
zend_string *str = zval_try_get_string(val);
if (UNEXPECTED(!str)) {
zend_string *strval = zval_try_get_string(val);
if (UNEXPECTED(!strval)) {
return false;
}
zend_string *str = zend_string_dup(strval, dbh->is_persistent);
zend_string_release_ex(strval, false);

if (H->timestamp_format) {
zend_string_release_ex(H->timestamp_format, false);
zend_string_release(H->timestamp_format);
}
H->timestamp_format = str;
}
@@ -1241,23 +1250,38 @@ static int pdo_firebird_get_attribute(pdo_dbh_t *dbh, zend_long attr, zval *val)

case PDO_FB_ATTR_DATE_FORMAT:
if (H->date_format) {
ZVAL_STR_COPY(val, H->date_format);
if (dbh->is_persistent) {
zend_string *str = zend_string_dup(H->date_format, false);
ZVAL_STR(val, str);
} else {
ZVAL_STR_COPY(val, H->date_format);
}
} else {
ZVAL_STRING(val, PDO_FB_DEF_DATE_FMT);
}
return 1;

case PDO_FB_ATTR_TIME_FORMAT:
if (H->time_format) {
ZVAL_STR_COPY(val, H->time_format);
if (dbh->is_persistent) {
zend_string *str = zend_string_dup(H->time_format, false);
ZVAL_STR(val, str);
} else {
ZVAL_STR_COPY(val, H->time_format);
}
} else {
ZVAL_STRING(val, PDO_FB_DEF_TIME_FMT);
}
return 1;

case PDO_FB_ATTR_TIMESTAMP_FORMAT:
if (H->timestamp_format) {
ZVAL_STR_COPY(val, H->timestamp_format);
if (dbh->is_persistent) {
zend_string *str = zend_string_dup(H->timestamp_format, false);
ZVAL_STR(val, str);
} else {
ZVAL_STR_COPY(val, H->timestamp_format);
}
} else {
ZVAL_STRING(val, PDO_FB_DEF_TIMESTAMP_FMT);
}
35 changes: 35 additions & 0 deletions ext/pdo_firebird/tests/gh18276.phpt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
--TEST--
GH-18276 (persistent connection - setAttribute(Pdo\Firebird::ATTR_DATE_FORMAT, ..) results in "zend_mm_heap corrupted")
--EXTENSIONS--
pdo_firebird
--SKIPIF--
<?php require('skipif.inc'); ?>
--XLEAK--
A bug in firebird causes a memory leak when calling `isc_attach_database()`.
See https://github.com/FirebirdSQL/firebird/issues/7849
--FILE--
<?php

require("testdb.inc");
unset($dbh);

for ($i = 0; $i < 2; $i++) {
$dbh = new PDO(
PDO_FIREBIRD_TEST_DSN,
PDO_FIREBIRD_TEST_USER,
PDO_FIREBIRD_TEST_PASS,
[
PDO::ATTR_PERSISTENT => true,
],
);
// Avoid interned
$dbh->setAttribute(PDO::FB_ATTR_DATE_FORMAT, str_repeat('Y----m----d', random_int(1, 1)));
$dbh->setAttribute(PDO::FB_ATTR_TIME_FORMAT, str_repeat('H::::i::::s', random_int(1, 1)));
$dbh->setAttribute(PDO::FB_ATTR_TIMESTAMP_FORMAT, str_repeat('Y----m----d....H::::i::::s', random_int(1, 1)));
unset($dbh);
}

echo 'done!';
?>
--EXPECT--
done!