[tools/sfnt2fnt.c] Strncpy elimination.

Peter Berg Larsen pebl at math.ku.dk
Sun Mar 27 13:58:23 CST 2005


The string_len is defined to be the string length without \0.

Changelog:
	Change the strncpys to memcpy and lstrcpynA.

Index: tools/sfnt2fnt.c
===================================================================
RCS file: /home/wine/wine/tools/sfnt2fnt.c,v
retrieving revision 1.3
diff -u -r1.3 sfnt2fnt.c
--- tools/sfnt2fnt.c	19 Nov 2004 18:23:52 -0000	1.3
+++ tools/sfnt2fnt.c	26 Mar 2005 09:41:56 -0000
@@ -207,12 +207,10 @@
     num_names = FT_Get_Sfnt_Name_Count(face);
     for(i = 0; i <num_names; i++) {
         FT_Get_Sfnt_Name(face, i, &sfntname);
-        strncpy(namebuf, sfntname.string, sfntname.string_len);
-        namebuf[sfntname.string_len] = '\0';
-        if(sfntname.platform_id == 1 && sfntname.encoding_id == 0 && sfntname.language_id == 0 && sfntname.name_id == 0) {
-            strncpy(hdr.dfCopyright, namebuf, 60);
-            hdr.dfCopyright[59] = '\0';
-        }
+        memcpy(namebuf, sfntname.string, sfntname.string_len);
+	namebuf[sfntname.string_len] = '\0';
+        if(sfntname.platform_id == 1 && sfntname.encoding_id == 0 && sfntname.language_id == 0 && sfntname.name_id == 0)
+            lstrcpynA(hdr.dfCopyright, namebuf, 60);
     }

     os2 = FT_Get_Sfnt_Table(face, ft_sfnt_os2);






More information about the wine-patches mailing list