clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 18:37:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Fixed bug #60261 (phar dos null pointer)

Browse Source
This commit is contained in:
Felipe Pena 2011-11-11 21:39:11 +00:00
parent 0c00f3a15c
commit 72a133f155
3 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
NEWS
View File

@ -16,6 +16,9 @@ PHP NEWS
- Oracle Database extension (OCI8):
. Fixed bug #59985 (show normal warning text for OCI_NO_DATA)
(Chris Jones)
- Phar:
. Fixed bug #60261 (phar dos null pointer). (Felipe)
03 Nov 2011, PHP 5.3.9RC1

19
ext/phar/tests/bug60261.phpt Normal file
View File

@ -0,0 +1,19 @@
--TEST--
Bug #60261 (phar dos null pointer)
--SKIPIF--
<?php if (!extension_loaded("phar")) die("skip"); ?>
--FILE--
<?php
$nx = new Phar();
try {
$nx->getLinkTarget();
} catch (Exception $e) {
echo $e->getMessage(), "\n";
}
?>
--EXPECTF--
Warning: Phar::__construct() expects at least 1 parameter, 0 given in %s on line %d
SplFileInfo::getLinkTarget(): Empty filename

5
ext/spl/spl_directory.c
View File

@ -1215,7 +1215,10 @@ SPL_METHOD(SplFileInfo, getLinkTarget)
zend_replace_error_handling(EH_THROW, spl_ce_RuntimeException, &error_handling TSRMLS_CC);
#if defined(PHP_WIN32) || HAVE_SYMLINK
if (!IS_ABSOLUTE_PATH(intern->file_name, intern->file_name_len)) {
if (intern->file_name == NULL) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Empty filename");
RETURN_FALSE;
} else if (!IS_ABSOLUTE_PATH(intern->file_name, intern->file_name_len)) {
char expanded_path[MAXPATHLEN];
/* TODO: Fix expand_filepath to do not resolve links but only expand the path