Changeset 31063 in osm for applications/editors/josm/plugins/seachart/src/s57/S57dec.java

Timestamp:

2015-03-27T09:22:05+01:00 (10 years ago)

Author:

malcolmh

Message:

[SeaChart] update

File:

• applications/editors/josm/plugins/seachart/src/s57/S57dec.java (modified) (2 diffs)

applications/editors/josm/plugins/seachart/src/s57/S57dec.java

@@ -22 +22 @@
                 byte[] leader = new byte[24];
                 boolean ddr = false;
-                int length;
-                int fields;
+                int length = 0;
+                int fields = 0;;
                 int mapfl, mapfp, mapts, entry;
                 String tag;
@@ -39 +39 @@
                 
                 while (in.read(leader) == 24) {
+                        try {
                         length = Integer.parseInt(new String(leader, 0, 5)) - 24;
                         ddr = (leader[6] == 'L');
                         fields = Integer.parseInt(new String(leader, 12, 5)) - 24;
+                        } catch (Exception e) {
+                                System.err.println("Invalid file format - Encrypted/compressed ENC file?");
+                                System.exit(-1);
+                        }
                         mapfl = leader[20] - '0';
                         mapfp = leader[21] - '0';