tony2001 Sat, 19 Nov 2011 13:23:16 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=319547
Log:
backport the line from trunk and fix uninitialized variables
Changed paths:
U php/php-src/branches/PHP_5_3/ext/mbstring/oniguruma/regparse.c
U php/php-src/branches/PHP_5_4/ext/mbstring/oniguruma/regparse.c
Modified: php/php-src/branches/PHP_5_3/ext/mbstring/oniguruma/regparse.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/mbstring/oniguruma/regparse.c
2011-11-19 12:46:43 UTC (rev 319546)
+++ php/php-src/branches/PHP_5_3/ext/mbstring/oniguruma/regparse.c
2011-11-19 13:23:16 UTC (rev 319547)
@@ -4980,6 +4980,7 @@
CCLASS_SET_SHARE(&(NCCLASS(*np)));
new_key = (type_cclass_key* )xmalloc(sizeof(type_cclass_key));
+ xmemcpy(new_key, &key, sizeof(type_cclass_key));
onig_st_add_direct(OnigTypeCClassTable, (st_data_t )new_key,
(st_data_t )*np);
Modified: php/php-src/branches/PHP_5_4/ext/mbstring/oniguruma/regparse.c
===================================================================
--- php/php-src/branches/PHP_5_4/ext/mbstring/oniguruma/regparse.c
2011-11-19 12:46:43 UTC (rev 319546)
+++ php/php-src/branches/PHP_5_4/ext/mbstring/oniguruma/regparse.c
2011-11-19 13:23:16 UTC (rev 319547)
@@ -4980,6 +4980,7 @@
CCLASS_SET_SHARE(&(NCCLASS(*np)));
new_key = (type_cclass_key* )xmalloc(sizeof(type_cclass_key));
+ xmemcpy(new_key, &key, sizeof(type_cclass_key));
onig_st_add_direct(OnigTypeCClassTable, (st_data_t )new_key,
(st_data_t )*np);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
