Corrected a stack corruption error (that I have never seen in
practice but which was detected by AddressSanitizer. Also corrected a crash condition in the absence of a window; also hard to reproduce.
This commit is contained in:
parent
f12a155ea7
commit
65b54e0cd5
|
|
@ -698,10 +698,9 @@ calmaElementText()
|
|||
static int ignore[] = { CALMA_PATHTYPE, CALMA_WIDTH, -1 };
|
||||
char *textbody = NULL;
|
||||
int nbytes, rtype;
|
||||
int layer, textt, cifnum;
|
||||
int layer, textt, cifnum, textpres;
|
||||
TileType type;
|
||||
Rect r;
|
||||
unsigned short textpres;
|
||||
double dval;
|
||||
int size, angle, font, pos;
|
||||
|
||||
|
|
|
|||
|
|
@ -83,6 +83,7 @@ grtkGetCursorPos (mw, p)
|
|||
Window win1, win2;
|
||||
|
||||
if (mw == NULL) mw = grCurrent.mw;
|
||||
if (mw == NULL) return FALSE;
|
||||
|
||||
XQueryPointer(grXdpy, Tk_WindowId((Tk_Window)mw->w_grdata),
|
||||
&win1, &win2, &x1, &y1,
|
||||
|
|
|
|||
Loading…
Reference in New Issue