summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWim Taymans <wim.taymans@gmail.com>2006-07-18 09:36:46 +0000
committerWim Taymans <wim.taymans@gmail.com>2006-07-18 09:36:46 +0000
commit4071cd900f58791470a1f569122297190ca0b790 (patch)
tree9c650e293f835966568605bf2f0f0dc75a2147ac
parentc8d258588e85f0b7e4dd07c79ac14debec30ce83 (diff)
downloadgst-plugins-bad-4071cd900f58791470a1f569122297190ca0b790.tar.gz
gst-plugins-bad-4071cd900f58791470a1f569122297190ca0b790.tar.bz2
gst-plugins-bad-4071cd900f58791470a1f569122297190ca0b790.zip
gst/nsf/nsf.c: Fix compilation by not ignoring return values of fread.
Original commit message from CVS: * gst/nsf/nsf.c: (nsf_load): Fix compilation by not ignoring return values of fread.
-rw-r--r--ChangeLog5
-rw-r--r--gst/nsf/nsf.c17
2 files changed, 18 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index fd785303..580c9157 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-07-18 Wim Taymans <wim@fluendo.com>
+
+ * gst/nsf/nsf.c: (nsf_load):
+ Fix compilation by not ignoring return values of fread.
+
2006-07-17 Thomas Vander Stichele <thomas at apestaart dot org>
* docs/plugins/inspect/plugin-alsaspdif.xml:
diff --git a/gst/nsf/nsf.c b/gst/nsf/nsf.c
index 8b89f23d..048b4b12 100644
--- a/gst/nsf/nsf.c
+++ b/gst/nsf/nsf.c
@@ -429,9 +429,13 @@ nsf_load (char *filename, void *source, int length)
return NULL;
/* Read in the header */
- if (NULL == source)
- fread (temp_nsf, 1, NSF_HEADER_SIZE, fp);
- else
+ if (NULL == source) {
+ if (fread (temp_nsf, 1, NSF_HEADER_SIZE, fp) != NSF_HEADER_SIZE) {
+ log_printf ("error reading file\n");
+ free (temp_nsf);
+ return NULL;
+ }
+ } else
memcpy (temp_nsf, source, NSF_HEADER_SIZE);
if (memcmp (temp_nsf->id, NSF_MAGIC, 5)) {
@@ -472,7 +476,8 @@ nsf_load (char *filename, void *source, int length)
/* seek to end of header, read in data */
if (NULL == source) {
fseek (fp, NSF_HEADER_SIZE, SEEK_SET);
- fread (temp_nsf->data, temp_nsf->length, 1, fp);
+ if (fread (temp_nsf->data, temp_nsf->length, 1, fp) < 0)
+ log_printf ("error reading end of header\n");
fclose (fp);
@@ -580,6 +585,10 @@ nsf_setfilter (nsf_t * nsf, int filter_type)
/*
** $Log$
+** Revision 1.2 2006/07/18 09:36:46 wtay
+** * gst/nsf/nsf.c: (nsf_load):
+** Fix compilation by not ignoring return values of fread.
+**
** Revision 1.1 2006/07/13 15:07:28 wtay
** Based on patches by: Johan Dahlin <johan at gnome dot org>
** Ronald Bultje <rbultje at ronald dot bitfreak dot net>