diff options
| author | Ziga Mahkovec <ziga.mahkovec@klika.si> | 2005-06-08 17:46:08 +0200 |
|---|---|---|
| committer | Ziga Mahkovec <ziga@gcc.gnu.org> | 2005-06-08 15:46:08 +0000 |
| commit | a6cddf6e809206482551c1d4bf45fb9ca616a62b (patch) | |
| tree | de06061bbe96bf2f6161d3324053a1ea68548502 /libjava | |
| parent | cf2236030765c1af919e1300e526dd574703a307 (diff) | |
| download | gcc-a6cddf6e809206482551c1d4bf45fb9ca616a62b.zip gcc-a6cddf6e809206482551c1d4bf45fb9ca616a62b.tar.gz gcc-a6cddf6e809206482551c1d4bf45fb9ca616a62b.tar.bz2 | |
MessageFormat.java (parse): When parsing strings, check for an empty pattern trailer.
2005-06-08 Ziga Mahkovec <ziga.mahkovec@klika.si>
* java/text/MessageFormat.java (parse): When parsing strings, check
for an empty pattern trailer.
From-SVN: r100761
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 5 | ||||
| -rw-r--r-- | libjava/java/text/MessageFormat.java | 6 |
2 files changed, 10 insertions, 1 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index a5ad66c..043a517 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +2005-06-08 Ziga Mahkovec <ziga.mahkovec@klika.si> + + * java/text/MessageFormat.java (parse): When parsing strings, check + for an empty pattern trailer. + 2005-06-06 Keith Seitz <keiths@redhat.com> * gnu/classpath/jdwp/util/Signature.java: New file. diff --git a/libjava/java/text/MessageFormat.java b/libjava/java/text/MessageFormat.java index 4a24afd..8d53ec2 100644 --- a/libjava/java/text/MessageFormat.java +++ b/libjava/java/text/MessageFormat.java @@ -658,7 +658,11 @@ public class MessageFormat extends Format { // We have a String format. This can lose in a number // of ways, but we give it a shot. - int next_index = sourceStr.indexOf(elements[i].trailer, index); + int next_index; + if (elements[i].trailer.length() > 0) + next_index = sourceStr.indexOf(elements[i].trailer, index); + else + next_index = sourceStr.length(); if (next_index == -1) { pos.setErrorIndex(index); |