diff options
author | Werner Lemberg <wl@gnu.org> | 2017-06-02 09:06:36 +0200 |
---|---|---|
committer | Werner Lemberg <wl@gnu.org> | 2017-06-02 09:06:36 +0200 |
commit | 47a03e9b2366bba091bc21d011ab60782538243a (patch) | |
tree | 81d7335938dbd702c0c8d78c6aee669ed4a0c3cf | |
parent | 3802ca8b643dbc966d12ef11ed8e2e5893cabef2 (diff) | |
download | freetype2-47a03e9b2366bba091bc21d011ab60782538243a.tar.gz |
[bdf] Fix integer scanning routines.
Reported as
https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2029
* src/bdf/bdflib.c (_bdf_atoul, _bdf_atol, _bdf_atous, _bdf_atos):
Stop scanning if result would overflow.
-rw-r--r-- | ChangeLog | 11 | ||||
-rw-r--r-- | src/bdf/bdflib.c | 40 |
2 files changed, 47 insertions, 4 deletions
@@ -1,5 +1,16 @@ 2017-06-02 Werner Lemberg <wl@gnu.org> + [bdf] Fix integer scanning routines. + + Reported as + + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2029 + + * src/bdf/bdflib.c (_bdf_atoul, _bdf_atol, _bdf_atous, _bdf_atos): + Stop scanning if result would overflow. + +2017-06-02 Werner Lemberg <wl@gnu.org> + [cff] Fix integer overflows. Reported as diff --git a/src/bdf/bdflib.c b/src/bdf/bdflib.c index 7fd95a738..bf10887fd 100644 --- a/src/bdf/bdflib.c +++ b/src/bdf/bdflib.c @@ -704,7 +704,15 @@ return 0; for ( v = 0; sbitset( ddigits, *s ); s++ ) - v = v * 10 + a2i[(int)*s]; + { + if ( v < ( ULONG_MAX - 9 ) / 10 ) + v = v * 10 + a2i[(int)*s]; + else + { + v = ULONG_MAX; + break; + } + } return v; } @@ -729,7 +737,15 @@ } for ( v = 0; sbitset( ddigits, *s ); s++ ) - v = v * 10 + a2i[(int)*s]; + { + if ( v < ( LONG_MAX - 9 ) / 10 ) + v = v * 10 + a2i[(int)*s]; + else + { + v = LONG_MAX; + break; + } + } return ( !neg ) ? v : -v; } @@ -746,7 +762,15 @@ return 0; for ( v = 0; sbitset( ddigits, *s ); s++ ) - v = (unsigned short)( v * 10 + a2i[(int)*s] ); + { + if ( v < ( USHRT_MAX - 9 ) / 10 ) + v = (unsigned short)( v * 10 + a2i[(int)*s] ); + else + { + v = USHRT_MAX; + break; + } + } return v; } @@ -771,7 +795,15 @@ } for ( v = 0; sbitset( ddigits, *s ); s++ ) - v = (short)( v * 10 + a2i[(int)*s] ); + { + if ( v < ( SHRT_MAX - 9 ) / 10 ) + v = (short)( v * 10 + a2i[(int)*s] ); + else + { + v = SHRT_MAX; + break; + } + } return (short)( ( !neg ) ? v : -v ); } |