diff --git a/ext/pdo_oci/config.m4 b/ext/pdo_oci/config.m4
index 507cfd03f46..7140d20f7e2 100755
--- a/ext/pdo_oci/config.m4
+++ b/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
diff --git a/ext/pdo_oci/oci_driver.c b/ext/pdo_oci/oci_driver.c
index 08177fb7d4c..7e8d901ead8 100755
--- a/ext/pdo_oci/oci_driver.c
+++ b/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);
 	}