diff --git a/ChangeLog b/ChangeLog
index cd63208ad..b4531e795 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-08-15  David Bevan  <david.bevan@pb.com>
+
+	Fix Savannah bug #33992.
+
+	* src/base/ftstroke.c (FT_Stroker_ParseOutline): Fix border case.
+
 2011-08-12  Werner Lemberg  <wl@gnu.org
 
 	[truetype] Fix degenerate case in S{P,F,DP}VTL opcodes.
diff --git a/src/base/ftstroke.c b/src/base/ftstroke.c
index 3f24f9ee8..5399efe9d 100644
--- a/src/base/ftstroke.c
+++ b/src/base/ftstroke.c
@@ -2222,9 +2222,13 @@
       if ( error )
         goto Exit;
 
-      error = FT_Stroker_EndSubPath( stroker );
-      if ( error )
-        goto Exit;
+      /* don't try to end the path if no segments have been generated */
+      if ( !stroker->first_point )
+      {
+        error = FT_Stroker_EndSubPath( stroker );
+        if ( error )
+          goto Exit;
+      }
 
       first = last + 1;
     }