diff --git a/ChangeLog b/ChangeLog
index 5031a00a1..e9adf4baa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2016-02-07  Werner Lemberg  <wl@gnu.org>
+
+	Fix another runtime error found by clang's sanitizer (#47082).
+
+	* src/base/ftstroke.c (ft_stroke_border_export): Properly handle
+	empty input buffer.
+
 2016-02-07  Werner Lemberg  <wl@gnu.org>
 
 	Fix runtime errors found by clang's sanitizer (#47082).
@@ -138,7 +145,7 @@
 
 2016-01-20  Werner Lemberg  <wl@gnu.org>
 
-	[autofix] Complete last autofit commit.
+	[autofit] Complete last autofit commit.
 
 	Problem reported by Kostya Serebryany <kcc@google.com>.
 
diff --git a/src/base/ftstroke.c b/src/base/ftstroke.c
index 2dbbaaeb0..4f3c4937b 100644
--- a/src/base/ftstroke.c
+++ b/src/base/ftstroke.c
@@ -712,9 +712,10 @@
                            FT_Outline*      outline )
   {
     /* copy point locations */
-    FT_ARRAY_COPY( outline->points + outline->n_points,
-                   border->points,
-                   border->num_points );
+    if ( border->num_points )
+      FT_ARRAY_COPY( outline->points + outline->n_points,
+                     border->points,
+                     border->num_points );
 
     /* copy tags */
     {