ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-02-14 22:52:22 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

avoid overflow in sitesToString

Browse Source
This commit is contained in:
Joel Dice 2009-01-04 15:58:05 -07:00
parent 9495d03dc6
commit 8459489212
1 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/compiler.cpp
View File

@ -16,13 +16,13 @@ using namespace vm;
namespace { namespace {
const bool DebugAppend = false; const bool DebugAppend = false;
const bool DebugCompile = true; const bool DebugCompile = false;
const bool DebugResources = true; const bool DebugResources = false;
const bool DebugFrame = false; const bool DebugFrame = false;
const bool DebugControl = true; const bool DebugControl = false;
const bool DebugReads = false; const bool DebugReads = false;
const bool DebugSites = false; const bool DebugSites = false;
const bool DebugMoves = true; const bool DebugMoves = false;
const int AnyFrameIndex = -2; const int AnyFrameIndex = -2;
const int NoFrameIndex = -1; const int NoFrameIndex = -1;
@ -959,9 +959,7 @@ resourceCost(Context* c, Value* v, Resource* r)
{ {
if (r->reserved or r->freezeCount or r->referenceCount) { if (r->reserved or r->freezeCount or r->referenceCount) {
return Target::Impossible; return Target::Impossible;
} } else if (r->value) {
if (r->value) {
assert(c, findSite(c, r->value, r->site)); assert(c, findSite(c, r->value, r->site));
if (v and buddies(r->value, v)) { if (v and buddies(r->value, v)) {
@ -1676,6 +1674,13 @@ sitesToString(Context* c, Value* v, char* buffer, unsigned size)
unsigned total = 0; unsigned total = 0;
Value* p = v; Value* p = v;
do { do {
if (size < total + 32) {
assert(c, size > total + 4);
memcpy(buffer + total, "...", 3);
total += 3;
break;
}
if (total) { if (total) {
assert(c, size > total + 2); assert(c, size > total + 2);
memcpy(buffer + total, "; ", 2); memcpy(buffer + total, "; ", 2);
@ -2179,10 +2184,12 @@ clean(Context* c, Value* v, unsigned popIndex)
(c, static_cast<MemorySite*>(s)->value.offset) (c, static_cast<MemorySite*>(s)->value.offset)
>= popIndex)) >= popIndex))
{ {
char buffer[256]; s->toString(c, buffer, 256); if (false) {
fprintf(stderr, "remove %s from %p at %d pop index %d\n", char buffer[256]; s->toString(c, buffer, 256);
buffer, v, offsetToFrameIndex fprintf(stderr, "remove %s from %p at %d pop index %d\n",
(c, static_cast<MemorySite*>(s)->value.offset), popIndex); buffer, v, offsetToFrameIndex
(c, static_cast<MemorySite*>(s)->value.offset), popIndex);
}
it.remove(c); it.remove(c);
} }
} }
@ -3028,7 +3035,9 @@ class MemoryEvent: public Event {
scale(scale), result(result) scale(scale), result(result)
{ {
addRead(c, this, base, anyRegisterRead(c, BytesPerWord)); addRead(c, this, base, anyRegisterRead(c, BytesPerWord));
if (index) addRead(c, this, index, registerOrConstantRead(c, BytesPerWord)); if (index) {
addRead(c, this, index, registerOrConstantRead(c, BytesPerWord));
}
} }
virtual const char* name() { virtual const char* name() {