clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 02:17:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix UMR when setting forward string offset

Browse Source
This commit is contained in:
Stanislav Malyshev 2011-03-16 05:41:50 +00:00
parent 8efa208e0b
commit a5b9eda06a
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Zend/zend_execute.c
View File

@ -671,7 +671,7 @@ static inline void zend_assign_to_object(zval **retval, zval **object_ptr, zval
return; return;
} }
} }
/* separate our value if necessary */ /* separate our value if necessary */
if (value_type == IS_TMP_VAR) { if (value_type == IS_TMP_VAR) {
zval *orig_value = value; zval *orig_value = value;
@ -737,7 +737,7 @@ static inline int zend_assign_to_string_offset(const temp_variable *T, const zva
if (IS_INTERNED(Z_STRVAL_P(T->str_offset.str))) { if (IS_INTERNED(Z_STRVAL_P(T->str_offset.str))) {
char *tmp = (char *) emalloc(T->str_offset.offset+1+1); char *tmp = (char *) emalloc(T->str_offset.offset+1+1);
memcpy(tmp, Z_STRVAL_P(T->str_offset.str), T->str_offset.offset+1+1); memcpy(tmp, Z_STRVAL_P(T->str_offset.str), Z_STRLEN_P(T->str_offset.str)+1);
Z_STRVAL_P(T->str_offset.str) = tmp; Z_STRVAL_P(T->str_offset.str) = tmp;
} else { } else {
Z_STRVAL_P(T->str_offset.str) = (char *) erealloc(Z_STRVAL_P(T->str_offset.str), T->str_offset.offset+1+1); Z_STRVAL_P(T->str_offset.str) = (char *) erealloc(Z_STRVAL_P(T->str_offset.str), T->str_offset.offset+1+1);
@ -756,7 +756,7 @@ static inline int zend_assign_to_string_offset(const temp_variable *T, const zva
if (Z_TYPE_P(value) != IS_STRING) { if (Z_TYPE_P(value) != IS_STRING) {
zval tmp; zval tmp;
ZVAL_COPY_VALUE(&tmp, value); ZVAL_COPY_VALUE(&tmp, value);
if (value_type != IS_TMP_VAR) { if (value_type != IS_TMP_VAR) {
zval_copy_ctor(&tmp); zval_copy_ctor(&tmp);
@ -979,7 +979,7 @@ static inline zval **zend_fetch_dimension_address_inner(HashTable *ht, const zva
goto fetch_string_dim; goto fetch_string_dim;
case IS_STRING: case IS_STRING:
offset_key = dim->value.str.val; offset_key = dim->value.str.val;
offset_key_length = dim->value.str.len; offset_key_length = dim->value.str.len;
@ -992,7 +992,7 @@ static inline zval **zend_fetch_dimension_address_inner(HashTable *ht, const zva
} else { } else {
hval = zend_hash_func(offset_key, offset_key_length+1); hval = zend_hash_func(offset_key, offset_key_length+1);
} }
} }
fetch_string_dim: fetch_string_dim:
if (zend_hash_quick_find(ht, offset_key, offset_key_length+1, hval, (void **) &retval) == FAILURE) { if (zend_hash_quick_find(ht, offset_key, offset_key_length+1, hval, (void **) &retval) == FAILURE) {
switch (type) { switch (type) {
@ -1267,7 +1267,7 @@ static void zend_fetch_dimension_address_read(temp_variable *result, zval **cont
Z_STRVAL_P(ptr) = (char*)emalloc(2); Z_STRVAL_P(ptr) = (char*)emalloc(2);
Z_STRVAL_P(ptr)[0] = Z_STRVAL_P(container)[Z_LVAL_P(dim)]; Z_STRVAL_P(ptr)[0] = Z_STRVAL_P(container)[Z_LVAL_P(dim)];
Z_STRVAL_P(ptr)[1] = 0; Z_STRVAL_P(ptr)[1] = 0;
Z_STRLEN_P(ptr) = 1; Z_STRLEN_P(ptr) = 1;
} }
AI_SET_PTR(result, ptr); AI_SET_PTR(result, ptr);
return; return;