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 913648 - SpiderMonkey: Allow allocation of an AssemblerBuffer larger than INT_MAX/2. r=luke

Browse Source
This commit is contained in:
Dan Gohman 2013-11-23 06:35:58 -08:00
parent 5fcf025d42
commit 7e1ee7cbb7
1 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
js/src/assembler/assembler/AssemblerBuffer.h
View File

@ -57,7 +57,7 @@
namespace JSC {
class AssemblerBuffer {
static const int inlineCapacity = 256;
static const size_t inlineCapacity = 256;
public:
AssemblerBuffer()
: m_buffer(m_inlineBuffer)
@ -73,13 +73,13 @@ namespace JSC {
js_free(m_buffer);
}
void ensureSpace(int space)
void ensureSpace(size_t space)
{
if (m_size > m_capacity - space)
grow();
}
bool isAligned(int alignment) const
bool isAligned(size_t alignment) const
{
return !(m_size & (alignment - 1));
}
@ -138,7 +138,7 @@ namespace JSC {
return m_buffer;
}
int size() const
size_t size() const
{
return m_size;
}
@ -177,7 +177,7 @@ namespace JSC {
}
protected:
void append(const char* data, int size)
void append(const char* data, size_t size)
{
if (m_size > m_capacity - size)
grow(size);
@ -204,18 +204,27 @@ namespace JSC {
* See also the |executableAllocAndCopy| and |buffer| methods.
*/
void grow(int extraCapacity = 0)
void grow(size_t extraCapacity = 0)
{
char* newBuffer;
/*
* If |extraCapacity| is zero (as it almost always is) this is an
* allocator-friendly doubling growth strategy.
*/
int newCapacity = m_capacity + m_capacity + extraCapacity;
char* newBuffer;
size_t doubleCapacity = m_capacity + m_capacity;
// Do not allow offsets to grow beyond INT_MAX / 2. This mirrors
// Assembler-shared.h.
if (newCapacity >= INT_MAX / 2) {
// Check for overflow.
if (doubleCapacity < m_capacity) {
m_size = 0;
m_oom = true;
return;
}
size_t newCapacity = doubleCapacity + extraCapacity;
// Check for overflow.
if (newCapacity < doubleCapacity) {
m_size = 0;
m_oom = true;
return;
@ -244,8 +253,8 @@ namespace JSC {
char m_inlineBuffer[inlineCapacity];
char* m_buffer;
int m_capacity;
int m_size;
size_t m_capacity;
size_t m_size;
bool m_oom;
};