fopen may fail for a bad name -> EXIT_ERRORS in that case #17

gdraheim · gdraheim · commit 931f962ddfec · 2018-02-05T14:37:13.000+01:00
diff --git a/bins/unzzipcat-big.c b/bins/unzzipcat-big.c
@@ -83,6 +83,7 @@ static FILE* create_fopen(char* name, char* mode, int subdirs)
 
 static int unzzip_cat (int argc, char ** argv, int extract)
 {
+    int done = 0;
     int argn;
     FILE* disk;
 
@@ -94,25 +95,25 @@ static int unzzip_cat (int argc, char ** argv, int extract)
 
     if (argc == 2)
     {  /* print directory list */
-	int warnings = 0;
 	ZZIP_ENTRY* entry = zzip_entry_findfirst(disk);
 	for (; entry ; entry = zzip_entry_findnext(entry))
 	{
 	    char* name = zzip_entry_strdup_name (entry);
 	    FILE* out = stdout;
 	    if (! name) {
-	        warnings += 1;
+	        done = EXIT_WARNINGS;
 	        continue;
 	    }
 	    if (extract) out = create_fopen(name, "w", 1);
+	    if (! out) {
+	        done = EXIT_ERRORS;
+	        continue;
+	    }
 	    unzzip_cat_file (disk, name, out);
 	    if (extract) fclose(out);
 	    free (name);
 	}
-	if (warnings) {
-	   return EXIT_WARNINGS;
-	}
-	return 0;
+	return done;
     }
 
     if (argc == 3 && !extract)
@@ -137,14 +138,18 @@ static int unzzip_cat (int argc, char ** argv, int extract)
 	    {
 	        FILE* out = stdout;
 	        if (extract) out = create_fopen(name, "w", 1);
+		if (! out) {
+		    done = EXIT_ERRORS;
+		    continue;
+		}
 		unzzip_cat_file (disk, name, out);
 		if (extract) fclose(out);
 		break; /* match loop */
 	    }
 	    free (name);
 	}
     }
-    return 0;
+    return done;
 } 
 
 int unzzip_print (int argc, char ** argv)
diff --git a/bins/unzzipcat-mem.c b/bins/unzzipcat-mem.c
@@ -48,7 +48,7 @@ static void unzzip_mem_disk_cat_file(ZZIP_MEM_DISK* disk, char* name, FILE* out)
     ZZIP_DISK_FILE* file = zzip_mem_disk_fopen (disk, name);
     if (file) 
     {
-	char buffer[1024]; int len;
+	char buffer[1025]; int len;
 	while ((len = zzip_mem_disk_fread (buffer, 1, 1024, file))) 
 	{
 	    fwrite (buffer, 1, len, out);
@@ -87,6 +87,7 @@ static FILE* create_fopen(char* name, char* mode, int subdirs)
 
 static int unzzip_cat (int argc, char ** argv, int extract)
 {
+    int done;
     int argn;
     ZZIP_MEM_DISK* disk;
 
@@ -112,10 +113,14 @@ static int unzzip_cat (int argc, char ** argv, int extract)
 	    char* name = zzip_mem_entry_to_name (entry);
 	    FILE* out = stdout;
 	    if (extract) out = create_fopen(name, "w", 1);
+	    if (! out) {
+	        done = EXIT_ERRORS;
+	        continue;
+	    }
 	    unzzip_mem_disk_cat_file (disk, name, out);
 	    if (extract) fclose(out);
 	}
-	return 0;
+	return done;
     }
 
     if (argc == 3 && !extract)
@@ -140,13 +145,17 @@ static int unzzip_cat (int argc, char ** argv, int extract)
 	    {
 	        FILE* out = stdout;
 	        if (extract) out = create_fopen(name, "w", 1);
+	        if (! out) {
+	            done = EXIT_ERRORS;
+	            continue;
+	        }
 		unzzip_mem_disk_cat_file (disk, name, out);
 		if (extract) fclose(out);
 		break; /* match loop */
 	    }
 	}
     }
