- Fixed bug #60261 (phar dos null pointer)

diff --git a/ext/phar/tests/bug60261.phpt b/ext/phar/tests/bug60261.phpt
new file mode 100644 (file)
index 0000000..1b6cd7a
--- /dev/null
+++ b/ext/phar/tests/bug60261.phpt
@@ -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

diff --git a/ext/spl/spl_directory.c b/ext/spl/spl_directory.c
index 2223c3a000880064983cfc937e00dfde8e8ea0f1..cc2a9d8c64b55d21d2998c6e3582c3570e2982d8 100755 (executable)
--- a/ext/spl/spl_directory.c
+++ b/ext/spl/spl_directory.c
@@ -1230,7 +1230,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];
                if (!expand_filepath_with_mode(intern->file_name, expanded_path, NULL, 0, CWD_EXPAND  TSRMLS_CC)) {
                        php_error_docref(NULL TSRMLS_CC, E_WARNING, "No such file or directory");