From 85665276a976289d2a50f34e7dd989d718e7a47a Mon Sep 17 00:00:00 2001
From: Alan Liu <alansliu@gmail.com>
Date: Mon, 29 Sep 2003 23:18:03 +0000
Subject: [PATCH] ICU-3280 reject out-of-range Unicode escape

X-SVN-Rev: 13239
---
 icu4j/src/com/ibm/icu/impl/Utility.java | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/icu4j/src/com/ibm/icu/impl/Utility.java b/icu4j/src/com/ibm/icu/impl/Utility.java
index 43d782ae723..baad68e1f80 100755
--- a/icu4j/src/com/ibm/icu/impl/Utility.java
+++ b/icu4j/src/com/ibm/icu/impl/Utility.java
@@ -5,8 +5,8 @@
  *******************************************************************************
  *
  * $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/impl/Utility.java,v $
- * $Date: 2003/09/24 22:06:27 $
- * $Revision: 1.44 $
+ * $Date: 2003/09/29 23:18:03 $
+ * $Revision: 1.45 $
  *
  *****************************************************************************************
  */
@@ -800,6 +800,9 @@ public final class Utility {
                 }
                 ++offset;
             }
+            if (result < 0 || result >= 0x110000) {
+                return -1;
+            }
             offset16[0] = offset;
             return result;
         }
@@ -911,7 +914,7 @@ public final class Utility {
             }
             if (result < 0 || result >= 0x110000) {
                 chars.setPos(save);
-                result = -1;
+                return -1;
             }           
             return result;
         }