Skip to content

Commit 5dfe701

Browse files
committed
Fix
1 parent 7726761 commit 5dfe701

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

ext/pgsql/pgsql.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1876,6 +1876,11 @@ static void php_pgsql_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, zend_long result_
18761876

18771877
ZVAL_COPY_VALUE(&dataset, return_value);
18781878
object_init_ex(return_value, ce);
1879+
if (UNEXPECTED(EG(exception))) {
1880+
zval_ptr_dtor(&dataset);
1881+
zval_ptr_dtor(return_value);
1882+
RETURN_THROWS();
1883+
}
18791884
if (!ce->default_properties_count && !ce->__set) {
18801885
Z_OBJ_P(return_value)->properties = Z_ARR(dataset);
18811886
} else {

ext/pgsql/tests/pg_fetch_object_with_abstract_class.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,4 +52,4 @@ $db = pg_connect($conn_str);
5252
pg_query($db, "DROP TABLE IF EXISTS pg_fetch_object_abstract_class cascade");
5353
?>
5454
--EXPECT--
55-
bool(true)
55+
int(1)

0 commit comments

Comments
 (0)