diff options
| author |   Ken Wakasa <kwakasa@google.com> | 2013-08-13 08:14:43 +0000 |
|---|---|---|
| committer |   Android (Google) Code Review <android-gerrit@google.com> | 2013-08-13 08:14:43 +0000 |
| commit | 7242bf1a159b909db8a7c74e786e2391a4361d85 (patch) | |
| tree | 0a609fae0bc94c4c7f1afccf6d8c0b8c1728dd9c /java/src | |
| parent | 1e48fd0323de55bb18ee136ea507d6474d579c68 (diff) | |
| parent | b7bb9c97224f34253e9bcefa1f1a6b2fdb776bbe (diff) | |
| download | latinime-7242bf1a159b909db8a7c74e786e2391a4361d85.tar.gz latinime-7242bf1a159b909db8a7c74e786e2391a4361d85.tar.xz latinime-7242bf1a159b909db8a7c74e786e2391a4361d85.zip | |
Merge "Make readHeader check the header size before using it."
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/makedict/BinaryDictInputOutput.java | 5 |
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), |