godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed zero-length arrays in nrex. Fixes #4346 

(cherry picked from commit 48b2dfab9f)
This commit is contained in:
Zher Huei Lee 2016-04-18 10:06:47 +01:00 committed by Rémi Verschelde
parent c712e54b63
commit 07fc330241
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/nrex/nrex.cpp
View File

@ -68,9 +68,9 @@ class nrex_array
{ {
} }
nrex_array(unsigned int size) nrex_array(unsigned int reserved)
: _data(NREX_NEW_ARRAY(T, size)) : _data(NREX_NEW_ARRAY(T, reserved ? reserved : 1))
, _reserved(size) , _reserved(reserved ? reserved : 1)
, _size(0) , _size(0)
{ {
} }
@ -87,6 +87,12 @@ class nrex_array
void reserve(unsigned int size) void reserve(unsigned int size)
{ {
if (size < _size) {
size = _size;
}
if (size == 0) {
size = 1;
}
T* old = _data; T* old = _data;
_data = NREX_NEW_ARRAY(T, size); _data = NREX_NEW_ARRAY(T, size);
_reserved = size; _reserved = size;
@ -207,8 +213,8 @@ struct nrex_search
: str(str) : str(str)
, captures(captures) , captures(captures)
, end(0) , end(0)
, lookahead_pos(lookahead)
{ {
lookahead_pos.reserve(lookahead);
} }
}; };