From: Juanma Barranquero <lekktu@gmail.com>
Date: Thu, 24 Mar 2011 02:30:26 +0000 (+0100)
Subject: src/w32term.c (x_set_glyph_string_clipping): Don't pass uninitialized region to Combi... 
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~499
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1149507c7fe8c24d93448eea2d0114746c580782;p=emacs.git

src/w32term.c (x_set_glyph_string_clipping): Don't pass uninitialized region to CombineRgn.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index b306ff78ff9..ae40e4638fa 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2011-03-24  Juanma Barranquero  <lekktu@gmail.com>
+
+	* w32term.c (x_set_glyph_string_clipping):
+	Don't pass uninitialized region to CombineRgn.
+
 2011-03-23  Juanma Barranquero  <lekktu@gmail.com>
 
 	* w32fns.c (x_set_menu_bar_lines): Remove unused variable `olines'.
diff --git a/src/w32term.c b/src/w32term.c
index 56454faddb9..2252c930711 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -1068,16 +1068,12 @@ x_set_glyph_string_clipping (struct glyph_string *s)
     w32_set_clip_rectangle (s->hdc, r);
   else if (n > 1)
     {
-      HRGN full_clip, clip1, clip2;
-      clip1 = CreateRectRgnIndirect (r);
-      clip2 = CreateRectRgnIndirect (r + 1);
-      if (CombineRgn (full_clip, clip1, clip2, RGN_OR) != ERROR)
-        {
-          SelectClipRgn (s->hdc, full_clip);
-        }
+      HRGN clip1 = CreateRectRgnIndirect (r);
+      HRGN clip2 = CreateRectRgnIndirect (r + 1);
+      if (CombineRgn (clip1, clip1, clip2, RGN_OR) != ERROR)
+        SelectClipRgn (s->hdc, clip1);
       DeleteObject (clip1);
       DeleteObject (clip2);
-      DeleteObject (full_clip);
     }
     s->num_clips = n;
 }