summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrey Hristov <andrey@php.net>2009-09-17 15:13:14 +0000
committerAndrey Hristov <andrey@php.net>2009-09-17 15:13:14 +0000
commitc2e66884e11fdcdfb5247698b92a1ebca7f79056 (patch)
tree3b5d5f42c2dbd2d6a042437586d7628d91d8a0b4
parent1388912ded091cf9cc19efd59d098d50f0d00a71 (diff)
downloadphp-git-c2e66884e11fdcdfb5247698b92a1ebca7f79056.tar.gz
MFH, a fix 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.
-rw-r--r--ext/mysqlnd/mysqlnd_wireprotocol.c2
1 files changed, 1 insertions, 1 deletions
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;