Merge branch 'upstream-ffs' into UpstreamFFS

* upstream-ffs: ffs 2019-05-06 (25606724)
ornladios · May 6, 2019 · eb7c0bf · eb7c0bf
2 parents 422e8db + 2baa087
commit eb7c0bf
Show file tree

Hide file tree

Showing 3 changed files with 838 additions and 0 deletions.
diff --git a/thirdparty/ffs/ffs/ffs/ffs.c b/thirdparty/ffs/ffs/ffs/ffs.c
@@ -572,6 +572,11 @@ handle_subfield(FFSBuffer buf, FMFormat f, estate s, int data_offset, int parent
 	    }
 	}
 	size = determine_size(f, buf, parent_offset, t->next);
+	if (size == 0)  {
+	    quick_put_ulong(&src_spec, 0,
+			    (char*)buf->tmp_buffer + data_offset);
+	    return 1;
+	}
 	if ((marshal_info == NULL) || (marshal_info->type != FFSSubsampleArrayField)) {
 	    if (!s->copy_all && field_is_flat(f, t->next)) {
 		/* leave data where it sits */

diff --git a/thirdparty/ffs/ffs/ffs/tests/CMakeLists.txt b/thirdparty/ffs/ffs/ffs/tests/CMakeLists.txt
@@ -15,6 +15,10 @@ ADD_EXECUTABLE(marshal_test2 marshal_test2.c)
 TARGET_LINK_LIBRARIES(marshal_test2 ffs)
 ADD_TEST(NAME marshal_test2 COMMAND marshal_test2)
 
+ADD_EXECUTABLE(adios2_bug adios2_bug.c)
+TARGET_LINK_LIBRARIES(adios2_bug ffs)
+ADD_TEST(NAME adios2_bug COMMAND adios2_bug)
+
 foreach (PROG ${PROGS} )
     ADD_EXECUTABLE(${PROG} ${PROG}.c test_funcs.c)
     TARGET_LINK_LIBRARIES(${PROG} ffs)