From a58dc194c8b0e7a0af35389e21d9d02b27301539 Mon Sep 17 00:00:00 2001 From: Andrew Haley Date: Wed, 14 Mar 2001 15:49:06 +0000 Subject: natThrowable.cc (printRawStackTrace): Copy the stackTrace buffer to a correctly aligned pointer array. 2001-03-01 Andrew Haley * java/lang/natThrowable.cc (printRawStackTrace): Copy the stackTrace buffer to a correctly aligned pointer array. From-SVN: r40456 --- libjava/java/lang/natThrowable.cc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'libjava/java') diff --git a/libjava/java/lang/natThrowable.cc b/libjava/java/lang/natThrowable.cc index dab3ba63..6080ea3 100644 --- a/libjava/java/lang/natThrowable.cc +++ b/libjava/java/lang/natThrowable.cc @@ -65,7 +65,7 @@ java::lang::Throwable::fillInStackTrace (void) if (n > 0) { - // ??? Might this cause a problem if the byte array isn't aligned? + // We copy the array below to deal with alignment issues. stackTrace = JvNewByteArray (n * sizeof p[0]); memcpy (elements (stackTrace), p+1, (n * sizeof p[0])); } @@ -83,8 +83,9 @@ java::lang::Throwable::printRawStackTrace (java::io::PrintWriter *wr) if (!stackTrace) return; - void **p = (void **)elements (stackTrace); - int depth = stackTrace->length / sizeof p[0]; + int depth = stackTrace->length / sizeof (void *); + void *p[depth]; + memcpy (p, elements (stackTrace), sizeof p); _Jv_name_finder finder (_Jv_ThisExecutable ()); -- cgit v1.1