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

[image] Clear LOADED flag on all other images when loading a new image 

Loading an image may overwrite part or all of any previously-loaded
images, so we should clear the LOADED flag for all images prior to
attempting to load a new image.
pull/1/head
Michael Brown 2008-07-08 03:03:48 +01:00
parent 4847d97372
commit 14c080020f
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/core/image.c
View File

@ -156,7 +156,7 @@ void unregister_image ( struct image *image ) {
struct image * find_image ( const char *name ) { struct image * find_image ( const char *name ) {
struct image *image; struct image *image;
list_for_each_entry ( image, &images, list ) { for_each_image ( image ) {
if ( strcmp ( image->name, name ) == 0 ) if ( strcmp ( image->name, name ) == 0 )
return image; return image;
} }
@ -172,12 +172,21 @@ struct image * find_image ( const char *name ) {
* @ret rc Return status code * @ret rc Return status code
*/ */
static int image_load_type ( struct image *image, struct image_type *type ) { static int image_load_type ( struct image *image, struct image_type *type ) {
struct image *tmp_image;
int rc; int rc;
/* Check image is actually loadable */ /* Check image is actually loadable */
if ( ! type->load ) if ( ! type->load )
return -ENOEXEC; return -ENOEXEC;
/* Clear the loaded flag on all images; loading this image
* will invalidate any previous loads. (Even if loading
* fails, the previously loaded image may still have been
* partially overwritten.)
*/
for_each_image ( tmp_image )
tmp_image->flags &= ~IMAGE_LOADED;
/* Try the image loader */ /* Try the image loader */
if ( ( rc = type->load ( image ) ) != 0 ) { if ( ( rc = type->load ( image ) ) != 0 ) {
DBGC ( image, "IMAGE %p could not load as %s: %s\n", DBGC ( image, "IMAGE %p could not load as %s: %s\n",