Browse Source

MFH: plug memory leak

fix config.m4
PHP-5.1
Antony Dovgal 21 years ago
parent
commit
3b3f8137c3
  1. 2
      ext/pdo_oci/config.m4
  2. 4
      ext/pdo_oci/oci_driver.c

2
ext/pdo_oci/config.m4

@ -35,7 +35,7 @@ PHP_ARG_WITH(pdo-oci, Oracle OCI support for PDO,
if test "$PHP_PDO_OCI" != "no"; then
AC_MSG_CHECKING([Oracle Install-Dir])
if test "$PHP_PDO_OCI" = "yes" -o -z "$PHP_PDO_OCI"; then
if test "$PHP_PDO_OCI" = "yes" || test -z "$PHP_PDO_OCI"; then
PDO_OCI_DIR=$ORACLE_HOME
else
PDO_OCI_DIR=$PHP_PDO_OCI

4
ext/pdo_oci/oci_driver.c

@ -149,10 +149,10 @@ ub4 _oci_error(OCIError *err, pdo_dbh_t *dbh, pdo_stmt_t *stmt, char *what, swor
* so that we can catch the error information when execute
* is called via query. See Bug #33707 */
if (H->einfo.errmsg) {
efree(H->einfo.errmsg);
pefree(H->einfo.errmsg, dbh->is_persistent);
}
H->einfo = *einfo;
H->einfo.errmsg = einfo->errmsg ? estrdup(einfo->errmsg) : NULL;
H->einfo.errmsg = einfo->errmsg ? pestrdup(einfo->errmsg, dbh->is_persistent) : NULL;
strcpy(dbh->error_code, stmt->error_code);
}

Loading…
Cancel
Save