mirror of
https://git.savannah.gnu.org/git/grub.git
synced 2026-10-21 06:49:35 +00:00
* grub-core/disk/ieee1275/ofdisk.c (scan): Check function return value.
* grub-core/lib/ieee1275/datetime.c (grub_get_datetime): Likewise. (grub_set_datetime): Likewise.
This commit is contained in:
1 parent
9cc836a27b
commit
64498f2538
3 files changed
+9
-3
No files matched your search
@@ -178,7 +178,7 @@ scan (void)
|
||||
args.table = 0;
|
||||
args.nentries = 0;
|
||||
|
||||
if (IEEE1275_CALL_ENTRY_FN (&args) == -1)
|
||||
if (IEEE1275_CALL_ENTRY_FN (&args) == -1 || args.catch_result)
|
||||
{
|
||||
grub_ieee1275_close (ihandle);
|
||||
return 0;
|
||||
|
||||
@@ -89,7 +89,7 @@ grub_get_datetime (struct grub_datetime *datetime)
|
||||
|
||||
grub_ieee1275_close (ihandle);
|
||||
|
||||
if (status == -1)
|
||||
if (status == -1 || args.catch_result)
|
||||
return grub_error (GRUB_ERR_IO, "get-time failed");
|
||||
|
||||
datetime->year = args.year;
|
||||
@@ -148,7 +148,7 @@ grub_set_datetime (struct grub_datetime *datetime)
|
||||
|
||||
grub_ieee1275_close (ihandle);
|
||||
|
||||
if (status == -1)
|
||||
if (status == -1 || args.catch_result)
|
||||
return grub_error (GRUB_ERR_IO, "set-time failed");
|
||||
|
||||
return GRUB_ERR_NONE;
|
||||
|
||||
Reference in new issue
Block a user