master 135ce96f1ef: Merge from savannah/emacs-30

[Po Lu]

branch: master
commit 135ce96f1efd051c7bdd1a95670465a09502fa55
Merge: e673492f74c 3a76354e092
Author: Po Lu <luangruo@yahoo.com>
Commit: Po Lu <luangruo@yahoo.com>

    Merge from savannah/emacs-30
    
    3a76354e092 Adapt last change to non-NS systems
---
 src/image.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/image.c b/src/image.c
index 70ec1b316ee..9d97337fd31 100644
--- a/src/image.c
+++ b/src/image.c
@@ -6505,7 +6505,8 @@ xpm_load_image (struct frame *f,
   if (ximg)
     {
       image_destroy_x_image (ximg);
-      image_destroy_x_image (mask_img);
+      if (mask_img)
+       image_destroy_x_image (mask_img);
       image_clear_image (f, img);
     }
   return 0;