<div dir="ltr"><div dir="ltr"><div class="gmail_quote"><div dir="ltr">On Fri, Nov 30, 2018 at 5:49 PM Eric Engestrom <<a href="mailto:eric.engestrom@intel.com">eric.engestrom@intel.com</a>> wrote: </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">On Friday, 2018-11-30 15:47:11 +0000, Lionel Landwerlin wrote: > On 14/11/2018 16:30, <a href="mailto:asimiklit.work@gmail.com" target="_blank">asimiklit.work@gmail.com</a> wrote: > > From: Andrii Simiklit <<a href="mailto:andrii.simiklit@globallogic.com" target="_blank">andrii.simiklit@globallogic.com</a>> > > > > 1. tools/i965_disasm.c:58:4: warning: > > ignoring return value of ‘fread’, > > declared with attribute warn_unused_result > > fread(assembly, *end, 1, fp); > > > > v2: Fixed incorrect return value check. > > ( Eric Engestrom <<a href="mailto:eric.engestrom@intel.com" target="_blank">eric.engestrom@intel.com</a>> ) > > > > v3: Zero size file check placed before fread with exit() > > ( Eric Engestrom <<a href="mailto:eric.engestrom@intel.com" target="_blank">eric.engestrom@intel.com</a>> ) > > > > v4: - Title is changed. > > - The 'size' variable was moved to top of a function scope. > > - The assertion was replaced by the proper error handling. > > - The error message on a caller side was fixed. > > ( Eric Engestrom <<a href="mailto:eric.engestrom@intel.com" target="_blank">eric.engestrom@intel.com</a>> ) > > > > Signed-off-by: Andrii Simiklit <<a href="mailto:andrii.simiklit@globallogic.com" target="_blank">andrii.simiklit@globallogic.com</a>> > > > With the nit below : > > > Reviewed-by: Lionel Landwerlin <<a href="mailto:lionel.g.landwerlin@intel.com" target="_blank">lionel.g.landwerlin@intel.com</a>> I'll change that as I push it in a minute :) Reviewed-by: Eric Engestrom <<a href="mailto:eric.engestrom@intel.com" target="_blank">eric.engestrom@intel.com</a>> </blockquote><div> </div><div>Thanks a lot for reviews :) </div><div> </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"> > > > > --- > > src/intel/tools/i965_disasm.c | 16 +++++++++++++--- > > 1 file changed, 13 insertions(+), 3 deletions(-) > > > > diff --git a/src/intel/tools/i965_disasm.c b/src/intel/tools/i965_disasm.c > > index 73a6760fc1..0efbdab706 100644 > > --- a/src/intel/tools/i965_disasm.c > > +++ b/src/intel/tools/i965_disasm.c > > @@ -47,17 +47,23 @@ i965_disasm_get_file_size(FILE *fp) > > static void * > > i965_disasm_read_binary(FILE *fp, size_t *end) > > { > > + size_t size; > > void *assembly; > > *end = i965_disasm_get_file_size(fp); > > + if (!*end) > > + return NULL; > > assembly = malloc(*end + 1); > > if (assembly == NULL) > > return NULL; > > - fread(assembly, *end, 1, fp); > > + size = fread(assembly, *end, 1, fp); > > fclose(fp); > > - > > + if (!size) { > > + free(assembly); > > + return NULL; > > + } > > return assembly; > > } > > @@ -167,7 +173,11 @@ int main(int argc, char *argv[]) > > assembly = i965_disasm_read_binary(fp, &end); > > if (!assembly) { > > - fprintf(stderr, "Unable to allocate buffer to read binary file\n"); > > + if(end) > if (end) > > + fprintf(stderr, "Unable to allocate buffer to read binary file\n"); > > + else > > + fprintf(stderr, "Input file is empty\n"); > > + > > exit(EXIT_FAILURE); > > } > > _______________________________________________ mesa-dev mailing list <a href="mailto:mesa-dev@lists.freedesktop.org" target="_blank">mesa-dev@lists.freedesktop.org</a> <a href="https://lists.freedesktop.org/mailman/listinfo/mesa-dev" rel="noreferrer" target="_blank">https://lists.freedesktop.org/mailman/listinfo/mesa-dev</a> </blockquote></div></div></div>