aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii2013-07-13 17:21:01 +0300
committerEli Zaretskii2013-07-13 17:21:01 +0300
commit922ae7eeed74d847778907602eb52e97cfb9f212 (patch)
tree28f28206263e691bebffff64c2ef3f6813c4108a /src
parent1b796d6b24b3a7f56a2dffd8d2bbe9c0559a1b80 (diff)
downloademacs-922ae7eeed74d847778907602eb52e97cfb9f212.tar.gz
emacs-922ae7eeed74d847778907602eb52e97cfb9f212.zip
Prevent leak in GDI objects (bug #14850).
src/w32term.c (x_draw_hollow_cursor): Delete the brush object when returning early.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog3
-rw-r--r--src/w32term.c5
2 files changed, 7 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 4bd72f831cd..101672baa1e 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
12013-07-13 Eli Zaretskii <eliz@gnu.org> 12013-07-13 Eli Zaretskii <eliz@gnu.org>
2 2
3 * w32term.c (x_draw_hollow_cursor): Delete the brush object when
4 returning early. (Bug#14850)
5
3 * coding.c (syms_of_coding): Set up inhibit-null-byte-detection 6 * coding.c (syms_of_coding): Set up inhibit-null-byte-detection
4 and inhibit-iso-escape-detection attributes of 'undecided'. 7 and inhibit-iso-escape-detection attributes of 'undecided'.
5 (Bug#14822) 8 (Bug#14822)
diff --git a/src/w32term.c b/src/w32term.c
index c9951ca1d52..732a4f4bfef 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -5174,7 +5174,10 @@ x_draw_hollow_cursor (struct window *w, struct glyph_row *row)
5174 the current matrix is invalid or such, give up. */ 5174 the current matrix is invalid or such, give up. */
5175 cursor_glyph = get_phys_cursor_glyph (w); 5175 cursor_glyph = get_phys_cursor_glyph (w);
5176 if (cursor_glyph == NULL) 5176 if (cursor_glyph == NULL)
5177 return; 5177 {
5178 DeleteObject (hb);
5179 return;
5180 }
5178 5181
5179 /* Compute frame-relative coordinates for phys cursor. */ 5182 /* Compute frame-relative coordinates for phys cursor. */
5180 get_phys_cursor_geometry (w, row, cursor_glyph, &left, &top, &h); 5183 get_phys_cursor_geometry (w, row, cursor_glyph, &left, &top, &h);