Commit eb929319 authored by Nikias Bassen's avatar Nikias Bassen

plistutil: Print error message when opening input/output file fails and plug memory leaks on error

parent cf9ee441
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <errno.h>
#ifdef _MSC_VER #ifdef _MSC_VER
#pragma warning(disable:4996) #pragma warning(disable:4996)
...@@ -124,14 +125,18 @@ int main(int argc, char *argv[]) ...@@ -124,14 +125,18 @@ int main(int argc, char *argv[])
// read input file // read input file
iplist = fopen(options->in_file, "rb"); iplist = fopen(options->in_file, "rb");
if (!iplist) { if (!iplist) {
printf("ERROR: Could not open input file '%s': %s\n", options->in_file, strerror(errno));
free(options); free(options);
return 1; return 1;
} }
stat(options->in_file, &filestats); memset(&filestats, '\0', sizeof(struct stat));
fstat(fileno(iplist), &filestats);
if (filestats.st_size < 8) { if (filestats.st_size < 8) {
printf("ERROR: Input file is too small to contain valid plist data.\n"); printf("ERROR: Input file is too small to contain valid plist data.\n");
free(options);
fclose(iplist);
return -1; return -1;
} }
...@@ -159,6 +164,7 @@ int main(int argc, char *argv[]) ...@@ -159,6 +164,7 @@ int main(int argc, char *argv[])
{ {
FILE *oplist = fopen(options->out_file, "wb"); FILE *oplist = fopen(options->out_file, "wb");
if (!oplist) { if (!oplist) {
printf("ERROR: Could not open output file '%s': %s\n", options->out_file, strerror(errno));
free(options); free(options);
return 1; return 1;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment