Commit Diff

Commit:
cfb8627a80a334f200f68c2c8f3e384313ebbaf5
From:
Raymond Cole <rc@wolog.xyz>
Via:
Hiltjo Posthuma <hiltjo@codemadness.org>
Date:
Message:
Avoid unsigned integer underflow in drw_text()
Actions:
Patch | Tree
commit - fcb2476b693ca4c40ad32c7119e27bbeb856865c
commit + cfb8627a80a334f200f68c2c8f3e384313ebbaf5
blob - 344de618bae0094f955f679a23b9d1d460c6ab39
blob + c41e6aff094243c2c58bccf69283192f3db16939
--- drw.c
+++ drw.c
@@ -248,6 +248,8 @@ drw_text(Drw *drw, int x, int y, unsigned int w, unsig
 	} else {
 		XSetForeground(drw->dpy, drw->gc, drw->scheme[invert ? ColFg : ColBg].pixel);
 		XFillRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w, h);
+		if (w < lpad)
+			return x + w;
 		d = XftDrawCreate(drw->dpy, drw->drawable,
 		                  DefaultVisual(drw->dpy, drw->screen),
 		                  DefaultColormap(drw->dpy, drw->screen));