Changeset 36160 in osm for applications/editors/josm/plugins

Timestamp:

2023-10-05T15:52:30+02:00 (14 months ago)

Author:

taylor.smock

Message:

Fix AIOOBE when reading more data from a file than indicated by file header

Location:

applications/editors/josm/plugins/FIT/src/main/java/org/openstreetmap/josm/plugins/fit/lib

Files:

• FitReader.java (modified) (6 diffs)
• utils/CountingInputStream.java (added)

applications/editors/josm/plugins/FIT/src/main/java/org/openstreetmap/josm/plugins/fit/lib/FitReader.java

@@ -27 +27 @@
 import org.openstreetmap.josm.plugins.fit.lib.records.internal.FitRecordNormalHeader;
 import org.openstreetmap.josm.plugins.fit.lib.records.internal.IField;
+import org.openstreetmap.josm.plugins.fit.lib.utils.CountingInputStream;
 import org.openstreetmap.josm.plugins.fit.lib.utils.NumberUtils;
 
@@ -48 +49 @@
      */
     public static FitData[] read(InputStream inputStream, FitReaderOptions... options) throws FitException {
-        final var bufferedInputStream = inputStream.markSupported() ? inputStream
-                : new BufferedInputStream(inputStream);
+        final var bufferedInputStream = new CountingInputStream(
+                inputStream.markSupported() ? inputStream : new BufferedInputStream(inputStream));
         final var optionsSet = options.length == 0 ? EnumSet.noneOf(FitReaderOptions.class)
                 : EnumSet.of(options[0], options);
@@ -55 +56 @@
         try {
             final var header = readFitHeader(bufferedInputStream);
+            final var headerSize = bufferedInputStream.bytesRead();
             bufferedInputStream.mark(1);
             var localMessageHeaders = new FitDefinitionMessage[1];
@@ -61 +63 @@
             var offsetAddition = 0;
             byte lastOffset = 0;
-            while (bufferedInputStream.read() != -1) {
+            while (bufferedInputStream.read() != -1
+                    && bufferedInputStream.bytesRead() < header.dataSize() - headerSize) {
                 bufferedInputStream.reset();
                 final var nextRecordHeader = readNextRecordHeader(bufferedInputStream);
@@ -125 +128 @@
         } catch (FitException fitException) {
             handleException(optionsSet, fitException);
-        } catch (IOException ioException) {
+        } catch (IllegalArgumentException | IOException ioException) {
             handleException(optionsSet, new FitException(ioException));
         }
@@ -199 +202 @@
         final var globalMessageNumber = NumberUtils.decodeInt(2, littleEndian, inputStream);
         final int numberOfFields = inputStream.read();
-        final var fitFields = new ArrayList<FitField>(numberOfFields);
+        final var fitFields = new ArrayList<FitField>(Math.max(0, numberOfFields));
         for (var i = 0; i < numberOfFields; i++) {
             fitFields.add(readNextField(inputStream));