com php-src: Fix ZTS: ext/json/JSON_parser.c ext/zip/php _zip.c

Commit: 4d22be992ca23e9ec6f46962b88277229d7f4ace Author: Nikita Popov <nikic@php.net> Mon, 5 May 2014 17:28:22 +0200 Parents: a636c4c03f89e626f6b778a3e3ab40e989ad225d Branches: phpng Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=4d22be992ca23e9ec6f46962b88277229d7f4ace Log: Fix ZTS Changed paths: M ext/json/JSON_parser.c M ext/zip/php_zip.c Diff: diff --git a/ext/json/JSON_parser.c b/ext/json/JSON_parser.c index 3b943fd..c7fc6b4 100644 --- a/ext/json/JSON_parser.c +++ b/ext/json/JSON_parser.c @@ -291,7 +291,7 @@ static int dehexchar(char c) } -static void json_create_zval(zval *z, smart_str *buf, int type, int options) +static void json_create_zval(zval *z, smart_str *buf, int type, int options TSRMLS_DC) { if (type == IS_LONG) { @@ -557,7 +557,7 @@ parse_JSON_ex(JSON_parser jp, zval *z, unsigned short utf16_json[], int length, zval mval; smart_str_0(&buf); - json_create_zval(&mval, &buf, type, options); + json_create_zval(&mval, &buf, type, options TSRMLS_CC); add_assoc_or_property(assoc, &jp->the_zstack[jp->top], &key, &mval TSRMLS_CC); @@ -580,7 +580,7 @@ parse_JSON_ex(JSON_parser jp, zval *z, unsigned short utf16_json[], int length, zval mval; smart_str_0(&buf); - json_create_zval(&mval, &buf, type, options); + json_create_zval(&mval, &buf, type, options TSRMLS_CC); add_next_index_zval(&jp->the_zstack[jp->top], &mval); buf.s->len = 0; JSON_RESET_TYPE(); @@ -689,7 +689,7 @@ parse_JSON_ex(JSON_parser jp, zval *z, unsigned short utf16_json[], int length, jp->stack[jp->top] == MODE_ARRAY)) { smart_str_0(&buf); - json_create_zval(&mval, &buf, type, options); + json_create_zval(&mval, &buf, type, options TSRMLS_CC); } switch (jp->stack[jp->top]) { diff --git a/ext/zip/php_zip.c b/ext/zip/php_zip.c index 30ceae6..9f5d9d0 100644 --- a/ext/zip/php_zip.c +++ b/ext/zip/php_zip.c @@ -1632,7 +1632,7 @@ static void php_zip_add_from_pattern(INTERNAL_FUNCTION_PARAMETERS, int type) /* if ((zval_file = zend_hash_index_find(Z_ARRVAL_P(return_value), i)) != NULL) { if (remove_all_path) { - basename = php_basename(Z_STRVAL_P(zval_file), Z_STRLEN_P(zval_file), NULL, 0); + basename = php_basename(Z_STRVAL_P(zval_file), Z_STRLEN_P(zval_file), NULL, 0 TSRMLS_CC); file_stripped = basename->val; file_stripped_len = basename->len; } else if (remove_path && strstr(Z_STRVAL_P(zval_file), remove_path) != NULL) {