From: Andrey Hristov <andrey@php.net>
Date: Thu, 17 Sep 2009 15:13:36 +0000 (+0000)
Subject: Afix not included by the fix committed by Ulf.
X-Git-Tag: php-5.4.0alpha1~191^2~2644
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4ac04d893680db34e982900da41e1fb530def5a5;p=php

Afix not included by the fix committed by Ulf.
pemalloc and then efree - too bad!
Sorry for committing in two passes, my big tree is already patched
with compressed.
---

diff --git a/ext/mysqlnd/mysqlnd_wireprotocol.c b/ext/mysqlnd/mysqlnd_wireprotocol.c
index d3f668cd16..207dcbcbac 100644
--- a/ext/mysqlnd/mysqlnd_wireprotocol.c
+++ b/ext/mysqlnd/mysqlnd_wireprotocol.c
@@ -1047,7 +1047,7 @@ php_mysqlnd_rset_header_read(void *_packet, MYSQLND *conn TSRMLS_DC)
 			p+=2;
 			/* Check for additional textual data */
 			if (packet->header.size  > (p - buf) && (len = php_mysqlnd_net_field_length(&p))) {
-				packet->info_or_local_file = mnd_pemalloc(len + 1, conn->persistent);
+				packet->info_or_local_file = mnd_emalloc(len + 1);
 				memcpy(packet->info_or_local_file, p, len);
 				packet->info_or_local_file[len] = '\0';
 				packet->info_or_local_file_len = len;