Module Name: xsrc
Committed By: christos
Date: Sat Sep 5 14:17:36 UTC 2015
Modified Files:
xsrc/external/mit/ctwm/dist: events.c
Log Message:
CID 1322890: Add missing NULL checks
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 xsrc/external/mit/ctwm/dist/events.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/ctwm/dist/events.c
diff -u xsrc/external/mit/ctwm/dist/events.c:1.1 xsrc/external/mit/ctwm/dist/events.c:1.2
--- xsrc/external/mit/ctwm/dist/events.c:1.1 Thu Sep 3 18:16:33 2015
+++ xsrc/external/mit/ctwm/dist/events.c Sat Sep 5 10:17:36 2015
@@ -3085,14 +3085,16 @@ void HandleButtonPress(void)
((Event.xany.window == Tmp_win->iconmanagerlist->icon) ||
(Event.xany.window == Tmp_win->iconmanagerlist->w))) {
Tmp_win = Tmp_win->iconmanagerlist->iconmgr->twm_win;
- XTranslateCoordinates(dpy, Event.xany.window, Tmp_win->w,
- Event.xbutton.x, Event.xbutton.y,
- &JunkX, &JunkY, &JunkChild);
-
- Event.xbutton.x = JunkX - Tmp_win->frame_bw3D;
- Event.xbutton.y = JunkY - Tmp_win->title_height - Tmp_win->frame_bw3D;
- Event.xany.window = Tmp_win->w;
- Context = C_WINDOW;
+ if (Tmp_win) {
+ XTranslateCoordinates(dpy, Event.xany.window, Tmp_win->w,
+ Event.xbutton.x, Event.xbutton.y,
+ &JunkX, &JunkY, &JunkChild);
+
+ Event.xbutton.x = JunkX - Tmp_win->frame_bw3D;
+ Event.xbutton.y = JunkY - Tmp_win->title_height - Tmp_win->frame_bw3D;
+ Event.xany.window = Tmp_win->w;
+ Context = C_WINDOW;
+ }
}
else if (Event.xany.window == Tmp_win->title_w) {
if (Scr->ClickToFocus &&
@@ -3199,7 +3201,7 @@ void HandleButtonPress(void)
if (Event.xany.window != 0 &&
(Tmp_win = GetTwmWindow(Event.xany.window))) {
- if (Tmp_win->iswinbox) {
+ if (Tmp_win && Tmp_win->iswinbox) {
XTranslateCoordinates (dpy, Scr->Root, Event.xany.window,
JunkX, JunkY, &JunkX, &JunkY, &win);
XTranslateCoordinates (dpy, Event.xany.window, win,
