Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 855e6a22 authored by Ken Wakasa's avatar Ken Wakasa Committed by Android Git Automerger
Browse files

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

* commit '7242bf1a':
  Make readHeader check the header size before using it.
parents 099fc9d0 7242bf1a
Loading
Loading
Loading
Loading
+3 −2
Original line number Diff line number Diff line
@@ -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),