diff --git a/ChangeLog b/ChangeLog
index 14655a329..5354ce12f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2018-08-31  Werner Lemberg  <wl@gnu.org>
+
+	* src/autofit/afhints.c (af_glyph_hints_reload): Add initialization.
+
 2018-08-30  Alexei Podtelezhnikov  <apodtele@gmail.com>
 
 	Consolidate bitmap presetting and size assessment.
@@ -545,7 +549,7 @@
 	  https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=9501
 
 	* src/smooth/ftgrays.c (ft_smooth_render_generic): Restore buffer
-	after each rendering in case of failure. 
+	after each rendering in case of failure.
 
 2018-07-28  Werner Lemberg  <wl@gnu.org>
 
diff --git a/src/autofit/afhints.c b/src/autofit/afhints.c
index 660587fdf..1e8a57399 100644
--- a/src/autofit/afhints.c
+++ b/src/autofit/afhints.c
@@ -928,6 +928,14 @@
               prev     = end;
             }
           }
+
+#ifdef FT_DEBUG_AUTOFIT
+          point->before[0] = NULL;
+          point->before[1] = NULL;
+          point->after[0]  = NULL;
+          point->after[1]  = NULL;
+#endif
+
         }
       }