-    return 0;
+    return done;
 } 
 
 int unzzip_print (int argc, char ** argv)
diff --git a/bins/unzzipcat-mix.c b/bins/unzzipcat-mix.c
@@ -98,6 +98,7 @@ static FILE* create_fopen(char* name, char* mode, int subdirs)
 
 static int unzzip_cat (int argc, char ** argv, int extract)
 {
+    int done = 0;
     int argn;
     ZZIP_DIR* disk;
     
@@ -122,6 +123,10 @@ static int unzzip_cat (int argc, char ** argv, int extract)
 	    char* name = entry->d_name;
 	    FILE* out = stdout;
 	    if (extract) out = create_fopen(name, "w", 1);
+	    if (! out) {
+	        done = EXIT_ERRORS;
+	        continue;
+	    }
 	    unzzip_cat_file (disk, name, out);
 	    if (extract) fclose(out);
 	}
@@ -149,6 +154,10 @@ static int unzzip_cat (int argc, char ** argv, int extract)
 	             mix_name[zip_name_len] = '/';
 	             strcpy(mix_name + zip_name_len + 1, name);
 	             if (extract) out = create_fopen(name, "w", 1);
+	             if (! out) {
+	                 done = EXIT_ERRORS;
+	                 continue;
+	             }
 		     fprintf(stderr, "%s %s -> %s\n", zip_name, name, mix_name);
 		     /* 'test1.zip' 'README' -> 'test1/README' */
 		     unzzip_cat_file (disk, mix_name, out);
@@ -159,7 +168,7 @@ static int unzzip_cat (int argc, char ** argv, int extract)
 	}
     }
     zzip_closedir(disk);
-    return 0;
+    return done;
 } 
 
 int unzzip_print (int argc, char ** argv)
diff --git a/bins/unzzipcat-zip.c b/bins/unzzipcat-zip.c
@@ -97,6 +97,7 @@ static FILE* create_fopen(char* name, char* mode, int subdirs)
 
 static int unzzip_cat (int argc, char ** argv, int extract)
 {
+    int done = 0;
     int argn;
     ZZIP_DIR* disk;
     zzip_error_t error;
@@ -121,10 +122,12 @@ static int unzzip_cat (int argc, char ** argv, int extract)
 	    char* name = entry.d_name;
 	    FILE* out = stdout;
 	    if (extract) out = create_fopen(name, "w", 1);
-	    if (out) {
-	        unzzip_cat_file (disk, name, out);
-	        if (extract) fclose(out);
+	    if (! out) {
+	        done = EXIT_ERRORS;
+	        continue;
 	    }
+	    unzzip_cat_file (disk, name, out);
+	    if (extract) fclose(out);
 	}
     }
     else
@@ -140,17 +143,19 @@ static int unzzip_cat (int argc, char ** argv, int extract)
 	        {
 	            FILE* out = stdout;
 	            if (extract) out = create_fopen(name, "w", 1);
-	            if (out) {
-		        unzzip_cat_file (disk, name, out);
-		        if (extract) fclose(out);
+		    if (! out) {
+		        done = EXIT_ERRORS;
+		        continue;
 		    }
+	            unzzip_cat_file (disk, name, out);
+	            if (extract) fclose(out);
 		    break; /* match loop */
 	        }
 	    }
 	}
     }
     zzip_dir_close(disk);
-    return 0;
+    return done;
 } 
 
 int unzzip_print (int argc, char ** argv)

Original file line number	Diff line number	Diff line change
`@@ -83,6 +83,7 @@ static FILE* create_fopen(char* name, char* mode, int subdirs)`
`83`	`83`
`84`	`84`	`static int unzzip_cat (int argc, char ** argv, int extract)`
`85`	`85`	`{`
	`86`	`+ int done = 0;`
