Merge pull request #84 from ryancaicse/master

Fix resource leaks in different places

tools/bin2o.c

@@ -362,17 +362,20 @@ int main(int argc, char *argv[])
     buffer = malloc(size);
     if (buffer == NULL) {
 	printf("Failed to allocate memory.\n");
+	fclose(dest);
 	return 1;
     }
 
     if (fread(buffer, 1, size, source) != size) {
 	printf("Failed to read file.\n");
+	fclose(dest);
 	return 1;
     }
     fclose(source);
 
     if (!(dest = fopen(f_dest, "wb+"))) {
 	printf("Failed to open/create %s.\n", f_dest);
+	fclose(dest);
 	return 1;
     }
     

tools/bin2s.c

@@ -40,11 +40,13 @@ int main(int argc, char *argv[])
 	buffer = malloc(fd_size);
 	if(buffer == NULL) {
 		printf("Failed to allocate memory.\n");
+		fclose(source);
 		return 1;
 	}
 
 	if(fread(buffer,1,fd_size,source) != fd_size) {
 		printf("Failed to read file.\n");
+		fclose(source);
 		return 1;
 	}
 	fclose(source);

tools/psp-fixup-imports.c

@@ -183,6 +183,7 @@ unsigned char *load_file(const char *file, unsigned int *size)
 			if(*size < sizeof(Elf32_Ehdr))
 			{
 				fprintf(stderr, "Error, invalid file size\n");
+				fclose(fp);
 				break;
 			}
 
@@ -190,6 +191,7 @@ unsigned char *load_file(const char *file, unsigned int *size)
 			if(data == NULL)
 			{
 				fprintf(stderr, "Error, could not allocate memory for ELF\n");
+				fclose(fp);
 				break;
 			}
 

tools/psp-prxgen.c

@@ -132,6 +132,7 @@ unsigned char *load_file(const char *file)
 			if(size < sizeof(Elf32_Ehdr))
 			{
 				fprintf(stderr, "Error, invalid file size\n");
+				fclose(fp);
 				break;
 			}
 
@@ -139,6 +140,7 @@ unsigned char *load_file(const char *file)
 			if(data == NULL)
 			{
 				fprintf(stderr, "Error, could not allocate memory for ELF\n");
+				fclose(fp);
 				break;
 			}