Fixed bug #51690 (Phar::setStub looks for case-sensitive __HALT_COMPILER())

diff --git a/ext/phar/phar.c b/ext/phar/phar.c
index 5ffa9e0ba6e0691eda75008919bbc61c12683ad2..062655af96dbce79a133e554f5ca8ce9b2eb2701 100644 (file)
--- a/ext/phar/phar.c
+++ b/ext/phar/phar.c
@@ -2561,8 +2561,8 @@ char *phar_create_default_stub(const char *index_php, const char *web_index, siz
  */
 int phar_flush(phar_archive_data *phar, char *user_stub, long len, int convert, char **error TSRMLS_DC) /* {{{ */
 {
-/*     static const char newstub[] = "<?php __HALT_COMPILER(); ?>\r\n"; */
-       char *newstub;
+       char halt_stub[] = "__HALT_COMPILER();";
+       char *newstub, *tmp;
        phar_entry_info *entry, *newentry;
        int halt_offset, restore_alias_len, global_flags = 0, closeoldfile;
        char *pos, has_dirs = 0;
@@ -2663,8 +2663,9 @@ int phar_flush(phar_archive_data *phar, char *user_stub, long len, int convert,
                } else {
                        free_user_stub = 0;
                }
-               if ((pos = strstr(user_stub, "__HALT_COMPILER();")) == NULL)
-               {
+               tmp = estrndup(user_stub, len);
+               if ((pos = php_stristr(tmp, halt_stub, len, sizeof(halt_stub) - 1)) == NULL) {
+                       efree(tmp);
                        if (closeoldfile) {
                                php_stream_close(oldfile);
                        }
@@ -2677,6 +2678,8 @@ int phar_flush(phar_archive_data *phar, char *user_stub, long len, int convert,
                        }
                        return EOF;
                }
+               pos = user_stub + (pos - tmp);
+               efree(tmp);
                len = pos - user_stub + 18;
                if ((size_t)len != php_stream_write(newfile, user_stub, len)
                ||                        5 != php_stream_write(newfile, " ?>\r\n", 5)) {

diff --git a/ext/phar/tar.c b/ext/phar/tar.c
index 53255b1d2d9e05a3aa16a9fc3a1f9eaa4c20691e..a0b6f511f41066a395d4011445d01158eb20543c 100644 (file)
--- a/ext/phar/tar.c
+++ b/ext/phar/tar.c
@@ -911,7 +911,8 @@ int phar_tar_flush(phar_archive_data *phar, char *user_stub, long len, int defau
        php_stream *oldfile, *newfile, *stubfile;
        int closeoldfile, free_user_stub, signature_length;
        struct _phar_pass_tar_info pass;
-       char *buf, *signature, sigbuf[8];
+       char *buf, *signature, *tmp, sigbuf[8];
+       char halt_stub[] = "__HALT_COMPILER();";
 
        entry.flags = PHAR_ENT_PERM_DEF_FILE;
        entry.timestamp = time(NULL);
@@ -990,7 +991,9 @@ int phar_tar_flush(phar_archive_data *phar, char *user_stub, long len, int defau
                        free_user_stub = 0;
                }
 
-               if ((pos = strstr(user_stub, "__HALT_COMPILER();")) == NULL) {
+               tmp = estrndup(user_stub, len);
+               if ((pos = php_stristr(tmp, halt_stub, len, sizeof(halt_stub) - 1)) == NULL) {
+                       efree(tmp);
                        if (error) {
                                spprintf(error, 0, "illegal stub for tar-based phar \"%s\"", phar->fname);
                        }
@@ -999,6 +1002,8 @@ int phar_tar_flush(phar_archive_data *phar, char *user_stub, long len, int defau
                        }
                        return EOF;
                }
+               pos = user_stub + (pos - tmp);
+               efree(tmp);
 
                len = pos - user_stub + 18;
                entry.fp = php_stream_fopen_tmpfile();

diff --git a/ext/phar/zip.c b/ext/phar/zip.c
index 383561ab87c997dabd6b33575cb8e47c51729641..eb64dea0471b5f71197843c526296f11d863a69d 100644 (file)
--- a/ext/phar/zip.c
+++ b/ext/phar/zip.c
@@ -1167,6 +1167,9 @@ int phar_zip_flush(phar_archive_data *phar, char *user_stub, long len, int defau
        char *pos;
        smart_str main_metadata_str = {0};
        static const char newstub[] = "<?php // zip-based phar archive stub file\n__HALT_COMPILER();";
+       char halt_stub[] = "__HALT_COMPILER();";
+       char *tmp;
+       
        php_stream *stubfile, *oldfile;
        php_serialize_data_t metadata_hash;
        int free_user_stub, closeoldfile = 0;
@@ -1261,8 +1264,9 @@ int phar_zip_flush(phar_archive_data *phar, char *user_stub, long len, int defau
                        free_user_stub = 0;
                }
 
-               if ((pos = strstr(user_stub, "__HALT_COMPILER();")) == NULL)
-               {
+               tmp = estrndup(user_stub, len);
+               if ((pos = php_stristr(tmp, halt_stub, len, sizeof(halt_stub) - 1)) == NULL) {
+                       efree(tmp);
                        if (error) {
                                spprintf(error, 0, "illegal stub for zip-based phar \"%s\"", phar->fname);
                        }
@@ -1271,6 +1275,8 @@ int phar_zip_flush(phar_archive_data *phar, char *user_stub, long len, int defau
                        }
                        return EOF;
                }
+               pos = user_stub + (pos - tmp);
+               efree(tmp);
 
                len = pos - user_stub + 18;
                entry.fp = php_stream_fopen_tmpfile();