archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

fix use after free

Browse source
This commit is contained in:
Remi Collet 2020-03-09 09:19:57 +01:00
parent ed998f8a0d
commit ef42a7afa5
1 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

30
ext/zip/php_zip.c
View file

@ -1503,26 +1503,26 @@ static ZIPARCHIVE_METHOD(close)
ze_obj = Z_ZIP_P(self); ze_obj = Z_ZIP_P(self);
err = zip_close(intern); err = zip_close(intern);
/* Save error for property reader */
#if LIBZIP_VERSION_MAJOR < 1
zip_error_get(obj->za, &ze_obj->err_zip, &ze_obj->err_sys);
#else
{
zip_error_t *ziperr;
ziperr = zip_get_error(intern);
ze_obj->err_zip = zip_error_code_zip(ziperr);
ze_obj->err_sys = zip_error_code_system(ziperr);
zip_error_fini(ziperr);
}
#endif
if (err) { if (err) {
#if LIBZIP_VERSION_MAJOR == 1 && LIBZIP_VERSION_MINOR == 3 && LIBZIP_VERSION_MICRO == 1 #if LIBZIP_VERSION_MAJOR == 1 && LIBZIP_VERSION_MINOR == 3 && LIBZIP_VERSION_MICRO == 1
php_error_docref(NULL, E_WARNING, "zip_close have failed"); php_error_docref(NULL, E_WARNING, "zip_close have failed");
ze_obj->err_zip = 0;
ze_obj->err_sys = 0;
#else #else
php_error_docref(NULL, E_WARNING, "%s", zip_strerror(intern)); php_error_docref(NULL, E_WARNING, "%s", zip_strerror(intern));
/* Save error for property reader */
#if LIBZIP_VERSION_MAJOR < 1
zip_error_get(intern, &ze_obj->err_zip, &ze_obj->err_sys);
#else
{
zip_error_t *ziperr;
ziperr = zip_get_error(intern);
ze_obj->err_zip = zip_error_code_zip(ziperr);
ze_obj->err_sys = zip_error_code_system(ziperr);
zip_error_fini(ziperr);
}
#endif
zip_discard(intern); zip_discard(intern);
#endif #endif
} }