wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 995657 - Check new capacity is large enough when growing the mark stack r=terrence

Browse Source
This commit is contained in:
Jon Coppeard 2014-04-16 09:48:24 +01:00
parent a775e98530
commit 434d722551
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
js/src/jsgc.h
View File

@ -1008,7 +1008,7 @@ struct MarkStack {
bool push(T item) {
if (tos_ == end_) {
if (!enlarge())
if (!enlarge(1))
return false;
}
JS_ASSERT(tos_ < end_);
@ -1019,7 +1019,7 @@ struct MarkStack {
bool push(T item1, T item2, T item3) {
T *nextTos = tos_ + 3;
if (nextTos > end_) {
if (!enlarge())
if (!enlarge(3))
return false;
nextTos = tos_ + 3;
}
@ -1057,14 +1057,12 @@ struct MarkStack {
setStack(newStack, 0, baseCapacity_);
}
bool enlarge() {
if (capacity() == maxCapacity_)
/* Grow the stack, ensuring there is space for at least count elements. */
bool enlarge(unsigned count) {
size_t newCapacity = Min(maxCapacity_, capacity() * 2);
if (newCapacity < capacity() + count)
return false;
size_t newCapacity = capacity() * 2;
if (newCapacity > maxCapacity_)
newCapacity = maxCapacity_;
size_t tosIndex = position();
T *newStack = (T *)js_realloc(stack_, sizeof(T) * newCapacity);