]> granicus.if.org Git - php/commitdiff
Afix not included by the fix committed by Ulf.
authorAndrey Hristov <andrey@php.net>
Thu, 17 Sep 2009 15:13:36 +0000 (15:13 +0000)
committerAndrey Hristov <andrey@php.net>
Thu, 17 Sep 2009 15:13:36 +0000 (15:13 +0000)
pemalloc and then efree - too bad!
Sorry for committing in two passes, my big tree is already patched
with compressed.

ext/mysqlnd/mysqlnd_wireprotocol.c

index d3f668cd16c89946bb70520180eb1faaa01071c4..207dcbcbacebb174ebb708345a584774e4e23403 100644 (file)
@@ -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;