`86`	`87`	`int argn;`
`87`	`88`	`FILE* disk;`
`88`	`89`
`@@ -94,25 +95,25 @@ static int unzzip_cat (int argc, char ** argv, int extract)`
`94`	`95`
`95`	`96`	`if (argc == 2)`
`96`	`97`	`{ /* print directory list */`
`97`		`- int warnings = 0;`
`98`	`98`	`ZZIP_ENTRY* entry = zzip_entry_findfirst(disk);`
`99`	`99`	`for (; entry ; entry = zzip_entry_findnext(entry))`
`100`	`100`	`{`
`101`	`101`	`char* name = zzip_entry_strdup_name (entry);`
`102`	`102`	`FILE* out = stdout;`
`103`	`103`	`if (! name) {`
`104`		`- warnings += 1;`
	`104`	`+ done = EXIT_WARNINGS;`
`105`	`105`	`continue;`
`106`	`106`	`}`
`107`	`107`	`if (extract) out = create_fopen(name, "w", 1);`
	`108`	`+ if (! out) {`
	`109`	`+ done = EXIT_ERRORS;`
	`110`	`+ continue;`
	`111`	`+ }`
`108`	`112`	`unzzip_cat_file (disk, name, out);`
`109`	`113`	`if (extract) fclose(out);`
`110`	`114`	`free (name);`
`111`	`115`	`}`
`112`		`- if (warnings) {`
`113`		`- return EXIT_WARNINGS;`
`114`		`- }`
`115`		`- return 0;`
	`116`	`+ return done;`
`116`	`117`	`}`
`117`	`118`
`118`	`119`	`if (argc == 3 && !extract)`
`@@ -137,14 +138,18 @@ static int unzzip_cat (int argc, char ** argv, int extract)`
`137`	`138`	`{`
`138`	`139`	`FILE* out = stdout;`
`139`	`140`	`if (extract) out = create_fopen(name, "w", 1);`
	`141`	`+ if (! out) {`
	`142`	`+ done = EXIT_ERRORS;`
	`143`	`+ continue;`
	`144`	`+ }`
`140`	`145`	`unzzip_cat_file (disk, name, out);`
`141`	`146`	`if (extract) fclose(out);`
`142`	`147`	`break; /* match loop */`
`143`	`148`	`}`
`144`	`149`	`free (name);`
`145`	`150`	`}`
`146`	`151`	`}`
`147`		`- return 0;`
	`152`	`+ return done;`
