mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-12-01 05:43:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-5.3' into PHP-5.4

Browse Source 
* PHP-5.3:
  Fixed bug #64342 ZipArchive::addFile() has to check for file existence
This commit is contained in:
Anatol Belski 2013-04-10 20:40:28 +02:00
commit ceb5b684e0
3 changed files with 86 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ext/zip/php_zip.c
View File

@ -28,6 +28,7 @@
#include "ext/standard/file.h" #include "ext/standard/file.h"
#include "ext/standard/php_string.h" #include "ext/standard/php_string.h"
#include "ext/pcre/php_pcre.h" #include "ext/pcre/php_pcre.h"
#include "ext/standard/php_filestat.h"
#include "php_zip.h" #include "php_zip.h"
#include "lib/zip.h" #include "lib/zip.h"
#include "lib/zipint.h" #include "lib/zipint.h"
@ -300,6 +301,7 @@ static int php_zip_add_file(struct zip *za, const char *filename, size_t filenam
struct zip_source *zs; struct zip_source *zs;
int cur_idx; int cur_idx;
char resolved_path[MAXPATHLEN]; char resolved_path[MAXPATHLEN];
zval exists_flag;
if (ZIP_OPENBASEDIR_CHECKPATH(filename)) { if (ZIP_OPENBASEDIR_CHECKPATH(filename)) {
@ -310,6 +312,11 @@ static int php_zip_add_file(struct zip *za, const char *filename, size_t filenam
return -1; return -1;
} }
php_stat(resolved_path, strlen(resolved_path), FS_EXISTS, &exists_flag TSRMLS_CC);
if (!Z_BVAL(exists_flag)) {
return -1;
}
zs = zip_source_file(za, resolved_path, offset_start, offset_len); zs = zip_source_file(za, resolved_path, offset_start, offset_len);
if (!zs) { if (!zs) {
return -1; return -1;

42
ext/zip/tests/bug64342_0.phpt Normal file
View File

@ -0,0 +1,42 @@
--TEST--
Bug #64342 ZipArchive::addFile() has to check file existance (variation 1)
--SKIPIF--
<?php
if(!extension_loaded('zip')) die('skip');
?>
--FILE--
<?php
$zip = new ZipArchive;
$res = $zip->open(dirname(__FILE__) . '/bug64342.zip', ZipArchive::CREATE);
if ($res === TRUE) {
$f = md5(uniqid()) . '.txt';
echo "$f\n";
$res = $zip->addFile($f);
if (true == $res) {
echo "add ok\n";
} else {
echo "add failed\n";
}
$res = $zip->close();
if (true == $res) {
echo "close ok\n";
} else {
echo "close failed\n";
}
} else {
echo "open failed\n";
}
?>
DONE
--CLEAN--
<?php
@unlink(dirname(__FILE__) . '/bug64342.zip');
--EXPECTF--
%s.txt
add failed
close ok
DONE

37
ext/zip/tests/bug64342_1.phpt Normal file
View File

@ -0,0 +1,37 @@
--TEST--
Bug #64342 ZipArchive::addFile() has to check file existance (variation 2)
--SKIPIF--
<?php
/* $Id$ */
if(!extension_loaded('zip')) die('skip');
?>
--FILE--
<?php
$dirname = dirname(__FILE__) . '/';
include $dirname . 'utils.inc';
$file = $dirname . '__tmp_oo_addfile.zip';
copy($dirname . 'test.zip', $file);
$zip = new ZipArchive;
if (!$zip->open($file)) {
exit('failed');
}
if (!$zip->addFile($dirname . 'cant_find_me.txt', 'test.php')) {
echo "failed\n";
}
if ($zip->status == ZIPARCHIVE::ER_OK) {
dump_entries_name($zip);
$zip->close();
} else {
echo "failed\n";
}
@unlink($file);
?>
--EXPECTF--
failed
0 bar
1 foobar/
2 foobar/baz
3 entry1.txt