diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2015-02-06 15:50:45 -0800 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2015-03-17 08:00:15 -0700 |
| commit | 2deda9906480f9c8ae07b8c2a5510cc7e4c59a8e (patch) | |
| tree | b02b9c45542421dd9fa8a2b590a314757c124163 | |
| parent | d9fda3d247942292a5f24694c22337c547006e11 (diff) | |
bdfReadProperties: property count needs range check [CVE-2015-1802]
Avoid integer overflow or underflow when allocating memory arrays
by multiplying the number of properties reported for a BDF font.
Reported-by: Ilja Van Sprundel <ivansprundel@ioactive.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
| -rw-r--r-- | src/bitmap/bdfread.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/bitmap/bdfread.c b/src/bitmap/bdfread.c index 914a024..6387908 100644 --- a/src/bitmap/bdfread.c +++ b/src/bitmap/bdfread.c @@ -604,7 +604,9 @@ bdfReadProperties(FontFilePtr file, FontPtr pFont, bdfFileState *pState) bdfError("missing 'STARTPROPERTIES'\n"); return (FALSE); } - if (sscanf((char *) line, "STARTPROPERTIES %d", &nProps) != 1) { + if ((sscanf((char *) line, "STARTPROPERTIES %d", &nProps) != 1) || + (nProps <= 0) || + (nProps > ((INT32_MAX / sizeof(FontPropRec)) - BDF_GENPROPS))) { bdfError("bad 'STARTPROPERTIES'\n"); return (FALSE); } |