Commit 6abce2c2b04a14bd711d5d0fee3ba23e9612a747

Werner Lemberg 2019-04-23T06:52:07

* src/sfnt/ttcmap.c (tt_cmap12_next): Remove dead code. Found by clang 8.0's static analyzer and reported by Sender Ghost <lightside@gmx.com>.

diff --git a/ChangeLog b/ChangeLog
index 92a2556..7919b5f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2019-04-23  Werner Lemberg  <wl@gnu.org>
 
+	* src/sfnt/ttcmap.c (tt_cmap12_next): Remove dead code.
+
+	Found by clang 8.0's static analyzer and reported by Sender Ghost
+	<lightside@gmx.com>.
+
+2019-04-23  Werner Lemberg  <wl@gnu.org>
+
 	[base] Fix thinko in previous commit.
 
 	* src/base/ftbitmap.c (FT_Bitmap_Blend): Check final width, not
diff --git a/src/sfnt/ttcmap.c b/src/sfnt/ttcmap.c
index 32ad301..683f3b1 100644
--- a/src/sfnt/ttcmap.c
+++ b/src/sfnt/ttcmap.c
@@ -2368,10 +2368,7 @@
         /* if `gindex' is invalid, the remaining values */
         /* in this group are invalid, too               */
         if ( gindex >= (FT_UInt)face->num_glyphs )
-        {
-          gindex = 0;
           continue;
-        }
 
         cmap->cur_charcode = char_code;
         cmap->cur_gindex   = gindex;