[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[freetype2] master eb22ef2: Another left-shift bug (#45681).
From: |
Werner LEMBERG |
Subject: |
[freetype2] master eb22ef2: Another left-shift bug (#45681). |
Date: |
Tue, 04 Aug 2015 04:50:18 +0000 |
branch: master
commit eb22ef26d94a8bebb2cfd68306c6ba4ee679517e
Author: Werner Lemberg <address@hidden>
Commit: Werner Lemberg <address@hidden>
Another left-shift bug (#45681).
* src/base/ftobjs.c (IsMacBinary): Only accept positive values for
`dlen'.
---
ChangeLog | 7 +++++++
src/base/ftobjs.c | 15 ++++++++-------
2 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index b78fcbe..c8ddab7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2015-08-04 Werner Lemberg <address@hidden>
+
+ Another left-shift bug (#45681).
+
+ * src/base/ftobjs.c (IsMacBinary): Only accept positive values for
+ `dlen'.
+
2015-08-03 Alexei Podtelezhnikov <address@hidden>
[base] Fix `ft_corner_orientation'.
diff --git a/src/base/ftobjs.c b/src/base/ftobjs.c
index 9c3332c..4fa0593 100644
--- a/src/base/ftobjs.c
+++ b/src/base/ftobjs.c
@@ -1889,13 +1889,14 @@
if ( error )
goto Exit;
- if ( header[ 0] != 0 ||
- header[74] != 0 ||
- header[82] != 0 ||
- header[ 1] == 0 ||
- header[ 1] > 33 ||
- header[63] != 0 ||
- header[2 + header[1]] != 0 )
+ if ( header[ 0] != 0 ||
+ header[74] != 0 ||
+ header[82] != 0 ||
+ header[ 1] == 0 ||
+ header[ 1] > 33 ||
+ header[63] != 0 ||
+ header[2 + header[1]] != 0 ||
+ header[0x53] > 0x7F )
return FT_THROW( Unknown_File_Format );
dlen = ( header[0x53] << 24 ) |
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [freetype2] master eb22ef2: Another left-shift bug (#45681).,
Werner LEMBERG <=