diff options
| author | Kevin E Martin <kem@kem.org> | 2004-08-11 23:37:34 +0000 |
|---|---|---|
| committer | Kevin E Martin <kem@kem.org> | 2004-08-11 23:37:34 +0000 |
| commit | 14c188e8b0a0d88f97bcde21c8e1b1da8541bdf8 (patch) | |
| tree | ea24837bbe0c95a75db3b1263b98bc1cbb3077d0 | |
| parent | 591dcad65f73450a07ac7477a3a827d95eb6f726 (diff) | |
| download | xorg-lib-libXft-14c188e8b0a0d88f97bcde21c8e1b1da8541bdf8.tar.gz | |
Called strlen with (f->file) without checking for NULL (which happens whenXORG-6_7_99_2
directly using FT_Face objects) (Bug #1047, Keith Packard).
| -rw-r--r-- | src/xftfreetype.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/xftfreetype.c b/src/xftfreetype.c index 1a52c21..676b7e6 100644 --- a/src/xftfreetype.c +++ b/src/xftfreetype.c @@ -289,7 +289,8 @@ _XftReleaseFile (XftFtFile *f) if (f->face) FT_Done_Face (f->face); } - XftMemFree (XFT_MEM_FILE, sizeof (XftFtFile) + strlen (f->file) + 1); + XftMemFree (XFT_MEM_FILE, + sizeof (XftFtFile) + f->file ? strlen (f->file) + 1 : 0); free (f); } |