diff options
Diffstat (limited to 'src/core/image.c')
| -rw-r--r-- | src/core/image.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/src/core/image.c b/src/core/image.c index 666ee3de8..1bf5447f0 100644 --- a/src/core/image.c +++ b/src/core/image.c @@ -327,6 +327,14 @@ int image_exec ( struct image *image ) { if ( image->flags & IMAGE_AUTO_UNREGISTER ) unregister_image ( image ); + /* Debug message for tail-recursion. Placed here because the + * image_put() may end up freeing the image. + */ + if ( replacement ) { + DBGC ( image, "IMAGE %s replacing self with IMAGE %s\n", + image->name, replacement->name ); + } + /* Drop temporary reference to the original image */ image_put ( image ); @@ -338,12 +346,8 @@ int image_exec ( struct image *image ) { uri_put ( old_cwuri ); /* Tail-recurse into replacement image, if one exists */ - if ( replacement ) { - DBGC ( image, "IMAGE <freed> replacing self with IMAGE %s\n", - replacement->name ); - if ( ( rc = image_exec ( replacement ) ) != 0 ) - return rc; - } + if ( replacement ) + return image_exec ( replacement ); return rc; } |