vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

grub_iso9660_read: Explicitly check read_node return value.

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

Found by: Coverity scan.
This commit is contained in:
Vladimir Serbinenko 2015-01-25 13:19:58 +01:00
parent fb66b512fa
commit ac602ce700
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
grub-core/fs/iso9660.c
View file

@ -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 *data =
(struct grub_iso9660_data *) file->data; (struct grub_iso9660_data *) file->data;
grub_err_t err;
/* XXX: The file is stored in as a single extent. */ /* XXX: The file is stored in as a single extent. */
data->disk->read_hook = file->read_hook; data->disk->read_hook = file->read_hook;
data->disk->read_hook_data = file->read_hook_data; 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; data->disk->read_hook = NULL;
if (grub_errno) if (err || grub_errno)
return -1; return -1;
return len; return len;