From 0ea167b7d59f0487278f154b2bbe26bea8fe8033 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Mon, 27 Nov 2017 17:28:32 -0600 Subject: [PATCH] strn cleanup. --- main.cpp | 4 ++-- mishaps.cpp | 2 +- powerup.cpp | 14 +++++++------- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/main.cpp b/main.cpp index e13909a..72ffc83 100644 --- a/main.cpp +++ b/main.cpp @@ -48,7 +48,7 @@ const int landershotmax = 10; const int landermax = 12; const int crawlermax = 6; const int missilemax = 3; -const float version = 1.13; +const float version = 1.14; int score; int lives; @@ -538,7 +538,7 @@ int main(int argc, char *argv[]){ char filename[250]; strcpy (filename, "/.curblaster_scores"); char home[250]; - strcpy(home, getenv("HOME")); + strncpy(home, getenv("HOME"), 230); strncat(home, filename, 20); diff --git a/mishaps.cpp b/mishaps.cpp index 3b2fd45..26507fa 100644 --- a/mishaps.cpp +++ b/mishaps.cpp @@ -83,7 +83,7 @@ int life_loss(int lives, int score){ char outstring[50]; strcpy (filename, "/.curblaster_scores"); char home[250]; - strcpy(home, getenv("HOME")); + strncpy(home, getenv("HOME"), 230); strncat(home, filename, 20); diff --git a/powerup.cpp b/powerup.cpp index aa5ef70..56bf36b 100644 --- a/powerup.cpp +++ b/powerup.cpp @@ -21,25 +21,25 @@ game_object powerup_init(game_object powerup, game_object object){ int fodder = rand()%1500; if(fodder>=1200){ - strcpy (powerup.line0, "M"); + strncpy(powerup.line0, "M", 1); }; if(fodder>=1000&&fodder<1200){ - strcpy (powerup.line0, "T"); + strncpy(powerup.line0, "T", 1); }; if(fodder>=800&&fodder<1000){ - strcpy (powerup.line0, "S"); + strncpy(powerup.line0, "S", 1); }; if(fodder>=600&&fodder<800){ - strcpy (powerup.line0, "K"); + strncpy(powerup.line0, "K", 1); }; if(fodder>=400&&fodder<600){ - strcpy (powerup.line0, "L"); + strncpy(powerup.line0, "L", 1); }; if(fodder>=200&&fodder<400){ - strcpy (powerup.line0, "B"); + strncpy(powerup.line0, "B", 1); }; if(fodder<200){ - strcpy (powerup.line0, "Z"); + strncpy(powerup.line0, "Z", 1); }; return powerup; -- 2.9.0