archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-18 15:08:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

missing part of the fix for bug #42134

Browse source
This commit is contained in:
Antony Dovgal 2007-07-31 21:08:38 +00:00
parent ac1452b21f
commit c26725cc1a
1 changed files with 16 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

23
ext/oci8/oci8_interface.c
View file

@ -1622,19 +1622,28 @@ PHP_FUNCTION(oci_error)
RETURN_FALSE; RETURN_FALSE;
} }
#endif #endif
} else { goto go_out;
connection = (php_oci_connection *) zend_fetch_resource(&arg TSRMLS_CC, -1, NULL, NULL, 1, le_connection); }
if (connection) { connection = (php_oci_connection *) zend_fetch_resource(&arg TSRMLS_CC, -1, NULL, NULL, 1, le_connection);
errh = connection->err; if (connection) {
error = connection->errcode; errh = connection->err;
} error = connection->errcode;
goto go_out;
}
connection = (php_oci_connection *) zend_fetch_resource(&arg TSRMLS_CC, -1, NULL, NULL, 1, le_pconnection);
if (connection) {
errh = connection->err;
error = connection->errcode;
goto go_out;
} }
} else { } else {
errh = OCI_G(err); errh = OCI_G(err);
error = OCI_G(errcode); error = OCI_G(errcode);
} }
go_out:
if (error == OCI_SUCCESS) { /* no error set in the handle */ if (error == OCI_SUCCESS) { /* no error set in the handle */
RETURN_FALSE; RETURN_FALSE;
} }