diff --git a/ChangeLog b/ChangeLog index 7c4c41806f..1de35287d7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-04-02 Tim-Philipp Müller + + * gst/goom/goomsl.c: (gsl_read_file): + Check return value of fread() to avoid compiler warnings. + 2008-04-01 Wim Taymans Based on patch by: mersad diff --git a/common b/common index 4221e9dcb0..5421815aee 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit 4221e9dcb05faa6f6f7ba19bba32fe90da4577dd +Subproject commit 5421815aeed8b2d73a4d4d4a4b8eb2c93f1b7d02 diff --git a/gst/goom/goomsl.c b/gst/goom/goomsl.c index 759be102d2..6f40775413 100644 --- a/gst/goom/goomsl.c +++ b/gst/goom/goomsl.c @@ -1609,7 +1609,9 @@ gsl_read_file (const char *fname) fsize = ftell (f); rewind (f); buffer = (char *) malloc (fsize + 512); - fread (buffer, 1, fsize, f); + if (fread (buffer, 1, fsize, f) != fsize) { + buffer[0] = '\0'; + } fclose (f); buffer[fsize] = 0; return buffer;