andrey Thu, 17 Sep 2009 15:13:36 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=288412
Log:
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.
Changed paths:
U php/php-src/trunk/ext/mysqlnd/mysqlnd_wireprotocol.c
Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_wireprotocol.c
===================================================================
--- php/php-src/trunk/ext/mysqlnd/mysqlnd_wireprotocol.c 2009-09-17
15:13:14 UTC (rev 288411)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd_wireprotocol.c 2009-09-17
15:13:36 UTC (rev 288412)
@@ -1047,7 +1047,7 @@
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;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
