diff --git a/ChangeLog b/ChangeLog
index 575ca88b0..3ff78d69d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2017-01-31  Werner Lemberg  <wl@gnu.org>
+
+	[autofit] Avoid uninitialized jumps (#50191).
+
+	* src/autofit/afcjk.c (af_cjk_metrics_check_digits),
+	src/autofit/aflatin.c (af_latin_metrics_check_digits): Initialize
+	`advance'.
+
 2017-01-27  Werner Lemberg  <wl@gnu.org>
 
 	s/GB2312/PRC/.
diff --git a/src/autofit/afcjk.c b/src/autofit/afcjk.c
index 42d7cbf98..f172a9fd9 100644
--- a/src/autofit/afcjk.c
+++ b/src/autofit/afcjk.c
@@ -563,7 +563,7 @@
                                FT_Face        face )
   {
     FT_Bool   started = 0, same_width = 1;
-    FT_Fixed  advance, old_advance = 0;
+    FT_Fixed  advance = 0, old_advance = 0;
 
     void*  shaper_buf;
 
diff --git a/src/autofit/aflatin.c b/src/autofit/aflatin.c
index e19d4fbd4..ccea54787 100644
--- a/src/autofit/aflatin.c
+++ b/src/autofit/aflatin.c
@@ -941,7 +941,7 @@
                                  FT_Face          face )
   {
     FT_Bool   started = 0, same_width = 1;
-    FT_Fixed  advance, old_advance = 0;
+    FT_Fixed  advance = 0, old_advance = 0;
 
     void*  shaper_buf;