[svn-r7842] Purpose:

    Bug fix

Description:
    Variable length strings and sequences with NULL pointers were not handled
by library, causing problems access the data.  This also affected fill values
for variable-length datatypes.

Solution:
    Address the issues in the library by detecting NULL sequences/strings
and avoid trying to convert them.

    Patched up dumper to display NULL sequences/strings.

Platforms tested:
    FreeBSD 4.9 (sleipnir)
    h5committest

4 files changed, 75 insertions, 4 deletions

diff --git a/tools/h5dump/h5dump.c b/tools/h5dump/h5dump.c
index 77ce159..d79f4ee 100644
--- a/tools/h5dump/h5dump.c
+++ b/tools/h5dump/h5dump.c
@@ -4846,7 +4846,8 @@ xml_print_strs(hid_t did, int source)
     for (i = 0; i < ssiz; i++) {
         if(is_vlstr) {
             onestring = *(char **)bp;
-            str_size = (size_t)strlen(onestring);
+            if(onestring)
+                str_size = (size_t)strlen(onestring);
         } else {    
     	    strncpy(onestring, bp, tsiz);
             str_size = tsiz;
@@ -4854,7 +4855,7 @@ xml_print_strs(hid_t did, int source)
 	indentation(indent + COL);
 
 	if (!onestring) {
-	    printf("\"%s\"\n", "NULL");
+	    printf("NULL\n");
 	} else {
             char *t_onestring = xml_escape_the_string(onestring, (int)str_size);
 
diff --git a/tools/h5dump/h5dumpgentest.c b/tools/h5dump/h5dumpgentest.c
index 0356b2b..901f427 100644
--- a/tools/h5dump/h5dumpgentest.c
+++ b/tools/h5dump/h5dumpgentest.c
@@ -68,6 +68,7 @@
 #define FILE40  "tattr2.h5"
 #define FILE41  "tcompound_complex.h5"
 #define FILE42  "tnamed_dtype_attr.h5"
+#define FILE43 "tvldtypes5.h5"
 
 
 /* prototypes */
@@ -145,6 +146,10 @@ typedef struct s1_t {
 #define F42_TYPENAME "Datatype"
 #define F42_ATTRNAME "Attribute"
 
+/* "File 43" macros */
+/* Name of dataset to create in datafile                              */
+#define F43_DSETNAME "Dataset"
+
 static void gent_group(void)
 {
     hid_t fid, group;
@@ -2196,6 +2201,67 @@ static void gent_vldatatypes4(void)
     assert(ret>=0);
 }
 
+/* Generate a variable-length dataset with NULL values in it */
+static void gent_vldatatypes5(void)
+{
+    hvl_t wdata [SPACE1_DIM1];
+    hid_t		fid1;		      
+    hid_t		dataset;	    
+    hid_t		sid1;
+    hid_t		tid1;
+    hsize_t		dims1[] = {SPACE1_DIM1};
+    int                 i,j;          /* counting variable */
+    herr_t		ret;		/* Generic return value  */
+
+    /* initialize data for dataset */
+    for(i=0; i<SPACE1_DIM1; i++) {
+        if(i%2) {
+            wdata[i].len=0;
+            wdata[i].p=NULL;
+        } /* end if */
+        else {
+            wdata[i].len=i+5;
+            wdata[i].p=malloc(sizeof(unsigned)*(i+5));
+            for(j=0; j<i+5; j++)
+                ((unsigned *)wdata[i].p)[j]=j*2;
+        } /* end else */
+    } /* end for */
+
+    /* Create file */
+    fid1 = H5Fcreate (FILE43, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+    assert(fid1>0);
+
+    /* Create dataspace for datasets */
+    sid1 = H5Screate_simple (SPACE1_RANK, dims1, NULL);
+    assert(sid1>0);
+
+    /* Create a datatype to refer to */
+    tid1 = H5Tvlen_create (H5T_NATIVE_UINT);
+    assert(tid1>0);
+
+    /* Create a dataset */
+    dataset = H5Dcreate (fid1, F43_DSETNAME, tid1, sid1, H5P_DEFAULT);
+    assert(dataset>0);
+
+    ret = H5Dwrite (dataset, tid1, H5S_ALL, H5S_ALL, H5P_DEFAULT, wdata);
+    assert(ret>=0);
+
+    ret = H5Dclose (dataset);
+    assert(ret>=0);
+
+    ret = H5Dvlen_reclaim (tid1, sid1, H5P_DEFAULT, wdata);
+    assert(ret>=0);
+
+    ret = H5Tclose (tid1);
+    assert(ret>=0);
+
+    ret = H5Sclose (sid1);
+    assert(ret>=0);
+
+    ret = H5Fclose (fid1);
+    assert(ret>=0);
+}
+
 static void gent_array1(void)
 {
     int wdata[SPACE1_DIM1][ARRAY1_DIM1];   /* Information to write */
@@ -2884,8 +2950,8 @@ static void gent_vlstr(void)
     const char *wdata[SPACE1_DIM1]= {
         "Four score and seven years ago our forefathers brought forth on this continent a new nation,",
         "conceived in liberty and dedicated to the proposition that all men are created equal.",
-        "Now we are engaged in a great civil war,",
-        "testing whether that nation or any nation so conceived and so dedicated can long endure."
+        "",
+        NULL
         };   /* Information to write */
     const char *string_att= "This is the string for the attribute";
     hid_t  fid1;  /* HDF5 File IDs  */
@@ -4288,6 +4354,7 @@ int main(void)
     gent_vldatatypes2();
     gent_vldatatypes3();
     gent_vldatatypes4();
+    gent_vldatatypes5();
 
     gent_array1();
     gent_array2();
diff --git a/tools/h5dump/testh5dump.sh b/tools/h5dump/testh5dump.sh
index 2e214d8..c0b5165 100755
--- a/tools/h5dump/testh5dump.sh
+++ b/tools/h5dump/testh5dump.sh
@@ -147,6 +147,7 @@ TOOLTEST tvldtypes1.ddl tvldtypes1.h5
 TOOLTEST tvldtypes2.ddl tvldtypes2.h5
 TOOLTEST tvldtypes3.ddl tvldtypes3.h5
 TOOLTEST tvldtypes4.ddl tvldtypes4.h5
+TOOLTEST tvldtypes5.ddl tvldtypes5.h5
 
 #test for file with variable length string data
 TOOLTEST tvlstr.ddl tvlstr.h5
diff --git a/tools/h5dump/testh5dumpxml.sh b/tools/h5dump/testh5dumpxml.sh
index b7c6f54..d5e3ad5 100755
--- a/tools/h5dump/testh5dumpxml.sh
+++ b/tools/h5dump/testh5dumpxml.sh
@@ -126,6 +126,8 @@ TOOLTEST tarray7.h5.xml --xml tarray7.h5
 TOOLTEST tvldtypes1.h5.xml --xml tvldtypes1.h5
 TOOLTEST tvldtypes2.h5.xml --xml tvldtypes2.h5
 TOOLTEST tvldtypes3.h5.xml --xml tvldtypes3.h5
+TOOLTEST tvldtypes4.h5.xml --xml tvldtypes4.h5
+TOOLTEST tvldtypes5.h5.xml --xml tvldtypes5.h5
 TOOLTEST tvlstr.h5.xml --xml tvlstr.h5
 TOOLTEST tsaf.h5.xml --xml tsaf.h5
 TOOLTEST tempty.h5.xml --xml tempty.h5