summaryrefslogtreecommitdiff
path: root/src/map/script-parse.cpp
diff options
context:
space:
mode:
authorBen Longbons <b.r.longbons@gmail.com>2014-11-09 19:55:56 -0800
committerBen Longbons <b.r.longbons@gmail.com>2014-11-09 19:58:49 -0800
commitf5db6b09fb461d7bb60ff443d603bb10820d5f14 (patch)
tree5515cb216095c6725a9d828aa082c85047f86f8a /src/map/script-parse.cpp
parent3cf55f763ef8c75e8e8c11fca3c3e564668aee52 (diff)
downloadtmwa-f5db6b09fb461d7bb60ff443d603bb10820d5f14.tar.gz
tmwa-f5db6b09fb461d7bb60ff443d603bb10820d5f14.tar.bz2
tmwa-f5db6b09fb461d7bb60ff443d603bb10820d5f14.tar.xz
tmwa-f5db6b09fb461d7bb60ff443d603bb10820d5f14.zip
Fix OOB on 128-element commands
Diffstat (limited to 'src/map/script-parse.cpp')
-rw-r--r--src/map/script-parse.cpp15
1 files changed, 13 insertions, 2 deletions
diff --git a/src/map/script-parse.cpp b/src/map/script-parse.cpp
index 6fb94de..878397f 100644
--- a/src/map/script-parse.cpp
+++ b/src/map/script-parse.cpp
@@ -24,6 +24,7 @@
#include <set>
+#include "../generic/array.hpp"
#include "../generic/db.hpp"
#include "../generic/intern-pool.hpp"
@@ -505,7 +506,7 @@ ZString::iterator ScriptBuffer::parse_subexpr(ZString::iterator p, int limit)
{
int i = 0;
P<str_data_t> funcp = TRY_UNWRAP(parse_cmdp, abort());
- ZString::iterator plist[128];
+ Array<ZString::iterator, 128> plist;
if (funcp->type != StringCode::FUNC)
{
@@ -529,6 +530,11 @@ ZString::iterator ScriptBuffer::parse_subexpr(ZString::iterator p, int limit)
p = skip_space(p);
i++;
}
+ if (i == 128)
+ {
+ disp_error_message("PANIC: unrecoverable error in function argument list"_s, p);
+ abort();
+ }
plist[i] = p;
if (*p != ')')
{
@@ -595,7 +601,7 @@ ZString::iterator ScriptBuffer::parse_expr(ZString::iterator p)
ZString::iterator ScriptBuffer::parse_line(ZString::iterator p, bool *can_step)
{
int i = 0;
- ZString::iterator plist[128];
+ Array<ZString::iterator, 128> plist;
p = skip_space(p);
if (*p == ';')
@@ -652,6 +658,11 @@ ZString::iterator ScriptBuffer::parse_line(ZString::iterator p, bool *can_step)
p = skip_space(p);
i++;
}
+ if (i == 128)
+ {
+ disp_error_message("PANIC: unknown error in command argument list"_s, p);
+ abort();
+ }
plist[i] = p;
if (*(p++) != ';')
{