From 7d2d3bed473aa853f0b2f06559c7080515a65d28 Mon Sep 17 00:00:00 2001
From: Allen Byrne <50328838+byrnHDF@users.noreply.github.com>
Date: Fri, 5 Feb 2021 16:37:52 -0600
Subject: 1 12 changes for sanitize=address (#314)

* OESS-98 fix tools test for plugins

* sync fork

* Merge of changes from dev

* Move problem option to bottom of the list until fixed

* HDFFV-11106 - fix parsing optional args

* HDFFV-11106 add note

* grammer fix

* Whitespace after clang formatting

* Undo format version 11 changes

* Update check to working version

* Merge workflow and minor changes from develop

* Update supported platforms

* PR#3 merge from develop
---
 c++/test/tvlstr.cpp             | 2 +-
 hl/c++/examples/ptExampleFL.cpp | 2 +-
 hl/test/test_file_image.c       | 2 ++
 hl/test/test_table.c            | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/c++/test/tvlstr.cpp b/c++/test/tvlstr.cpp
index 8f0c0ab..77bf378 100644
--- a/c++/test/tvlstr.cpp
+++ b/c++/test/tvlstr.cpp
@@ -187,7 +187,7 @@ test_vlstring_dataset()
         // Test scalar type dataset with 1 value.
         dset1 = root.createDataSet("test_scalar_small", vlst, ds_space);
 
-        dynstring_ds_write = (char *)HDcalloc(1, sizeof(char));
+        dynstring_ds_write = (char *)HDcalloc(2, sizeof(char));
         HDmemset(dynstring_ds_write, 'A', 1);
 
         // Write data to the dataset, then read it back.
diff --git a/hl/c++/examples/ptExampleFL.cpp b/hl/c++/examples/ptExampleFL.cpp
index d0b62da..3b1c655 100644
--- a/hl/c++/examples/ptExampleFL.cpp
+++ b/hl/c++/examples/ptExampleFL.cpp
@@ -73,7 +73,7 @@ main(void)
     if (err < 0)
         fprintf(stderr, "Error getting packet count.");
 
-    printf("Number of packets in packet table after five appends: %d\n", count);
+    printf("Number of packets in packet table after five appends: %llu\n", count);
 
     /* Initialize packet table's "current record" */
     ptable.ResetIndex();
diff --git a/hl/test/test_file_image.c b/hl/test/test_file_image.c
index 712107e..e1ee02d 100644
--- a/hl/test/test_file_image.c
+++ b/hl/test/test_file_image.c
@@ -506,6 +506,8 @@ test_file_image(size_t open_images, size_t nflags, unsigned *flags)
     } /* end for */
 
     /* release temporary working buffers */
+    for (i = 0; i < open_images; i++)
+        HDfree(filename[i]);
     HDfree(filename);
     HDfree(file_id);
     HDfree(dset_id);
diff --git a/hl/test/test_table.c b/hl/test/test_table.c
index 2f98f4a..d7f68e4 100644
--- a/hl/test/test_table.c
+++ b/hl/test/test_table.c
@@ -1272,7 +1272,7 @@ test_table(hid_t fid, int do_write)
         /* write the new longitude and latitude information to all the records */
         nfields  = 2;
         start    = 0;
-        nrecords = NRECORDS;
+        nrecords = NRECORDS_ADD;
         if (H5TBwrite_fields_index(fid, "table12", nfields, field_index_pos, start, nrecords,
                                    sizeof(position_t), field_offset_pos, field_sizes_pos, position_in) < 0)
             goto out;
-- 
cgit v0.12