Mercurial > emacs
comparison src/xselect.c @ 100155:69913c2322d0
(Fx_get_cut_buffer_internal): Fix memory leak.
author | Chong Yidong <cyd@stupidchicken.com> |
---|---|
date | Wed, 03 Dec 2008 04:34:06 +0000 |
parents | f188167016d0 |
children | a0a1363582ff |
comparison
equal
deleted
inserted
replaced
100154:234ea6739ae8 | 100155:69913c2322d0 |
---|---|
2390 CHECK_CUT_BUFFER (buffer); | 2390 CHECK_CUT_BUFFER (buffer); |
2391 buffer_atom = symbol_to_x_atom (dpyinfo, display, buffer); | 2391 buffer_atom = symbol_to_x_atom (dpyinfo, display, buffer); |
2392 | 2392 |
2393 x_get_window_property (display, window, buffer_atom, &data, &bytes, | 2393 x_get_window_property (display, window, buffer_atom, &data, &bytes, |
2394 &type, &format, &size, 0); | 2394 &type, &format, &size, 0); |
2395 if (!data || !format) | 2395 |
2396 if (!data) | |
2396 return Qnil; | 2397 return Qnil; |
2398 | |
2399 if (!format) | |
2400 { | |
2401 xfree (data); | |
2402 return Qnil; | |
2403 } | |
2397 | 2404 |
2398 if (format != 8 || type != XA_STRING) | 2405 if (format != 8 || type != XA_STRING) |
2399 signal_error ("Cut buffer doesn't contain 8-bit data", | 2406 signal_error ("Cut buffer doesn't contain 8-bit data", |
2400 list2 (x_atom_to_symbol (display, type), | 2407 list2 (x_atom_to_symbol (display, type), |
2401 make_number (format))); | 2408 make_number (format))); |