From: Ilia Alshanetsky <iliaa@php.net>
Date: Thu, 23 Sep 2004 21:03:41 +0000 (+0000)
Subject: Make error messages handle persistent environments properly.
X-Git-Tag: PRE_NEW_VM_GEN_PATCH~235
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=626caf02923598d06be0f65fff8faa4826f3c008;p=php

Make error messages handle persistent environments properly.
---

diff --git a/ext/pdo_mysql/mysql_driver.c b/ext/pdo_mysql/mysql_driver.c
index bbad743862..80eacfec39 100755
--- a/ext/pdo_mysql/mysql_driver.c
+++ b/ext/pdo_mysql/mysql_driver.c
@@ -42,12 +42,12 @@ int _pdo_mysql_error(pdo_dbh_t *dbh, pdo_stmt_t *stmt, const char *file, int lin
 	einfo->line = line;
 
 	if (einfo->errmsg) {
-		efree(einfo->errmsg);
+		pefree(einfo->errmsg, dbh->is_persistent);
 		einfo->errmsg = NULL;
 	}
 
 	if (einfo->errcode) {
-		einfo->errmsg = estrdup(mysql_error(H->server));
+		einfo->errmsg = pestrdup(mysql_error(H->server), dbh->is_persistent);
 	} else { /* no error */
 		*pdo_err = PDO_ERR_NONE;
 		return 0;
@@ -149,7 +149,7 @@ static int mysql_handle_closer(pdo_dbh_t *dbh TSRMLS_DC) /* {{{ */
 			H->server = NULL;
 		}
 		if (H->einfo.errmsg) {
-			efree(H->einfo.errmsg);
+			pefree(H->einfo.errmsg, dbh->is_persistent);
 			H->einfo.errmsg = NULL;
 		}
 		pefree(H, dbh->is_persistent);