Mercurial > hg > xemacs-beta
comparison src/scrollbar-msw.c @ 3482:20773f9b7bc0
[xemacs-hg @ 2006-06-29 16:58:59 by james]
Check scrollbar instance data for NULLness before dereferencing.
<m31wt77vcf.fsf@jerrypc.cs.usu.edu>
author | james |
---|---|
date | Thu, 29 Jun 2006 16:59:00 +0000 |
parents | b7f26b2f78bd |
children | 16112448d484 |
comparison
equal
deleted
inserted
replaced
3481:71532ccbd8e3 | 3482:20773f9b7bc0 |
---|---|
88 } | 88 } |
89 | 89 |
90 static void | 90 static void |
91 mswindows_free_scrollbar_instance (struct scrollbar_instance *sb) | 91 mswindows_free_scrollbar_instance (struct scrollbar_instance *sb) |
92 { | 92 { |
93 void *opaque = | |
94 (void *) qxeGetWindowLong (SCROLLBAR_MSW_HANDLE (sb), GWL_USERDATA); | |
95 Lisp_Object ptr; | |
96 | |
97 ptr = VOID_TO_LISP (opaque); | |
98 assert (OPAQUE_PTRP (ptr)); | |
99 ptr = Fremhash (ptr, Vmswindows_scrollbar_instance_table); | |
100 assert (!NILP (ptr)); | |
101 DestroyWindow (SCROLLBAR_MSW_HANDLE (sb)); | |
102 if (sb->scrollbar_data) | 93 if (sb->scrollbar_data) |
103 xfree (sb->scrollbar_data, void *); | 94 { |
95 void *opaque = | |
96 (void *) qxeGetWindowLong (SCROLLBAR_MSW_HANDLE (sb), GWL_USERDATA); | |
97 Lisp_Object ptr; | |
98 | |
99 ptr = VOID_TO_LISP (opaque); | |
100 assert (OPAQUE_PTRP (ptr)); | |
101 ptr = Fremhash (ptr, Vmswindows_scrollbar_instance_table); | |
102 assert (!NILP (ptr)); | |
103 DestroyWindow (SCROLLBAR_MSW_HANDLE (sb)); | |
104 xfree (sb->scrollbar_data, void *); | |
105 } | |
104 } | 106 } |
105 | 107 |
106 static void | 108 static void |
107 unshow_that_mofo (void *handle) | 109 unshow_that_mofo (void *handle) |
108 { | 110 { |