From: Moonhee Choi <mh0310.choi@samsung.com>
Date: Mon, 3 Jul 2017 09:17:32 +0000 (+0900)
Subject: [RQ170526-01074] gl:Fix bug in _cairo_gl_pattern_texture_setup()
X-Git-Tag: submit/tizen/20170705.043917^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F87%2F136887%2F1;p=platform%2Fcore%2Fgraphics%2Fcairo.git

[RQ170526-01074] gl:Fix bug in _cairo_gl_pattern_texture_setup()
  - The "image" allocated at line 786 is not freed before moving to label fail at line 803.
  - It was fixed in community: https://bugs.freedesktop.org/show_bug.cgi?id=91537

Change-Id: I91833b0f7be723f050e7c1d38ae64e5f07d831fe
---

diff --git a/src/cairo-gl-operand.c b/src/cairo-gl-operand.c
index de3cee725..0d5c053a1 100644
--- a/src/cairo-gl-operand.c
+++ b/src/cairo-gl-operand.c
@@ -790,12 +790,18 @@ _cairo_gl_pattern_texture_setup (cairo_gl_operand_t *operand,
     if (src_is_gl_surface) {
 	status = _cairo_gl_context_release (ctx, status);
 	if (unlikely (status))
+	{
+	    _cairo_surface_unmap_image (&surface->base, image);
 	    goto fail;
+	}
 
 	/* we need to release one more time */
 	status = _cairo_gl_context_release (ctx, status);
 	if (unlikely (status))
+	{
+	    _cairo_surface_unmap_image (&surface->base, image);
 	    goto fail;
+	}
     }
 
     status = _cairo_surface_offset_paint (&image->base, extents->x, extents->y,
@@ -833,7 +839,7 @@ _cairo_gl_pattern_texture_setup (cairo_gl_operand_t *operand,
 
 fail:
     cairo_surface_destroy (&surface->base);
-    cairo_surface_destroy (&image->base);
+
     return status;
 }