Allow malformed CSVs with too many headers in the CSV parser (#1942)

enso-org · Aug 12, 2021 · 7c45b92 · 7c45b92
1 parent eb7e7d0
commit 7c45b92
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/RELEASES.md b/RELEASES.md
@@ -21,6 +21,8 @@
 
 - Added support for writing tables to file as JSON
   ([#1937](https://github.com/enso-org/enso/pull/1937)).
+- Added support for parsing CSV files with too many headers declared
+  ([#1942](https://github.com/enso-org/enso/pull/1942)).
 
 # Enso 0.2.23 (2021-08-09)
 

diff --git a/std-bits/table/src/main/java/org/enso/table/format/csv/Parser.java b/std-bits/table/src/main/java/org/enso/table/format/csv/Parser.java
@@ -62,11 +62,13 @@ public Table parse(InputStream inputStream) {
       builders = initBuilders(row.length);
     }
     for (int i = 0; i < builders.length; i++) {
-      builders[i] = builders[i].parseAndAppend(handleNa(row[i]));
+      String item = i < row.length ? handleNa(row[i]) : null;
+      builders[i] = builders[i].parseAndAppend(item);
     }
     while ((row = parser.parseNext()) != null) {
       for (int i = 0; i < builders.length; i++) {
-        builders[i] = builders[i].parseAndAppend(handleNa(row[i]));
+        String item = i < row.length ? handleNa(row[i]) : null;
+        builders[i] = builders[i].parseAndAppend(item);
       }
     }
     Column[] columns = new Column[builders.length];