Re: cvs: php-src(PHP_5_2) /ext/wddx wddx.c

On Sun, 4 Mar 2007, Stanislav Malyshev wrote: > stas Sun Mar 4 02:23:49 2007 UTC > > Modified files: (Branch: PHP_5_2) > /php-src/ext/wddx wddx.c > Log: > fix wrong code > # noticed by Stefan Esser Are you merging this to PHP_4_4 as well? regards, Derick > > http://cvs.php.net/viewvc.cgi/php-src/ext/wddx/wddx.c?r1=1.119.2.10.2.13&r2=1.119.2.10.2.14&diff_format=u > Index: php-src/ext/wddx/wddx.c > diff -u php-src/ext/wddx/wddx.c:1.119.2.10.2.13 php-src/ext/wddx/wddx.c:1.119.2.10.2.14 > --- php-src/ext/wddx/wddx.c:1.119.2.10.2.13 Tue Feb 27 03:28:17 2007 > +++ php-src/ext/wddx/wddx.c Sun Mar 4 02:23:47 2007 > @@ -16,7 +16,7 @@ > +----------------------------------------------------------------------+ > */ > > -/* $Id: wddx.c,v 1.119.2.10.2.13 2007/02/27 03:28:17 iliaa Exp $ */ > +/* $Id: wddx.c,v 1.119.2.10.2.14 2007/03/04 02:23:47 stas Exp $ */ > > #ifdef HAVE_CONFIG_H > #include "config.h" > @@ -1034,9 +1034,9 @@ > Z_STRVAL_P(ent->data) = estrndup(decoded, decoded_len); > Z_STRLEN_P(ent->data) = decoded_len; > } else { > + Z_STRVAL_P(ent->data) = erealloc(Z_STRVAL_P(ent->data), Z_STRLEN_P(ent->data) + > decoded_len + 1); > + strlcpy(Z_STRVAL_P(ent->data) + Z_STRLEN_P(ent->data), decoded, decoded_len); > Z_STRLEN_P(ent->data) += decoded_len; > - Z_STRVAL_P(ent->data) = erealloc(Z_STRVAL_P(ent->data), Z_STRLEN_P(ent->data) + > 1); > - strlcpy(Z_STRVAL_P(ent->data) + Z_STRLEN_P(ent->data), decoded, > Z_STRLEN_P(ent->data) + 1); > Z_STRVAL_P(ent->data)[Z_STRLEN_P(ent->data)] = '\0'; > } > > > -- Derick Rethans http://derickrethans.nl | http://ez.no | http://xdebug.org