From 74ae20b906cbdf6b0c17afa6d9911e5c3e58f161 Mon Sep 17 00:00:00 2001
From: skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>
Date: Thu, 13 Apr 2006 14:25:22 +0000
Subject: - Cleaned atcommand_param against overflows and also to make it
 standard C so it may compile with the Borland C. - Modified Charcommand_stats
 to make it standard C as well.

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6037 54d463be-8e91-2dee-dedb-b68131a5f0ec
---
 src/map/atcommand.c | 43 ++++++++++++++++++++++++++-----------------
 1 file changed, 26 insertions(+), 17 deletions(-)

(limited to 'src/map/atcommand.c')

diff --git a/src/map/atcommand.c b/src/map/atcommand.c
index a6751cb85..e62c9a71a 100644
--- a/src/map/atcommand.c
+++ b/src/map/atcommand.c
@@ -4135,13 +4135,18 @@ int atcommand_param(
 	const int fd, struct map_session_data* sd,
 	const char* command, const char* message)
 {
-	int i, index, value = 0, new_value;
+	int index, value = 0, new_value, max;
 	const char* param[] = { "@str", "@agi", "@vit", "@int", "@dex", "@luk", NULL };
-	short* status[] = {
-		&sd->status.str,  &sd->status.agi, &sd->status.vit,
-		&sd->status.int_, &sd->status.dex, &sd->status.luk
-	};
+	short* status[6];
+ 	//We don't use direct initialization because it isn't part of the C standard.
 	nullpo_retr(-1, sd);
+	
+	status[0] = &sd->status.str;
+	status[1] = &sd->status.agi;
+	status[2] = &sd->status.vit;
+	status[3] = &sd->status.int_;
+	status[4] = &sd->status.dex;
+	status[5] = &sd->status.luk;
 
 	memset(atcmd_output, '\0', sizeof(atcmd_output));
 
@@ -4152,24 +4157,28 @@ int atcommand_param(
 	}
 
 	index = -1;
-	for (i = 0; param[i] != NULL; i++) {
-		if (strcmpi(command, param[i]) == 0) {
-			index = i;
+	for (index = 0; index < sizeof(param)/sizeof(param[0]); index++) {
+		if (strcmpi(command, param[index]) == 0)
 			break;
-		}
 	}
-	if (index < 0 || index > MAX_STATUS_TYPE) { // normaly impossible...
+	if (index == sizeof(param)/sizeof(param[0]) || index > MAX_STATUS_TYPE) {
+		// normaly impossible...
 		sprintf(atcmd_output, "Please, enter a valid value (usage: @str,@agi,@vit,@int,@dex,@luk <+/-adjustement>).");
 		clif_displaymessage(fd, atcmd_output);
 		return -1;
 	}
-
-	new_value = (int)*status[index] + value;
-	if (value > 0 && (value > pc_maxparameter(sd) || new_value > pc_maxparameter(sd))) // fix positiv overflow
-		new_value = pc_maxparameter(sd); 
-	else if (value < 0 && (value < -(int)pc_maxparameter(sd) || new_value < 1)) // fix negativ overflow
-		new_value = 1;
-
+	if (value >0) {
+		max = pc_maxparameter(sd);
+		if (*status[index] > max - value)
+			new_value = max;
+		else
+			new_value = *status[index] + value;
+	} else {
+		if (*status[index] <= -value)
+			new_value = 1;
+		else
+			new_value = *status[index] + value;
+	}
 	if (new_value != (int)*status[index]) {
 		*status[index] = new_value;
 		clif_updatestatus(sd, SP_STR + index);
-- 
cgit v1.2.3-60-g2f50