diff options
| author | Stanislav Malyshev <stas@php.net> | 2015-04-29 22:04:20 -0700 |
|---|---|---|
| committer | Julien Pauli <jpauli@php.net> | 2015-05-13 12:09:42 +0200 |
| commit | 2c1e49075ba48d93439a9e79eae43d9f8469b832 (patch) | |
| tree | f9176ecbdc8edad9d256a6df35014a4e678cd1d2 | |
| parent | 739adee1912176aacf351edc5751a02ded6ef1ec (diff) | |
| download | php-git-2c1e49075ba48d93439a9e79eae43d9f8469b832.tar.gz | |
Fix bug #69453 - don't try to cut empty string
| -rw-r--r-- | ext/phar/tar.c | 2 | ||||
| -rw-r--r-- | ext/phar/tests/bug69453.phpt | 21 |
2 files changed, 22 insertions, 1 deletions
diff --git a/ext/phar/tar.c b/ext/phar/tar.c index c4a81fb799..34ef0ef892 100644 --- a/ext/phar/tar.c +++ b/ext/phar/tar.c @@ -434,7 +434,7 @@ bail: entry.filename_len = i; entry.filename = pestrndup(hdr->name, i, myphar->is_persistent); - if (entry.filename[entry.filename_len - 1] == '/') { + if (i > 0 && entry.filename[entry.filename_len - 1] == '/') { /* some tar programs store directories with trailing slash */ entry.filename[entry.filename_len - 1] = '\0'; entry.filename_len--; diff --git a/ext/phar/tests/bug69453.phpt b/ext/phar/tests/bug69453.phpt new file mode 100644 index 0000000000..4a2a37f00a --- /dev/null +++ b/ext/phar/tests/bug69453.phpt @@ -0,0 +1,21 @@ +--TEST-- +Phar: bug #69453: Memory Corruption in phar_parse_tarfile when entry filename starts with null +--SKIPIF-- +<?php if (!extension_loaded("phar")) die("skip"); ?> +--FILE-- +<?php +$fname = dirname(__FILE__) . '/bug69453.tar.phar'; +try { +$r = new Phar($fname, 0); +} catch(UnexpectedValueException $e) { + echo $e; +} +?> + +==DONE== +--EXPECTF-- +exception 'UnexpectedValueException' with message 'phar error: "%s/bug69453.tar.phar" is a corrupted tar file (checksum mismatch of file "")' in %s:%d +Stack trace: +#0 %s/bug69453.php(%d): Phar->__construct('%s', 0) +#1 {main} +==DONE==
\ No newline at end of file |