diff options
| author | Xiao-Yong Jin <xjin@anl.gov> | 2018-03-20 22:17:57 -0500 |
|---|---|---|
| committer | David du Colombier <0intro@gmail.com> | 2018-03-27 15:03:12 +0200 |
| commit | dc2a17b95cace1f220292cb6df97ee423d6be229 (patch) | |
| tree | f8c2ce6276bc08df78887a37b74f79ecd88c6ba3 /src/libdraw/openfont.c | |
| parent | a3ec102dc7fee3d4ecb32ade5ec9d7de4b9b4304 (diff) | |
| download | plan9port-dc2a17b95cace1f220292cb6df97ee423d6be229.tar.gz plan9port-dc2a17b95cace1f220292cb6df97ee423d6be229.tar.bz2 plan9port-dc2a17b95cace1f220292cb6df97ee423d6be229.zip | |
libdraw: fix some memory leaks in font handling
Diffstat (limited to 'src/libdraw/openfont.c')
| -rw-r--r-- | src/libdraw/openfont.c | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/src/libdraw/openfont.c b/src/libdraw/openfont.c index b97ea22d..2b729d73 100644 --- a/src/libdraw/openfont.c +++ b/src/libdraw/openfont.c @@ -31,7 +31,7 @@ openfont1(Display *d, char *name) { Font *fnt; int fd, i, n, scale; - char *buf, *nambuf, *fname, *freename; + char *buf, *nambuf, *nambuf0, *fname, *freename; nambuf = 0; freename = nil; @@ -42,19 +42,21 @@ openfont1(Display *d, char *name) nambuf = smprint("#9/font/%s", fname+14); if(nambuf == nil) return 0; - nambuf = unsharp(nambuf); + *nambuf0 = unsharp(nambuf); + if(nambuf0 != nambuf) + free(nambuf); + nambuf = nambuf0; if(nambuf == nil) return 0; if((fd = open(nambuf, OREAD)) < 0){ free(nambuf); return 0; } - fname = nambuf; if(scale > 1) { - name = smprint("%d*%s", scale, fname); + name = smprint("%d*%s", scale, nambuf); freename = name; } else { - name = fname; + name = nambuf; } } if(fd >= 0) @@ -63,13 +65,17 @@ openfont1(Display *d, char *name) fd = _fontpipe(fname+10); n = 128*1024; } - if(fd < 0) + if(fd < 0){ + free(nambuf); + free(freename); return 0; + } buf = malloc(n+1); if(buf == 0){ close(fd); free(nambuf); + free(freename); return 0; } i = readn(fd, buf, n); @@ -77,6 +83,7 @@ openfont1(Display *d, char *name) if(i <= 0){ free(buf); free(nambuf); + free(freename); return 0; } buf[i] = 0; @@ -224,6 +231,7 @@ openfont(Display *d, char *name) if(!f) return nil; f->lodpi = f; + free(f->namespec); f->namespec = namespec; /* add to display list for when dpi changes */ |