8272249: Better properties of loaded Properties

Reviewed-by: naoto, lancea, rhalade, mschoene

Author: JoeWang-Java

src/java.base/share/classes/jdk/internal/util/xml/impl/Parser.java

@@ -30,6 +30,7 @@
 import java.io.InputStreamReader;
 import java.io.Reader;
 import java.io.UnsupportedEncodingException;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
 import jdk.internal.org.xml.sax.InputSource;
@@ -42,7 +43,11 @@ public abstract class Parser {
 
     public static final String FAULT = "";
     protected static final int BUFFSIZE_READER = 512;
+    // Initial buffer (mBuff) size
     protected static final int BUFFSIZE_PARSER = 128;
+    // Max buffer size
+    private static final int MAX_ARRAY_SIZE = 1024 << 16;
+
     /**
      * The end of stream character.
      */
@@ -525,6 +530,10 @@ private void dtd() throws Exception {
         mPh = PH_DTD;  // DTD
         for (short st = 0; st >= 0;) {
             ch = getch();
+            // report error if EOS is reached while parsing the DTD
+            if (ch == EOS) {
+                panic(FAULT);
+            }
             switch (st) {
                 case 0:     // read the document type name
                     if (chtyp(ch) != ' ') {
@@ -1664,6 +1673,10 @@ private void cdat()
         mBuffIdx = -1;
         for (short st = 0; st >= 0;) {
             ch = getch();
+            // report error if EOS is reached while parsing the DTD
+            if (ch == EOS) {
+                panic(FAULT);
+            }
             switch (st) {
                 case 0:     // the first '[' of the CDATA open
                     if (ch == '[') {
@@ -2525,7 +2538,7 @@ private char bkeyword()
     }
 
     /**
-     * Reads a single or double quotted string in to the buffer.
+     * Reads a single or double quoted string into the buffer.
      *
      * This method resolves entities inside a string unless the parser parses
      * DTD.
@@ -2660,7 +2673,7 @@ protected abstract void bflash_ws()
      * @param ch The character to append to the buffer.
      * @param mode The normalization mode.
      */
-    private void bappend(char ch, char mode) {
+    private void bappend(char ch, char mode) throws Exception {
         //              This implements attribute value normalization as
         //              described in the XML specification [#3.3.3].
         switch (mode) {
@@ -2710,16 +2723,9 @@ private void bappend(char ch, char mode) {
      *
      * @param ch The character to append to the buffer.
      */
-    private void bappend(char ch) {
-        try {
-            mBuff[++mBuffIdx] = ch;
-        } catch (Exception exp) {
-            //          Double the buffer size
-            char buff[] = new char[mBuff.length << 1];
-            System.arraycopy(mBuff, 0, buff, 0, mBuff.length);
-            mBuff = buff;
-            mBuff[mBuffIdx] = ch;
-        }
+    private void bappend(char ch) throws Exception {
+        ensureCapacity(++mBuffIdx);
+        mBuff[mBuffIdx] = ch;
     }
 
     /**
@@ -2729,14 +2735,9 @@ private void bappend(char ch) {
      * @param cidx The character buffer (mChars) start index.
      * @param bidx The parser buffer (mBuff) start index.
      */
-    private void bcopy(int cidx, int bidx) {
+    private void bcopy(int cidx, int bidx) throws Exception {
         int length = mChIdx - cidx;
-        if ((bidx + length + 1) >= mBuff.length) {
-            //          Expand the buffer
-            char buff[] = new char[mBuff.length + length];
-            System.arraycopy(mBuff, 0, buff, 0, mBuff.length);
-            mBuff = buff;
-        }
+        ensureCapacity(bidx + length + 1);
         System.arraycopy(mChars, cidx, mBuff, bidx, length);
         mBuffIdx += length;
     }
@@ -3429,4 +3430,23 @@ protected Pair del(Pair pair) {
 
         return next;
     }
+
+    private void ensureCapacity(int minCapacity) throws Exception {
+        if (mBuff == null) {
+            int newCapacity = minCapacity > BUFFSIZE_PARSER ?
+                    minCapacity + BUFFSIZE_PARSER : BUFFSIZE_PARSER;
+            mBuff = new char[newCapacity];
+            return;
+        }
+
+        if (mBuff.length <= minCapacity) {
+            int size = mBuff.length << 1;
+            int newCapacity = size > minCapacity ? size : minCapacity + BUFFSIZE_PARSER;
+            if (newCapacity < 0 || newCapacity > MAX_ARRAY_SIZE) {
+                panic(FAULT);
+            }
+
+            mBuff = Arrays.copyOf(mBuff, newCapacity);
+        }
+    }
 }