From a9761ef5d0c376008043684e4845cf8f6b9950b2 Mon Sep 17 00:00:00 2001 From: ian Date: Tue, 8 May 2007 00:29:43 +0000 Subject: [PATCH] PR java/31842 * java/lang/natString.cc (_Jv_FormatInt): Avoid undefined signed overflow. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@124530 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/ChangeLog | 6 ++++++ libjava/java/lang/natString.cc | 8 ++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 079c8e2a208..385e26d8cdd 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,9 @@ +2007-05-07 Ian Lance Taylor + + PR java/31842 + * java/lang/natString.cc (_Jv_FormatInt): Avoid undefined signed + overflow. + 2007-05-07 Keith Seitz * classpath/lib/gnu/classpath/jdwp/Jdwp.class: Regenerate. diff --git a/libjava/java/lang/natString.cc b/libjava/java/lang/natString.cc index 39590a3e4e0..f177c23ccc4 100644 --- a/libjava/java/lang/natString.cc +++ b/libjava/java/lang/natString.cc @@ -371,11 +371,11 @@ _Jv_FormatInt (jchar* bufend, jint num) if (num < 0) { isNeg = true; - num = -(num); - if (num < 0) + if (num != (jint) -2147483648U) + num = -(num); + else { - // Must be MIN_VALUE, so handle this special case. - // FIXME use 'unsigned jint' for num. + // Handle special case of MIN_VALUE. *--ptr = '8'; num = 214748364; } -- 2.11.4.GIT