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

* grub-core/disk/ieee1275/ofdisk.c (scan): Check function return value.

Browse source 
* grub-core/lib/ieee1275/datetime.c (grub_get_datetime): Likewise.
	(grub_set_datetime): Likewise.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2012-09-05 08:56:08 +02:00
parent 9cc836a27b
commit 64498f2538
3 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2012-09-05 Vladimir Serbinenko <phcoder@gmail.com>
* 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.
2012-09-05 Vladimir Serbinenko <phcoder@gmail.com> 2012-09-05 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/script/yylex.l: Ignore unused-function and sign-compare * grub-core/script/yylex.l: Ignore unused-function and sign-compare

2
grub-core/disk/ieee1275/ofdisk.c
View file

@ -178,7 +178,7 @@ scan (void)
args.table = 0; args.table = 0;
args.nentries = 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); grub_ieee1275_close (ihandle);
return 0; return 0;

4
grub-core/lib/ieee1275/datetime.c
View file

@ -89,7 +89,7 @@ grub_get_datetime (struct grub_datetime *datetime)
grub_ieee1275_close (ihandle); grub_ieee1275_close (ihandle);
if (status == -1) if (status == -1 || args.catch_result)
return grub_error (GRUB_ERR_IO, "get-time failed"); return grub_error (GRUB_ERR_IO, "get-time failed");
datetime->year = args.year; datetime->year = args.year;
@ -148,7 +148,7 @@ grub_set_datetime (struct grub_datetime *datetime)
grub_ieee1275_close (ihandle); grub_ieee1275_close (ihandle);
if (status == -1) if (status == -1 || args.catch_result)
return grub_error (GRUB_ERR_IO, "set-time failed"); return grub_error (GRUB_ERR_IO, "set-time failed");
return GRUB_ERR_NONE; return GRUB_ERR_NONE;