com php-src: Merge remote-tracking branch 'origin/master' into str_size_and_int64: ext/snmp/snmp.c ext/zip/p hp_zip.c

Commit: 98e273bb038bb45527d7b6e69914ac01edf7d055 Author: Anatol Belski <ab@php.net> Thu, 19 Dec 2013 22:18:18 +0100 Parents: 88456894b9b563772cb1c0b02ac4251a880f79af ba51a375ae2c73127d668bb272a53b5e20923876 Branches: str_size_and_int64 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=98e273bb038bb45527d7b6e69914ac01edf7d055 Log: Merge remote-tracking branch 'origin/master' into str_size_and_int64 Conflicts: ext/zip/php_zip.c Changed paths: MM ext/snmp/snmp.c MM ext/zip/php_zip.c Diff: diff --cc ext/zip/php_zip.c index 6da5873,4367a44..b5da605 --- a/ext/zip/php_zip.c +++ b/ext/zip/php_zip.c @@@ -1513,10 -1511,10 +1513,10 @@@ static ZIPARCHIVE_METHOD(open { struct zip *intern; char *filename; - int filename_len; + php_size_t filename_len; int err = 0; - long flags = 0; + php_int_t flags = 0; - char resolved_path[MAXPATHLEN]; + char *resolved_path; zval *this = getThis(); ze_zip_object *ze_obj = NULL; @@@ -1556,12 -1554,12 +1556,12 @@@ ze_obj->filename = NULL; } - intern = zip_open(resolved_path, flags, &err); + intern = zip_open(resolved_path, (int)flags, &err); if (!intern || err) { - RETURN_LONG((long)err); + RETURN_INT((php_int_t)err); } - ze_obj->filename = estrdup(resolved_path); - ze_obj->filename_len = filename_len; + ze_obj->filename = resolved_path; + ze_obj->filename_len = strlen(resolved_path); ze_obj->za = intern; RETURN_TRUE; }