Fix build issue from previous commit and fix additional compiler warning

This commit is contained in:
2016-12-22 21:05:48 -06:00
parent eeff110b31
commit bd7c795077
+3 -3
View File
@@ -35,10 +35,10 @@ char *loadFileBuff(const char *path, ::size_t *sizeOut = nullptr) {
const auto size = ftell(file); const auto size = ftell(file);
rewind(file); rewind(file);
auto buff = (char*) malloc(size); auto buff = (char*) malloc(size);
fread(buff, size, 1, file); auto itemsRead = fread(buff, size, 1, file);
fclose(file); fclose(file);
if (sizeOut) { if (sizeOut) {
*sizeOut = size; *sizeOut = itemsRead ? size : 0;
} }
return buff; return buff;
} else { } else {
@@ -212,6 +212,7 @@ int write(int argc, char **args) {
err = 1; err = 1;
} }
} }
free(srcBuff);
} else { } else {
err = 1; err = 1;
fprintf(stderr, "Could not load source file.\n"); fprintf(stderr, "Could not load source file.\n");
@@ -219,7 +220,6 @@ int write(int argc, char **args) {
} }
free(fsBuff); free(fsBuff);
free(srcBuff);
} else { } else {
fprintf(stderr, "Could not open file system\n"); fprintf(stderr, "Could not open file system\n");
} }