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

fix recent throwNew/makeThrowable regression

Browse Source 
6fceca9 introduced a string formatting regression in these methods,
which this commit fixes.
This commit is contained in:
Joel Dice 2012-03-03 18:37:27 -07:00
parent 87032ca8a8
commit 1d77b06540
2 changed files with 38 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/machine.cpp
View File

@ -3058,7 +3058,7 @@ popResources(Thread* t)
} }
object object
makeByteArray(Thread* t, const char* format, va_list a, int size) makeByteArrayV(Thread* t, const char* format, va_list a, int size)
{ {
THREAD_RUNTIME_ARRAY(t, char, buffer, size); THREAD_RUNTIME_ARRAY(t, char, buffer, size);
@ -3080,7 +3080,7 @@ makeByteArray(Thread* t, const char* format, ...)
while (true) { while (true) {
va_list a; va_list a;
va_start(a, format); va_start(a, format);
object s = makeByteArray(t, format, a, size); object s = makeByteArrayV(t, format, a, size);
va_end(a); va_end(a);
if (s) { if (s) {
@ -3098,7 +3098,7 @@ makeString(Thread* t, const char* format, ...)
while (true) { while (true) {
va_list a; va_list a;
va_start(a, format); va_start(a, format);
object s = makeByteArray(t, format, a, size); object s = makeByteArrayV(t, format, a, size);
va_end(a); va_end(a);
if (s) { if (s) {

29
src/machine.h
View File

@ -2216,7 +2216,7 @@ make(Thread* t, object class_)
} }
object object
makeByteArray(Thread* t, const char* format, va_list a, int size); makeByteArrayV(Thread* t, const char* format, va_list a, int size);
object object
makeByteArray(Thread* t, const char* format, ...); makeByteArray(Thread* t, const char* format, ...);
@ -2642,25 +2642,37 @@ makeThrowable
} }
inline object inline object
makeThrowable(Thread* t, Machine::Type type, const char* format, va_list a) makeThrowableV(Thread* t, Machine::Type type, const char* format, va_list a,
int size)
{ {
object s = makeByteArray(t, format, a); object s = makeByteArrayV(t, format, a, size);
if (s) {
object message = t->m->classpath->makeString object message = t->m->classpath->makeString
(t, s, 0, byteArrayLength(t, s) - 1); (t, s, 0, byteArrayLength(t, s) - 1);
return makeThrowable(t, type, message); return makeThrowable(t, type, message);
} else {
return 0;
}
} }
inline object inline object
makeThrowable(Thread* t, Machine::Type type, const char* format, ...) makeThrowable(Thread* t, Machine::Type type, const char* format, ...)
{ {
int size = 256;
while (true) {
va_list a; va_list a;
va_start(a, format); va_start(a, format);
object r = makeThrowable(t, type, format, a); object r = makeThrowableV(t, type, format, a, size);
va_end(a); va_end(a);
if (r) {
return r; return r;
} else {
size *= 2;
}
}
} }
void void
@ -2696,12 +2708,19 @@ throwNew
inline void NO_RETURN inline void NO_RETURN
throwNew(Thread* t, Machine::Type type, const char* format, ...) throwNew(Thread* t, Machine::Type type, const char* format, ...)
{ {
int size = 256;
while (true) {
va_list a; va_list a;
va_start(a, format); va_start(a, format);
object r = makeThrowable(t, type, format, a); object r = makeThrowableV(t, type, format, a, size);
va_end(a); va_end(a);
if (r) {
throw_(t, r); throw_(t, r);
} else {
size *= 2;
}
}
} }
object object