From: Vladimir Serbinenko <phcoder@gmail.com>
Date: Sun, 25 Jan 2015 12:19:58 +0000 (+0100)
Subject: grub_iso9660_read: Explicitly check read_node return value.
X-Git-Tag: 2.02-beta3~510
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ac602ce7005090a34e021f736a9ad3ac033a4cc8;p=thirdparty%2Fgrub.git

grub_iso9660_read: Explicitly check read_node return value.

Not really needed as grub_errno is already checked but is nicer.

Found by: Coverity scan.
---

diff --git a/grub-core/fs/iso9660.c b/grub-core/fs/iso9660.c
index 6a6677337..67a67cf40 100644
--- a/grub-core/fs/iso9660.c
+++ b/grub-core/fs/iso9660.c
@@ -959,14 +959,15 @@ grub_iso9660_read (grub_file_t file, char *buf, grub_size_t len)
 {
   struct grub_iso9660_data *data =
     (struct grub_iso9660_data *) file->data;
+  grub_err_t err;
 
   /* XXX: The file is stored in as a single extent.  */
   data->disk->read_hook = file->read_hook;
   data->disk->read_hook_data = file->read_hook_data;
-  read_node (data->node, file->offset, len, buf);
+  err = read_node (data->node, file->offset, len, buf);
   data->disk->read_hook = NULL;
 
-  if (grub_errno)
+  if (err || grub_errno)
     return -1;
 
   return len;