]> granicus.if.org Git - php/commitdiff
fix segfault, comment out useless line
authorAntony Dovgal <tony2001@php.net>
Fri, 29 Feb 2008 13:56:46 +0000 (13:56 +0000)
committerAntony Dovgal <tony2001@php.net>
Fri, 29 Feb 2008 13:56:46 +0000 (13:56 +0000)
ext/phar/tar.c

index 5c1d19c3567041b8f1f2e9a901f4ebc06450e612..f7f8dba3cdbc835267e66037231cce13d1548d59 100644 (file)
@@ -121,6 +121,10 @@ int phar_open_or_create_tar(char *fname, int fname_len, char *alias, int alias_l
        phar_archive_data *phar;
        int ret = phar_create_or_parse_filename(fname, fname_len, alias, alias_len, options, &phar, error TSRMLS_CC);
 
+       if (FAILURE == ret) {
+               return FAILURE;
+       }
+
        if (pphar) {
                *pphar = phar;
        }
@@ -128,15 +132,11 @@ int phar_open_or_create_tar(char *fname, int fname_len, char *alias, int alias_l
        phar->is_data = is_data;
 
        if (is_data) {
-               phar->is_writeable;
+               /* phar->is_writeable; WTF */
                phar->alias = NULL;
                phar->alias_len = 0;
        }
 
-       if (FAILURE == ret) {
-               return FAILURE;
-       }
-
        if (phar->is_tar) {
                return ret;
        }