* src/pcf/pcfread.c (pcf_get_encodings): Another thinko.

Reported as https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=9608
7 years ago · 00968d8fd6
parent 0f8aebfd51
commit 00968d8fd6
2 changed files with 10 additions and 1 deletions
--- a/8
+++ b/8
@ -1,3 +1,11 @@
+2018-07-29  Werner Lemberg  <wl@gnu.org>
+
+	* src/pcf/pcfread.c (pcf_get_encodings): Another thinko.
+
+	Reported as
+
+	  https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=9608
+
 2018-07-28  Alexei Podtelezhnikov  <apodtele@gmail.com>

 	[smooth] Fix Harmony memory management.
--- a/src/pcf/pcfread.c
+++ b/src/pcf/pcfread.c
@ -1054,7 +1054,8 @@ THE SOFTWARE.
    /* `stream->cursor' still points at the beginning of the frame; */
    /* we can thus easily get the offset to the default character   */
    pos = stream->cursor +
-            2 * ( ( defaultCharRow - (FT_UShort)firstRow ) * 256 +
+            2 * ( ( defaultCharRow - (FT_UShort)firstRow ) *
+                    ( lastCol - firstCol + 1 ) +
                  defaultCharCol - (FT_UShort)firstCol );

    if ( PCF_BYTE_ORDER( format ) == MSBFirst )