gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2026-01-26 17:45:52 +01:00
Code Issues Projects Releases Wiki Activity

WINGs: fix check for NULL pointer in WMText selection (Coverity #50067)

Browse Source 
As pointed by Coverity, there is a small check for NULL pointer when
handling triple-click selection in a WMText, however this check is only
partially implemented so the code would crash later anyway.
This patch implement an appropriate skip to avoid crash, and includes a
log message to help debug if the case happens.

Signed-off-by: Christophe CURIS <christophe.curis@free.fr>
This commit is contained in:
Christophe CURIS
2014-05-18 21:31:41 +02:00
committed by Carlos R. Mafra
parent c86de122f9
commit 42febe3cec
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
WINGs/wtext.c
View File

@@ -2150,8 +2150,14 @@ static void autoSelectText(Text * tPtr, int clicks)
} else if (clicks == 3) { } else if (clicks == 3) {
TextBlock *cur = tb; TextBlock *cur = tb;
while (tb && !tb->first) { while (!tb->first) {
tb = tb->prior; tb = tb->prior;
if (tb == NULL) {
#ifndef NDEBUG
wwarning("corrupted list of text blocks in WMText, while searching for first block");
#endif
goto error_select_3clicks;
}
} }
tPtr->sel.y = tb->sections[0]._y; tPtr->sel.y = tb->sections[0]._y;
@@ -2161,6 +2167,7 @@ static void autoSelectText(Text * tPtr, int clicks)
} }
tPtr->sel.h = tb->sections[tb->nsections - 1]._y + 5 - tPtr->sel.y; tPtr->sel.h = tb->sections[tb->nsections - 1]._y + 5 - tPtr->sel.y;
error_select_3clicks:
tPtr->sel.x = 0; tPtr->sel.x = 0;
tPtr->sel.w = tPtr->docWidth; tPtr->sel.w = tPtr->docWidth;
tPtr->clicked.x = 0; /* only for now, fix sel. code */ tPtr->clicked.x = 0; /* only for now, fix sel. code */