Changeset 39339

Timestamp:

Feb 10, 2016, 10:30:45 AM (10 years ago)

Author:

eugene

Message:

do not collide in strcpy operation

Location:

trunk/Ohana/src/libkapa

Files:

• rotfont/alphabet.h (modified) (1 diff)
• src/RotFont.c (modified) (2 diffs)

trunk/Ohana/src/libkapa/rotfont/alphabet.h

@@ -61 +61 @@
 };
 
-int Nallfonts;
-FontSet *AllFonts;
-RotFont *activefont;
-double activescale;
-
-char currentname[64];
-int  currentsize;
+// int Nallfonts;
+// FontSet *AllFonts;
+// RotFont *activefont;
+// double activescale;
+// 
+// char currentname[64];
+// int  currentsize;

trunk/Ohana/src/libkapa/src/RotFont.c

@@ -30 +30 @@
   currentfont = RotFonts[DEFFONT].font;
   currentscale = 1.0;
-  strcpy (currentname, RotFonts[DEFFONT].name);
+  strncpy (currentname, RotFonts[DEFFONT].name, 63); currentname[63] = 0;
   currentsize = RotFonts[DEFFONT].size;
 }
@@ -65 +65 @@
     currentscale = (double) size / RotFonts[match].size;
     currentsize = size;
-    strcpy (currentname, name);
+    if (name != currentname) {
+      strncpy (currentname, name, 63); currentname[63] = 0;
+    }
     return (TRUE);
   } else {