`148`	`153`	`}`
`149`	`154`
`150`	`155`	`int unzzip_print (int argc, char ** argv)`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ static void unzzip_mem_disk_cat_file(ZZIP_MEM_DISK* disk, char* name, FILE* out)`
`48`	`48`	`ZZIP_DISK_FILE* file = zzip_mem_disk_fopen (disk, name);`
`49`	`49`	`if (file)`
`50`	`50`	`{`
`51`		`- char buffer[1024]; int len;`
	`51`	`+ char buffer[1025]; int len;`
`52`	`52`	`while ((len = zzip_mem_disk_fread (buffer, 1, 1024, file)))`
`53`	`53`	`{`
`54`	`54`	`fwrite (buffer, 1, len, out);`
`@@ -87,6 +87,7 @@ static FILE* create_fopen(char* name, char* mode, int subdirs)`
`87`	`87`
`88`	`88`	`static int unzzip_cat (int argc, char ** argv, int extract)`
`89`	`89`	`{`
	`90`	`+ int done;`
`90`	`91`	`int argn;`
`91`	`92`	`ZZIP_MEM_DISK* disk;`
`92`	`93`
`@@ -112,10 +113,14 @@ static int unzzip_cat (int argc, char ** argv, int extract)`
`112`	`113`	`char* name = zzip_mem_entry_to_name (entry);`
`113`	`114`	`FILE* out = stdout;`
`114`	`115`	`if (extract) out = create_fopen(name, "w", 1);`
	`116`	`+ if (! out) {`
	`117`	`+ done = EXIT_ERRORS;`
	`118`	`+ continue;`
	`119`	`+ }`
`115`	`120`	`unzzip_mem_disk_cat_file (disk, name, out);`
`116`	`121`	`if (extract) fclose(out);`
`117`	`122`	`}`
`118`		`- return 0;`
	`123`	`+ return done;`
`119`	`124`	`}`
`120`	`125`
`121`	`126`	`if (argc == 3 && !extract)`
`@@ -140,13 +145,17 @@ static int unzzip_cat (int argc, char ** argv, int extract)`
`140`	`145`	`{`
`141`	`146`	`FILE* out = stdout;`
`142`	`147`	`if (extract) out = create_fopen(name, "w", 1);`
	`148`	`+ if (! out) {`
	`149`	`+ done = EXIT_ERRORS;`
	`150`	`+ continue;`
	`151`	`+ }`
`143`	`152`	`unzzip_mem_disk_cat_file (disk, name, out);`
`144`	`153`	`if (extract) fclose(out);`
`145`	`154`	`break; /* match loop */`
`146`	`155`	`}`
`147`	`156`	`}`
`148`	`157`	`}`
`149`		`- return 0;`
	`158`	`+ return done;`
`150`	`159`	`}`
`151`	`160`
`152`	`161`	`int unzzip_print (int argc, char ** argv)`
Original file line number	Diff line number	Diff line change
`@@ -97,6 +97,7 @@ static FILE* create_fopen(char* name, char* mode, int subdirs)`
`97`	`97`
`98`	`98`	`static int unzzip_cat (int argc, char ** argv, int extract)`
`99`	`99`	`{`
	`100`	`+ int done = 0;`
`100`	`101`	`int argn;`
`101`	`102`	`ZZIP_DIR* disk;`
`102`	`103`	`zzip_error_t error;`
`@@ -121,10 +122,12 @@ static int unzzip_cat (int argc, char ** argv, int extract)`
`121`	`122`	`char* name = entry.d_name;`
`122`	`123`	`FILE* out = stdout;`
`123`	`124`	`if (extract) out = create_fopen(name, "w", 1);`
`124`		`- if (out) {`
`125`		`- unzzip_cat_file (disk, name, out);`
`126`		`- if (extract) fclose(out);`
	`125`	`+ if (! out) {`
	`126`	`+ done = EXIT_ERRORS;`
	`127`	`+ continue;`
`127`	`128`	`}`
	`129`	`+ unzzip_cat_file (disk, name, out);`
	`130`	`+ if (extract) fclose(out);`
`128`	`131`	`}`
`129`	`132`	`}`
`130`	`133`	`else`
`@@ -140,17 +143,19 @@ static int unzzip_cat (int argc, char ** argv, int extract)`
`140`	`143`	`{`
`141`	`144`	`FILE* out = stdout;`
`142`	`145`	`if (extract) out = create_fopen(name, "w", 1);`
`143`		`- if (out) {`
`144`		`- unzzip_cat_file (disk, name, out);`
`145`		`- if (extract) fclose(out);`
	`146`	`+ if (! out) {`
	`147`	`+ done = EXIT_ERRORS;`
	`148`	`+ continue;`
`146`	`149`	`}`
	`150`	`+ unzzip_cat_file (disk, name, out);`
	`151`	`+ if (extract) fclose(out);`
`147`	`152`	`break; /* match loop */`
`148`	`153`	`}`
`149`	`154`	`}`
`150`	`155`	`}`
`151`	`156`	`}`
`152`	`157`	`zzip_dir_close(disk);`
`153`		`- return 0;`
	`158`	`+ return done;`
`154`	`159`	`}`
`155`	`160`
`156`	`161`	`int unzzip_print (int argc, char ** argv)`