Macintosh-Tools/mlvwm
1
0
Fork 0
mirror of https://github.com/morgant/mlvwm.git synced 2025-02-21 01:29:12 +00:00
Code Issues Projects Releases Wiki Activity

Fixed dereference of null pointer in misc.c's RaiseMlvwmWindow(), as identified by clang scan-build. Issue #48

Browse Source
This commit is contained in:
Morgan Aldridge 2024-09-02 11:48:09 -04:00
parent f3a80b30a7
commit e04bf6a127
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mlvwm/misc.c
View File

@ -144,7 +144,7 @@ Icon *ReadIcon( char *fn, Icon *icon, Bool err )
XWindowAttributes root_attr;
XpmAttributes attr;
int x, y, xhot, yhot;
Pixmap bitmap = (Pixmap)NULL;
Pixmap bitmap = 0;
Icon *newicon;
char *path;
@ -262,10 +262,11 @@ void RaiseMlvwmWindow( MlvwmWindow *win )
if( tmp!=win && tmp->flags&ONTOP )
wins[set++] = tmp->frame;
}
for( tmp = lastwin; tmp!=&Scr.MlvwmRoot; tmp=tmp->prev )
if( tmp->flags&TRANSIENT && tmp->transientfor==win->w && tmp!=win
&& !(tmp->flags&ONTOP))
for ( tmp = lastwin; (tmp != NULL) && (tmp != &Scr.MlvwmRoot); tmp = tmp->prev ) {
if( tmp->flags&TRANSIENT && (tmp->transientfor == win->w) && (tmp != win)
&& !(tmp->flags&ONTOP) )
wins[set++] = tmp->frame;
}
if( count!=set )
wins[set++] = win->frame;