summaryrefslogtreecommitdiff
path: root/ext/mbstring
diff options
context:
space:
mode:
authorAntony Dovgal <tony2001@php.net>2011-11-19 13:23:16 +0000
committerAntony Dovgal <tony2001@php.net>2011-11-19 13:23:16 +0000
commit75adcc8db02e9aed9b9e4a06a350db05c259026c (patch)
tree7d0a8b25d8ff580ceb6eddfc533f73c4124fce1f /ext/mbstring
parent17b39638d0a63691dfa5009b9b42342d5ae77f61 (diff)
downloadphp-git-75adcc8db02e9aed9b9e4a06a350db05c259026c.tar.gz
backport the line from trunk and fix uninitialized variables
Diffstat (limited to 'ext/mbstring')
-rw-r--r--ext/mbstring/oniguruma/regparse.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/ext/mbstring/oniguruma/regparse.c b/ext/mbstring/oniguruma/regparse.c
index af5c8593e6..abf2cc1cb5 100644
--- a/ext/mbstring/oniguruma/regparse.c
+++ b/ext/mbstring/oniguruma/regparse.c
@@ -4980,6 +4980,7 @@ parse_exp(Node** np, OnigToken* tok, int term,
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);