shithub: riscv

Info  •  Files  •  Log  •  Branches

libdraw: fix font f->cacheimage nil dereference

the initial fontresize() might fail but its error code is ignored
potentially leaving f->cacheimage == nil. make sure we call
fontresize() in loadchar() when theres no cacheimage and check the
return value to avoid nil pointer dereference.

--- a/sys/src/libdraw/font.c

+++ b/sys/src/libdraw/font.c

@@ -274,7 +274,8 @@

 	if(fi->width == 0)

 		goto TryPJW;

 	wid = (fi+1)->x - fi->x;

-	if(f->width < wid || f->width == 0 || f->maxdepth < subf->f->bits->depth){

+	if(f->width < wid || f->width == 0 || f->maxdepth < subf->f->bits->depth

+	|| (f->display != nil && f->cacheimage == nil)){

 		/*

 		 * Flush, free, reload (easier than reformatting f->b)

 		 */

-- 

⑨