Re: svn: /php/php-src/branches/PHP_5_3/ext/mysqlnd/ mysqlnd_wireprotocol.c

hi Andrey, You can commit in many passes as long as you keep refer to the bug #, so the revision link will show up in the tracker :) Cheers, On Thu, Sep 17, 2009 at 5:13 PM, Andrey Hristov <andrey@php.net> wrote: > andrey                                   Thu, 17 Sep 2009 15:13:14 +0000 > > Revision: http://svn.php.net/viewvc?view=revision&revision=288411º!Óâm?¤ü > rU¿ > > Log: > 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. > > Changed paths: >    U   php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_wireprotocol.c > > Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_wireprotocol.c > =================================================================== > --- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_wireprotocol.c     2009-09-17 14:53:03 > UTC (rev 288410) > +++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_wireprotocol.c     2009-09-17 15:13:14 > UTC (rev 288411) > @@ -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 > -- Pierre http://blog.thepimp.net | http://www.libgd.org