summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorKenpachi Developer <Kenpachi.Developer@gmx.de>2020-11-14 09:19:33 +0100
committerJesusaves <cpntb1@ymail.com>2021-02-14 15:54:29 -0300
commita1bb4008e58b92e2af5099570a723e37ea138d0b (patch)
tree366e70177d04f5cc98345080faf074863e9d8536 /src
parent00251c40abe80a2538f8c26b6be3b1ede44dd996 (diff)
downloadhercules-a1bb4008e58b92e2af5099570a723e37ea138d0b.tar.gz
hercules-a1bb4008e58b92e2af5099570a723e37ea138d0b.tar.bz2
hercules-a1bb4008e58b92e2af5099570a723e37ea138d0b.tar.xz
hercules-a1bb4008e58b92e2af5099570a723e37ea138d0b.zip
Add check for valid item amount to BUILDIN(rodex_sendmail2)
Diffstat (limited to 'src')
-rw-r--r--src/map/script.c15
1 files changed, 14 insertions, 1 deletions
diff --git a/src/map/script.c b/src/map/script.c
index 1448715a7..1f49f04b9 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -25335,6 +25335,19 @@ static BUILDIN(rodex_sendmail2)
ShowError("script:rodex_sendmail: Missing Item %d amount!\n", (i + 1));
return false;
}
+
+ if (!data_isint(script_getdata(st, param + 1))) {
+ ShowError("script:rodex_sendmail: Passed amount for item %d is not a number!\n", i + 1);
+ return false;
+ }
+
+ int amount = script_getnum(st, param + 1);
+
+ if (amount < 1 || amount > min(MAX_AMOUNT, SHRT_MAX)) {
+ ShowError("script:rodex_sendmail: Invalid amount %d passed for item %d!\n", amount, i + 1);
+ return false;
+ }
+
if (!script_hasdata(st, param + 2)) {
ShowError("script:rodex_sendmail: Missing Item %d refine!\n", (i + 1));
return false;
@@ -25367,7 +25380,7 @@ static BUILDIN(rodex_sendmail2)
}
msg.items[i].item.nameid = idata->nameid;
- msg.items[i].item.amount = script_getnum(st, (param + 1));
+ msg.items[i].item.amount = amount;
msg.items[i].item.refine = script_getnum(st, (param + 2));
msg.items[i].item.attribute = script_getnum(st, (param + 3));
msg.items[i].item.identify = 1;