character entity handling improved

kobjects · Jun 11, 2003 · 2ced092 · 2ced092
1 parent a5edc27
commit 2ced092
Showing 1 changed file with 12 additions and 6 deletions.
diff --git a/src/org/kxml2/io/KXmlParser.java b/src/org/kxml2/io/KXmlParser.java
@@ -651,12 +651,18 @@ private final void pushEntity()
             int c = read();
             if (c == ';')
                 break;
-            if (relaxed && (c == '<' || c == '&' || c <= ' ')) {
-                if (c != -1) push(c);                
-                return;
-            }
-            if (c == -1)
-                exception(UNEXPECTED_EOF);
+            if (c < 128 
+                && (c < '0' || c > '9')
+                && (c < 'a' || c > 'z')
+                && (c < 'A' || c > 'Z')
+                && c != '_' && c != '-' && c != '#') {
+                    if(!relaxed){
+                        exception("unterminated entity ref"); //; ends with:"+(char)c);            
+                    }
+                    if (c != -1) push(c);                
+                    return;
+                }
+
             push(c);
         }