am 7242bf1a: Merge "Make readHeader check the header size before using it."

* commit '7242bf1a159b909db8a7c74e786e2391a4361d85':
  Make readHeader check the header size before using it.

1 files changed, 3 insertions, 2 deletions

diff --git a/java/src/com/android/inputmethod/latin/makedict/BinaryDictInputOutput.java b/java/src/com/android/inputmethod/latin/makedict/BinaryDictInputOutput.java
index e2fa0231d..e0874bbd5 100644
--- a/java/src/com/android/inputmethod/latin/makedict/BinaryDictInputOutput.java
+++ b/java/src/com/android/inputmethod/latin/makedict/BinaryDictInputOutput.java
@@ -1683,13 +1683,14 @@ public final class BinaryDictInputOutput {
         final HashMap<String, String> attributes = new HashMap<String, String>();
         final int headerSize;
         headerSize = buffer.readInt();
-        populateOptions(buffer, headerSize, attributes);
-        buffer.position(headerSize);
 
         if (headerSize < 0) {
             throw new UnsupportedFormatException("header size can't be negative.");
         }
 
+        populateOptions(buffer, headerSize, attributes);
+        buffer.position(headerSize);
+
         final FileHeader header = new FileHeader(headerSize,
                 new FusionDictionary.DictionaryOptions(attributes,
                         0 != (optionsFlags & FormatSpec.GERMAN_UMLAUT_PROCESSING_FLAG),