david/ipxe
david
/
ipxe
Archived
1
0
Fork 0
Code

[efi] Avoid accidentally calling main() twice 

EFIRC() uses PLATFORM_TO_ERRNO(), which evaluates its argument twice
(and can't trivially use a braced-group expression or an inline
function to avoid this, since it gets used outside of function
context).

The expression "EFIRC(main())" will therefore end up calling main()
twice, which is not the intended behaviour.  Every other instance of
EFIRC() is of the simple form "EFIRC(rc)", so fix by converting this
instance to match.

Signed-off-by: Michael Brown <mcb30@ipxe.org>
This commit is contained in:
Michael Brown 2014-03-14 15:15:14 +00:00
parent 87465258ab
commit e662912c53
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/arch/x86/prefix/efiprefix.c
View File

@ -33,11 +33,15 @@ FILE_LICENCE ( GPL2_OR_LATER );
EFI_STATUS EFIAPI _efi_start ( EFI_HANDLE image_handle,
EFI_SYSTEM_TABLE *systab ) {
EFI_STATUS efirc;
int rc;
/* Initialise EFI environment */
if ( ( efirc = efi_init ( image_handle, systab ) ) != 0 )
return efirc;
/* Call to main() */
return EFIRC ( main () );
if ( ( rc = main() ) != 0 )
return EFIRC ( rc );
return 0;
}