Changeset 19024 in josm

Timestamp:

2024-04-02T18:57:56+02:00 (5 weeks ago)

Author:

taylor.smock

Message:

Fix #23550: Error when deserializing PBF Blog (patch by giora.kosoi, modified)

Modifications are as follows:

• Added non-regression test
• Removed unnecessary changes in Blob

Location:

trunk

Files:

• src/org/openstreetmap/josm/io/OsmPbfReader.java (modified) (4 diffs)
• test/unit/org/openstreetmap/josm/gui/io/importexport/OsmPbfImporterTest.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/io/OsmPbfReader.java

@@ -185 +185 @@
         int size = Integer.MIN_VALUE;
         Blob.CompressionType type = null;
-        ProtobufRecord current = null;
+        ProtobufRecord current;
+        // Needed since size and compression type + compression data may be in a different order
+        byte [] bytes = null;
         while (parser.hasNext() && cis.getBytesRead() - start < header.dataSize()) {
             current = new ProtobufRecord(baos, parser);
@@ -191 +193 @@
                 case 1:
                     type = Blob.CompressionType.raw;
+                    bytes = current.getBytes();
                     break;
                 case 2:
@@ -197 +200 @@
                 case 3:
                     type = Blob.CompressionType.zlib;
+                    bytes = current.getBytes();
                     break;
                 case 4:
                     type = Blob.CompressionType.lzma;
+                    bytes = current.getBytes();
                     break;
                 case 5:
                     type = Blob.CompressionType.bzip2;
+                    bytes = current.getBytes();
                     break;
                 case 6:
                     type = Blob.CompressionType.lz4;
+                    bytes = current.getBytes();
                     break;
                 case 7:
                     type = Blob.CompressionType.zstd;
+                    bytes = current.getBytes();
                     break;
                 default:
@@ -217 +225 @@
             throw new IllegalStateException("Compression type not found, pbf may be malformed");
         }
-        return new Blob(size, type, current.getBytes());
+        return new Blob(size, type, bytes);
     }
 

trunk/test/unit/org/openstreetmap/josm/gui/io/importexport/OsmPbfImporterTest.java

@@ -143 +143 @@
         assertNotNull(dataSet.getPrimitiveById(9223372036854775806L, OsmPrimitiveType.RELATION));
     }
+
+    /**
+     * Non-regression test for #23550: Error when deserializing PBF blob when generator writes the blob <i>then</i>
+     * the compression type.
+     */
+    @Test
+    void testNonRegression23550() {
+        final byte[] badData = HEADER_DATA.clone();
+        final byte[] sizeInfo = Arrays.copyOfRange(badData, 18, 21);
+        for (int i = 18; i < badData.length - sizeInfo.length; i++) {
+            badData[i] = badData[i + sizeInfo.length];
+        }
+        System.arraycopy(sizeInfo, 0, badData, badData.length - 3, 3);
+        // the data doesn't include any "real" data, but the problematic code path is exercised by the header parsing code.
+        assertDoesNotThrow(() -> importer.parseDataSet(new ByteArrayInputStream(badData), NullProgressMonitor.INSTANCE));
+    }
 }