Improve error messages for truncated files
If we get a truncated file, the error message we got was a little
lackluster:
File read failed
Improve the error message to include the expected length, and the length
it was able to read.
Change-Id: I662af0f6b1aeb410f0fb74bd317baa233ccce2d7
Signed-off-by: Ed Tanous <etanous@nvidia.com>
diff --git a/cper-parse.c b/cper-parse.c
index 2cfe71c..9dd9c4f 100644
--- a/cper-parse.c
+++ b/cper-parse.c
@@ -163,13 +163,22 @@
}
fseek(cper_file, -sizeof(EFI_COMMON_ERROR_RECORD_HEADER), SEEK_CUR);
unsigned char *cper_buf = malloc(header.RecordLength);
- if (fread(cper_buf, header.RecordLength, 1, cper_file) != 1) {
- cper_print_log("File read failed\n");
+ int bytes_read = fread(cper_buf, 1, header.RecordLength, cper_file);
+ if (bytes_read < 0) {
+ cper_print_log("File read failed with code %u\n", bytes_read);
+ free(cper_buf);
+ return NULL;
+ }
+ if ((UINT32)bytes_read != header.RecordLength) {
+ int position = ftell(cper_file);
+ cper_print_log(
+ "File read failed file was %u bytes, expecting %u bytes from header.\n",
+ position, header.RecordLength);
free(cper_buf);
return NULL;
}
- json_object *ir = cper_buf_to_ir(cper_buf, header.RecordLength);
+ json_object *ir = cper_buf_to_ir(cper_buf, bytes_read);
free(cper_buf);
return ir;
}