diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 1bce1cb1f3b07e1c1a505c389d9122b7c6b9dd95..c98bc6a992378323800af878e1b5ce126b1fc546 100644
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,8 @@
+2000-11-22  Bryce McKinlay  <bryce@albatross.co.nz>
+
+	* jcf-parse.c (get_constant): Call UT8_CHAR_LENGTH on `utf8', not the
+	scratch buffer.
+
 2000-11-20  Tom Tromey  <tromey@cygnus.com>
 
 	* jv-scan.c (help): Document --complexity.
diff --git a/gcc/java/jcf-parse.c b/gcc/java/jcf-parse.c
index aa56811a630b1e32fd311a1c6616693b4cb19b5b..aebd4a5b112575574fe10a5d1b452cfa8a863a53 100644
--- a/gcc/java/jcf-parse.c
+++ b/gcc/java/jcf-parse.c
@@ -358,7 +358,7 @@ get_constant (jcf, index)
 	for (i = 0; i < str_len; i++)
 	  {
 	    int char_value;
-	    int char_len = UT8_CHAR_LENGTH (*str);
+	    int char_len = UT8_CHAR_LENGTH (*utf8);
 	    switch (char_len)
 	      {
 	      case 1: