Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  php_stream_fopen_tmpfile may file, causing any following stream usage to crash
This commit is contained in:
Pierre Joye 2013-05-14 09:21:30 +02:00
commit 362402d748

View File

@ -1122,6 +1122,10 @@ static int phar_zip_applysignature(phar_archive_data *phar, struct _phar_zip_pas
entry.fp = php_stream_fopen_tmpfile();
entry.fp_type = PHAR_MOD;
entry.is_modified = 1;
if (entry.fp == NULL) {
spprintf(pass->error, 0, "phar error: unable to create temporary file for signature");
return FAILURE;
}
PHAR_SET_32(sigbuf, phar->sig_flags);
PHAR_SET_32(sigbuf + 4, signature_length);