fix php bug #49018 (phar tar stores long filenames with prefix/name reversed)

diff --git a/NEWS b/NEWS
index 13783578b9d11fbbcfb2e04c3f582f38b06c330a..531c622bfc3c57c725624207113eb1739b36a36c 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,8 @@ PHP                                                                        NEWS
 - Fixed open_basedir circumvention for mail.log. (Maksymilian Arciemowicz,
   Stas)
 
+- Fixed bug #49018 (phar tar stores long filenames wit prefix/name reversed).
+  (Greg)
 - Fixed bug #48962 (cURL does not upload files with specified filename).
   (Ilia)
 - Fixed bug #48929 (Double \r\n after HTTP headers when "header" context

diff --git a/ext/phar/tar.c b/ext/phar/tar.c
index 1869e5c6ea63eee758be59aa3787b92ba4698723..1cd0711cdad4d17de54f178e419c0ff186af1fed 100644 (file)
--- a/ext/phar/tar.c
+++ b/ext/phar/tar.c
@@ -343,6 +343,9 @@ bail:
                        }
                        for (j = 0; j < 100; j++) {
                                name[i+j] = hdr->name[j];
+                               if (name[i+j] == '\0') {
+                                       break;
+                               }
                        }
 
                        entry.filename_len = i+j;
@@ -644,8 +647,8 @@ static int phar_tar_writeheaders(void *pDest, void *argument TSRMLS_DC) /* {{{ *
                        }
                        return ZEND_HASH_APPLY_STOP;
                }
-               memcpy(header.prefix, entry->filename+100, entry->filename_len - 100);
-               memcpy(header.name, entry->filename, 100);
+               memcpy(header.prefix, entry->filename, entry->filename_len - 100);
+               memcpy(header.name, entry->filename + (entry->filename_len - 100), 100);
        } else {
                memcpy(header.name, entry->filename, entry->filename_len);
        }

diff --git a/ext/phar/tests/tar/bignames.phpt b/ext/phar/tests/tar/bignames.phpt
index 4b51e2a9214f1b3168f8f2c9ac538200783f732d..c6b6bccdb1c3d01d1d9f22cd518fb382f712da45 100644 (file)
--- a/ext/phar/tests/tar/bignames.phpt
+++ b/ext/phar/tests/tar/bignames.phpt
@@ -11,11 +11,11 @@ $fname2 = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.2.tar';
 $pname = 'phar://' . $fname;
 
 $p1 = new PharData($fname);
-$p1[str_repeat('a', 101)] = 'hi';
+$p1[str_repeat('a', 100) . 'b'] = 'hi';
 $p1[str_repeat('a', 255)] = 'hi2';
 copy($fname, $fname2);
 $p2 = new PharData($fname2);
-echo $p2[str_repeat('a', 101)]->getContent() . "\n";
+echo $p2[str_repeat('a', 100) . 'b']->getContent() . "\n";
 echo $p2[str_repeat('a', 255)]->getContent() . "\n";
 
 try {