marko10_000
/
openclonk
forked from Mirrors/openclonk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #80 from isilkor/check-setlength-parameter-for-nil 

Script: Test SetLength parameter 0 for nil (GH #79)
master
isilkor 2019-01-05 19:47:38 +01:00 committed by GitHub
parent 3a59c15250 486619b653
commit ad2eddcd63
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 31 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/script/C4Script.cpp
View File

@ -3,7 +3,7 @@
* *
* Copyright (c) 1998-2000, Matthes Bender * Copyright (c) 1998-2000, Matthes Bender
* Copyright (c) 2001-2009, RedWolf Design GmbH, http://www.clonk.de/ * Copyright (c) 2001-2009, RedWolf Design GmbH, http://www.clonk.de/
* Copyright (c) 2009-2016, The OpenClonk Team and contributors * Copyright (c) 2009-2019, The OpenClonk Team and contributors
* *
* Distributed under the terms of the ISC license; see accompanying file * Distributed under the terms of the ISC license; see accompanying file
* "COPYING" for details. * "COPYING" for details.
@ -811,9 +811,21 @@ static bool FnDeepEqual(C4PropList * _this, const C4Value & v1, const C4Value &
static void FnSetLength(C4PropList * _this, C4ValueArray *pArray, int iNewSize) static void FnSetLength(C4PropList * _this, C4ValueArray *pArray, int iNewSize)
{ {
// safety if (!pArray)
if (iNewSize<0 || iNewSize > C4ValueArray::MaxSize) {
throw C4AulExecError(FormatString("SetLength: invalid array size (%d)", iNewSize).getData()); throw C4AulExecError(strprintf(R"(call to "%s" parameter %d: passed %s, but expected %s)",
"SetLength", 1, GetC4VName(C4V_Nil), GetC4VName(C4V_Array))
.c_str()
);
}
if (iNewSize < 0 || iNewSize > C4ValueArray::MaxSize)
{
throw C4AulExecError(strprintf(R"(call to "SetLength": parameter 2: invalid array size (expected value between 0 and %d, but got %d)",
C4ValueArray::MaxSize, iNewSize)
.c_str()
);
}
// set new size // set new size
pArray->SetSize(iNewSize); pArray->SetSize(iNewSize);

2
src/script/C4ValueArray.h
View File

@ -23,7 +23,7 @@
class C4ValueArray: public C4RefCnt class C4ValueArray: public C4RefCnt
{ {
public: public:
enum { MaxSize = 1000000 }; // ye shalt not create arrays larger than that! static const int MaxSize = 1000000; // ye shalt not create arrays larger than that!
C4ValueArray(); C4ValueArray();
C4ValueArray(int32_t inSize); C4ValueArray(int32_t inSize);

15
tests/aul/AulDeathTest.cpp
View File

@ -1,7 +1,7 @@
/* /*
* OpenClonk, http://www.openclonk.org * OpenClonk, http://www.openclonk.org
* *
* Copyright (c) 2016, The OpenClonk Team and contributors * Copyright (c) 2016-2019, The OpenClonk Team and contributors
* *
* Distributed under the terms of the ISC license; see accompanying file * Distributed under the terms of the ISC license; see accompanying file
* "COPYING" for details. * "COPYING" for details.
@ -48,3 +48,16 @@ TEST_F(AulDeathTest, issue1891)
{} {}
); );
} }
TEST_F(AulDeathTest, SetLengthWithNil)
{
// Github #79: NULL dereference when SetLength is called with nil parameter
EXPECT_NO_DEATH(
try
{
RunExpr("SetLength(nil, 0)");
}
catch (C4AulExecError &)
{}
);
}