plan9port

commit a3ec102dc7fee3d4ecb32ade5ec9d7de4b9b4304
parent b2f67698309b0c573cd52e357be126171be0a93a
Author: Xiao-Yong Jin <xjin@anl.gov>
Date:   Tue, 20 Mar 2018 22:17:05 -0500

fontsrv: fix some memory leaks

Diffstat:
M
src/cmd/fontsrv/osx.c
 | 
4
+++-
M
src/cmd/fontsrv/x11.c
 | 
1
+

2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/cmd/fontsrv/osx.c b/src/cmd/fontsrv/osx.c
@@ -245,8 +245,10 @@ mksubfont(XFont *f, char *name, int lo, int hi, int size, int antialias)
 	if(m == nil)
 		return nil;
 	mc = allocmemimage(Rect(0, 0, x+1, y+1), GREY8);
-	if(mc == nil)
+	if(mc == nil){
+		freememimage(m);
 		return nil;
+	}
 	memfillcolor(m, DBlack);
 	memfillcolor(mc, DBlack);
 	fc = malloc((hi+2 - lo) * sizeof fc[0]);
diff --git a/src/cmd/fontsrv/x11.c b/src/cmd/fontsrv/x11.c
@@ -236,6 +236,7 @@ mksubfont(XFont *xf, char *name, int lo, int hi, int size, int antialias)
 	m1 = allocmemimage(Rect(0, 0, x, y), antialias ? GREY8 : GREY1);
 	memimagedraw(m1, m1->r, m, m->r.min, memopaque, ZP, S);
 	freememimage(m);
+	freememimage(mc);
 
 	sf->name = nil;
 	sf->n = hi+1 - lo;