[gimp/gimp-2-10] app: make sure builtin profiles *really* don't get attached to images

[Michael Natterer <mitch src gnome org>]

commit 29ef3742280eb197765b6c481aeb571b305c21cc
Author: Michael Natterer <mitch gimp org>
Date:   Thu May 30 16:07:57 2019 +0200

    app: make sure builtin profiles *really* don't get attached to images
    
    gimp_image_parasite_attach(): when we detected that a builtin profile
    is about to be attached, actually bail out after removing the old
    profile, instead of continuing to attaching the builtin profile
    anyway. Gah...
    
    (cherry picked from commit 07ffef38c360597a45de36db0fba137e39cee05a)

 app/core/gimpimage.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
---
diff --git a/app/core/gimpimage.c b/app/core/gimpimage.c
index 4d45e6a4c5..8fea956c55 100644
--- a/app/core/gimpimage.c
+++ b/app/core/gimpimage.c
@@ -3620,7 +3620,12 @@ gimp_image_parasite_attach (GimpImage          *image,
       builtin = gimp_image_get_builtin_color_profile (image);
 
       if (gimp_color_profile_is_equal (profile, builtin))
-        gimp_image_parasite_detach (image, GIMP_ICC_PROFILE_PARASITE_NAME);
+        {
+          /* setting the builtin profile is equal to removing the profile */
+          gimp_image_parasite_detach (image, GIMP_ICC_PROFILE_PARASITE_NAME);
+          g_object_unref (profile);
+          return;
+        }
 
       g_object_unref (profile);
     }