]> granicus.if.org Git - php/commitdiff
fix extension detection for aliases with no extension
authorGreg Beaver <cellog@php.net>
Mon, 7 Jan 2008 17:18:41 +0000 (17:18 +0000)
committerGreg Beaver <cellog@php.net>
Mon, 7 Jan 2008 17:18:41 +0000 (17:18 +0000)
ext/phar/phar.c

index aa566b39420b7f07128f0b5b53b671101de78ee0..046a5be406248c1f14e30020e0326e752b0a1ee7 100644 (file)
@@ -1998,10 +1998,10 @@ int phar_detect_phar_fname_ext(const char *filename, int check_length, char **ex
        } else if (pos_t) {
                *ext_str = pos_t;
                *ext_len = 9;
-       } else if ((pos_p = strstr(filename, ".phar")) != NULL) {
+       } else if ((pos_p = strstr(filename, ".phar")) != NULL && pos_p[4] != '\0') {
                *ext_str = pos_p;
                *ext_len = 5;
-       } else if ((pos_p = strstr(filename, ".php")) != NULL) {
+       } else if ((pos_p = strstr(filename, ".php")) != NULL && pos_p[4] != '\0') {
                *ext_str = pos_p;
                *ext_len = 4;
        } else {