| commit | 6114a650b7246ad2d651637235e9ba1435d1091d | [log] [tgz] |
|---|---|---|
| author | Viktor Stöhr <viktor.stoehr@efs-auto.com> | Fri Apr 05 14:37:58 2019 +0200 |
| committer | Viktor Stöhr <viktor.stoehr@efs-auto.com> | Fri Apr 05 14:37:58 2019 +0200 |
| tree | 7ccd9e3ab674bf19a94cb5cd3ad2eaaa15365a0f | |
| parent | 0fe9c555386f4618ecdcb16ceb686498466d5c51 [diff] |
prevent processing of undefined blocks (could result in very high memory consumption) Signed-off-by: Viktor Stöhr <viktor.stoehr@efs-auto.com>
diff --git a/build.gradle b/build.gradle index 8356fcc..0458dc4 100644 --- a/build.gradle +++ b/build.gradle
@@ -15,7 +15,7 @@ description = 'MDF Sorter' group = 'org.eclipse.mdm' -version = '1.0.4' +version = '1.0.5' apply plugin: 'java' apply plugin: 'eclipse'
diff --git a/src/main/java/org/eclipse/mdm/mdfsorter/MDFSorter.java b/src/main/java/org/eclipse/mdm/mdfsorter/MDFSorter.java index c7e20d8..2831075 100644 --- a/src/main/java/org/eclipse/mdm/mdfsorter/MDFSorter.java +++ b/src/main/java/org/eclipse/mdm/mdfsorter/MDFSorter.java
@@ -43,7 +43,7 @@ /** * Version of this tool as String. (Used in the file Header) */ - public static final String VERSIONSTRING = "1.0.3"; + public static final String VERSIONSTRING = "1.0.5"; /** * The logger for this application
diff --git a/src/main/java/org/eclipse/mdm/mdfsorter/mdf4/MDF4Parser.java b/src/main/java/org/eclipse/mdm/mdfsorter/mdf4/MDF4Parser.java index 78ce0a4..b3c88b9 100644 --- a/src/main/java/org/eclipse/mdm/mdfsorter/mdf4/MDF4Parser.java +++ b/src/main/java/org/eclipse/mdm/mdfsorter/mdf4/MDF4Parser.java
@@ -254,7 +254,7 @@ sp = new TXBLOCK(blk); break; default: - System.err.println("Unknown block of type " + blk.getId() + " found."); + throw new IOException("Unknown block of type " + blk.getId() + " found, mdf file seems to be broken!"); } if (blk.getId().equals("##DZ")) {
diff --git a/src/main/java/org/eclipse/mdm/mdfsorter/mdf4/ZippedDataCache.java b/src/main/java/org/eclipse/mdm/mdfsorter/mdf4/ZippedDataCache.java index 193bc53..3546347 100644 --- a/src/main/java/org/eclipse/mdm/mdfsorter/mdf4/ZippedDataCache.java +++ b/src/main/java/org/eclipse/mdm/mdfsorter/mdf4/ZippedDataCache.java
@@ -93,7 +93,6 @@ } cachedata.add(uncompressedData); cacheblocks.add(dzblk); - System.out.println("Cache size:" + cacheblocks.size()); } /**