QVM: fixed potential issue with overlapping src and dest

see OpenArena/gamecode#346
see ioquake/ioq3#659
see ioquake/ioq3#742

Author: mgerhardy

code/cgame/cg_weapons.c

@@ -391,23 +391,20 @@ static void CG_RegisterWeapon(int weaponNum) {
 	}
 
 	if (weaponNum != WP_PUNCHY) {
-		Q_strncpyz(path, item->world_model[0], sizeof(path));
-		COM_StripExtension(path, path, sizeof(path));
+		COM_StripExtension(item->world_model[0], path, sizeof(path));
 		Q_strcat(path, sizeof(path), "_flash");
 		weaponInfo->flashModel = trap_R_RegisterModel(path);
 	}
 
 	if (weaponNum == WP_NIPPER || weaponNum == WP_IMPERIUS) // || weaponNum == WP_PUNCHY
 	{
-		Q_strncpyz(path, item->world_model[0], sizeof(path));
-		COM_StripExtension(path, path, sizeof(path));
+		COM_StripExtension(item->world_model[0], path, sizeof(path));
 		Q_strcat(path, sizeof(path), "_barrel");
 		weaponInfo->barrelModel = trap_R_RegisterModel(path);
 	} else
 		weaponInfo->barrelModel = 0;
 
-	Q_strncpyz(path, item->world_model[0], sizeof(path));
-	COM_StripExtension(path, path, sizeof(path));
+	COM_StripExtension(item->world_model[0], path, sizeof(path));
 	Q_strcat(path, sizeof(path), "_hand");
 	weaponInfo->handsModel = trap_R_RegisterModel(path);
 

code/ui/ui_players.c

@@ -85,14 +85,12 @@ static void UI_PlayerInfo_SetWeapon(playerInfo_t *pi, weapon_t weaponNum) {
 	}
 
 	if (weaponNum == WP_NIPPER || weaponNum == WP_PUNCHY || weaponNum == WP_IMPERIUS) {
-		strcpy(path, item->world_model[0]);
-		COM_StripExtension(path, path, sizeof(path));
+		COM_StripExtension(item->world_model[0], path, sizeof(path));
 		strcat(path, "_barrel");
 		pi->barrelModel = trap_R_RegisterModel(path);
 	}
 
-	strcpy(path, item->world_model[0]);
-	COM_StripExtension(path, path, sizeof(path));
+	COM_StripExtension(item->world_model[0], path, sizeof(path));
 	strcat(path, "_flash");
 	pi->flashModel = trap_R_RegisterModel(path);