Skip to content

Commit c4de702

Browse files
committed
Merge branch 'PHP-5.4' into PHP-5.5
2 parents 92965b0 + 6a06587 commit c4de702

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

ext/pdo_oci/oci_driver.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -227,8 +227,10 @@ static int oci_handle_closer(pdo_dbh_t *dbh TSRMLS_DC) /* {{{ */
227227
H->server = NULL;
228228
}
229229

230-
OCIHandleFree(H->err, OCI_HTYPE_ERROR);
231-
H->err = NULL;
230+
if (H->err) {
231+
OCIHandleFree(H->err, OCI_HTYPE_ERROR);
232+
H->err = NULL;
233+
}
232234

233235
if (H->charset && H->env) {
234236
OCIHandleFree(H->env, OCI_HTYPE_ENV);

0 commit comments

Comments
 (0)