--- mp123/modplug123.c	2010-04-11 08:29:58.000000000 +0100
+++ mp123/modplug123.c	2010-08-02 20:30:52.739025706 +0100
@@ -354,8 +354,8 @@ for (song=1; song<argc; song++) {
 
 
     set_keypress();
-    strcpy(songname, ModPlug_GetName(f2));
-    if (strlen(songname)==0) strcpy(songname,argv[song]);
+    strncpy(songname, ModPlug_GetName(f2), 41);
+    if (strlen(songname)==0) strncpy(songname,argv[song], 41);
     sprintf(status,"playing %s (%%d.%%d/%d\") (%%d/%%d/%%d%%s)    \b\b\b\b",songname,ModPlug_GetLength(f2)/1000,format.rate,format.channels,settings.mBits,order);
     if (loop) sprintf(status,"looping %s (%%d.%%d/%d\") (%%d/%%d/%%d%%s)    \b\b\b\b",songname,ModPlug_GetLength(f2)/1000,format.rate,format.channels,settings.mBits,order);
 
--- mpplay/modplugplay.c	2010-04-11 09:12:50.000000000 +0100
+++ mpplay/modplugplay.c	2010-08-02 20:30:41.298200678 +0100
@@ -441,8 +441,8 @@ for (song=1; song<argc; song++) {
 // [rev--dly--] [sur--dly--] [bas--rng--]
 
     set_keypress();
-    strcpy(songname, ModPlug_GetName(f2));
-    if (strlen(songname)==0) strcpy(songname,argv[song]);
+    strncpy(songname, ModPlug_GetName(f2), 41);
+    if (strlen(songname)==0) strncpy(songname,argv[song], 41);
     sprintf(status,"playing %s (%%d.%%d/%d\") (%%d/%%d/%%d%%s)    \b\b\b\b",songname,ModPlug_GetLength(f2)/1000,speed,channels,settings.mBits,order);
     if (loop) sprintf(status,"looping %s (%%d.%%d/%d\") (%%d/%%d/%%d%%s)    \b\b\b\b",songname,ModPlug_GetLength(f2)/1000,speed,channels,settings.mBits,order);