narenas
/
opengnsys_ipxe
mirror of https://github.com/ipxe/ipxe.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[comboot] Do not assume that image has a non-NULL command line 

Signed-off-by: Michael Brown <mcb30@ipxe.org>
pull/1/head
Michael Brown 2011-03-07 02:38:26 +00:00
parent 34b6ecb2f1
commit d1ad046a87
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/arch/i386/image/com32.c
View File

@ -119,7 +119,8 @@ static int com32_exec_loop ( struct image *image ) {
/* %2 */ "r" ( get_fbms() * 1024 - (COM32_BOUNCE_SEG << 4) ), /* %2 */ "r" ( get_fbms() * 1024 - (COM32_BOUNCE_SEG << 4) ),
/* %3 */ "i" ( COM32_BOUNCE_SEG << 4 ), /* %3 */ "i" ( COM32_BOUNCE_SEG << 4 ),
/* %4 */ "r" ( virt_to_phys ( com32_intcall_wrapper ) ), /* %4 */ "r" ( virt_to_phys ( com32_intcall_wrapper ) ),
/* %5 */ "r" ( virt_to_phys ( image->cmdline ) ), /* %5 */ "r" ( virt_to_phys ( image->cmdline ?
image->cmdline : "" ) ),
/* %6 */ "r" ( COM32_START_PHYS ) /* %6 */ "r" ( COM32_START_PHYS )
: :
"memory" ); "memory" );
@ -291,8 +292,7 @@ static int com32_prepare_bounce_buffer ( struct image * image ) {
static int com32_probe ( struct image *image ) { static int com32_probe ( struct image *image ) {
int rc; int rc;
DBGC ( image, "COM32 %p: name '%s', cmdline '%s'\n", DBGC ( image, "COM32 %p: name '%s'\n", image, image->name );
image, image->name, image->cmdline );
/* Check if this is a COMBOOT image */ /* Check if this is a COMBOOT image */
if ( ( rc = com32_identify ( image ) ) != 0 ) { if ( ( rc = com32_identify ( image ) ) != 0 ) {