Re: [ft-devel] Patch to allow '\0' in sfnt name table entries

[Huw Davies]

On Wed, Mar 14, 2012 at 05:20:34PM +0100, Werner LEMBERG wrote:
> I was quicker :-)  Please resend your patch relative to the current
> git.

Here you go.

Huw.

>From 53f1b3aa88055a4fbc36e9654a48ed84d395f502 Mon Sep 17 00:00:00 2001
From: Huw Davies <h...@codeweavers.com>
Date: Wed, 14 Mar 2012 16:25:28 +0000
Subject: [sfnt] Don't bother copying characters after a '\0'.

---
 src/sfnt/sfobjs.c |   16 ++++++++++++----
 1 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/sfnt/sfobjs.c b/src/sfnt/sfobjs.c
index 3b9fd47..2bc4bd9 100644
--- a/src/sfnt/sfobjs.c
+++ b/src/sfnt/sfobjs.c
@@ -64,13 +64,17 @@
     for ( n = 0; n < len; n++ )
     {
       code = FT_NEXT_USHORT( read );
-      if ( code != 0 && ( code < 32 || code > 127 ) )
+
+      if ( code == 0 )
+        break;
+
+      if ( code < 32 || code > 127 )
         code = '?';
 
       string[n] = (char)code;
     }
 
-    string[len] = 0;
+    string[n] = 0;
 
     return string;
   }
@@ -95,13 +99,17 @@
     for ( n = 0; n < len; n++ )
     {
       code = *read++;
-      if ( code != 0 && ( code < 32 || code > 127 ) )
+
+      if ( code == 0 )
+        break;
+
+      if ( code < 32 || code > 127 )
         code = '?';
 
       string[n] = (char)code;
     }
 
-    string[len] = 0;
+    string[n] = 0;
 
     return string;
   }
-- 
1.7.0.4


_______________________________________________
Freetype-devel mailing list
Freetype-devel@nongnu.org
https://lists.nongnu.org/mailman/listinfo/freetype-devel