[svn-r15458] Purpose: Modify the library to take the proper action when files with incorrectinactive/jpeg_converter

    datatype versions are encountered.

Description: The library now recognizes some problems with datatype versions in
H5O_decode_helper(), and, if not performing strict format checks, automatically
corrects them.  Framework added for other message decode routines to
automatically correct file errors.  Datatype version information added to
h5debug.

Tested: kagiso, smirom, linew (h5committest)

58 files changed, 14 insertions, 3 deletions

diff --git a/tools/h5repack/testfiles/h5repack_attr.h5 b/tools/h5repack/testfiles/h5repack_attr.h5
index 70ad02d..fe066db 100644
--- a/tools/h5repack/testfiles/h5repack_attr.h5
+++ b/tools/h5repack/testfiles/h5repack_attr.h5
diff --git a/tools/h5repack/testfiles/h5repack_objs.h5 b/tools/h5repack/testfiles/h5repack_objs.h5
index 199adc5..0a0c041 100644
--- a/tools/h5repack/testfiles/h5repack_objs.h5
+++ b/tools/h5repack/testfiles/h5repack_objs.h5
diff --git a/tools/lib/h5trav.c b/tools/lib/h5trav.c
index 0ed6a30..bb8014d 100644
--- a/tools/lib/h5trav.c
+++ b/tools/lib/h5trav.c
@@ -159,8 +159,11 @@ traverse_cb(hid_t loc_id, const char *path, const H5L_info_t *linfo,
         H5O_info_t oinfo;
 
         /* Get information about the object */
-        if(H5Oget_info_by_name(loc_id, path, &oinfo, H5P_DEFAULT) < 0)
+        if(H5Oget_info_by_name(loc_id, path, &oinfo, H5P_DEFAULT) < 0) {
+            if(new_name)
+                HDfree(new_name);
             return(H5_ITER_ERROR);
+        }
 
         /* If the object has multiple links, add it to the list of addresses
          *  already visited, if it isn't there already
@@ -171,12 +174,20 @@ traverse_cb(hid_t loc_id, const char *path, const H5L_info_t *linfo,
 
         /* Make 'visit object' callback */
         if(udata->visitor->visit_obj)
-            (*udata->visitor->visit_obj)(full_name, &oinfo, already_visited, udata->visitor->udata);
+            if((*udata->visitor->visit_obj)(full_name, &oinfo, already_visited, udata->visitor->udata) < 0) {
+                if(new_name)
+                    HDfree(new_name);
+                return(H5_ITER_ERROR);
+            }
     } /* end if */
     else {
         /* Make 'visit link' callback */
         if(udata->visitor->visit_lnk)
-            (*udata->visitor->visit_lnk)(full_name, linfo, udata->visitor->udata);
+            if((*udata->visitor->visit_lnk)(full_name, linfo, udata->visitor->udata) < 0) {
+                if(new_name)
+                    HDfree(new_name);
+                return(H5_ITER_ERROR);
+            }
     } /* end else */
 
     if(new_name)
diff --git a/tools/testfiles/tarray1.h5 b/tools/testfiles/tarray1.h5
index d62d752..90371f2 100644
--- a/tools/testfiles/tarray1.h5
+++ b/tools/testfiles/tarray1.h5
diff --git a/tools/testfiles/tarray2.h5 b/tools/testfiles/tarray2.h5
index 5582c5a..e2e53e8 100644
--- a/tools/testfiles/tarray2.h5
+++ b/tools/testfiles/tarray2.h5
diff --git a/tools/testfiles/tarray3.h5 b/tools/testfiles/tarray3.h5
index 0c75d79..580d846 100644
--- a/tools/testfiles/tarray3.h5
+++ b/tools/testfiles/tarray3.h5
diff --git a/tools/testfiles/tarray4.h5 b/tools/testfiles/tarray4.h5
index c2811d2..b34efb8 100644
--- a/tools/testfiles/tarray4.h5
+++ b/tools/testfiles/tarray4.h5
diff --git a/tools/testfiles/tarray5.h5 b/tools/testfiles/tarray5.h5
index 8cb45b8..55ebf46 100644
--- a/tools/testfiles/tarray5.h5
+++ b/tools/testfiles/tarray5.h5
diff --git a/tools/testfiles/tarray6.h5 b/tools/testfiles/tarray6.h5
index 5cf95cf..b4af19b 100644
--- a/tools/testfiles/tarray6.h5
+++ b/tools/testfiles/tarray6.h5
diff --git a/tools/testfiles/tarray7.h5 b/tools/testfiles/tarray7.h5
index 0b49f04..74089ea 100644
--- a/tools/testfiles/tarray7.h5
+++ b/tools/testfiles/tarray7.h5
diff --git a/tools/testfiles/tattr.h5 b/tools/testfiles/tattr.h5
index 578a20a..fd14b58 100644
--- a/tools/testfiles/tattr.h5
+++ b/tools/testfiles/tattr.h5
diff --git a/tools/testfiles/tattr2.h5 b/tools/testfiles/tattr2.h5
index c7e3359..c40f3f7 100644
--- a/tools/testfiles/tattr2.h5
+++ b/tools/testfiles/tattr2.h5
diff --git a/tools/testfiles/tbitfields.h5 b/tools/testfiles/tbitfields.h5
index c14b1f0..11087f0 100644
--- a/tools/testfiles/tbitfields.h5
+++ b/tools/testfiles/tbitfields.h5
diff --git a/tools/testfiles/tchar.h5 b/tools/testfiles/tchar.h5
index 03bd6d5..4d23ea9 100644
--- a/tools/testfiles/tchar.h5
+++ b/tools/testfiles/tchar.h5
diff --git a/tools/testfiles/tcompound.h5 b/tools/testfiles/tcompound.h5
index 37ddd27..d1ec650 100644
--- a/tools/testfiles/tcompound.h5
+++ b/tools/testfiles/tcompound.h5
diff --git a/tools/testfiles/tcompound2.h5 b/tools/testfiles/tcompound2.h5
index 20577a6..98e80bd 100644
--- a/tools/testfiles/tcompound2.h5
+++ b/tools/testfiles/tcompound2.h5
diff --git a/tools/testfiles/tcompound_complex.h5 b/tools/testfiles/tcompound_complex.h5
index 5eed316..5c6274f 100644
--- a/tools/testfiles/tcompound_complex.h5
+++ b/tools/testfiles/tcompound_complex.h5
diff --git a/tools/testfiles/tdatareg.h5 b/tools/testfiles/tdatareg.h5
index 1f911b1..62a889f 100644
--- a/tools/testfiles/tdatareg.h5
+++ b/tools/testfiles/tdatareg.h5
diff --git a/tools/testfiles/tdset.h5 b/tools/testfiles/tdset.h5
index 3cb9a69..71dcb91 100644
--- a/tools/testfiles/tdset.h5
+++ b/tools/testfiles/tdset.h5
diff --git a/tools/testfiles/tdset2.h5 b/tools/testfiles/tdset2.h5
index 7681231..5e17cfd 100644
--- a/tools/testfiles/tdset2.h5
+++ b/tools/testfiles/tdset2.h5
diff --git a/tools/testfiles/tempty.h5 b/tools/testfiles/tempty.h5
index ad4c2c4..d7d903f 100644
--- a/tools/testfiles/tempty.h5
+++ b/tools/testfiles/tempty.h5
diff --git a/tools/testfiles/tenum.h5 b/tools/testfiles/tenum.h5
index 667be98..b1300d8 100644
--- a/tools/testfiles/tenum.h5
+++ b/tools/testfiles/tenum.h5
diff --git a/tools/testfiles/tfilters.h5 b/tools/testfiles/tfilters.h5
index 5b5f4bb..c28b1b1 100644
--- a/tools/testfiles/tfilters.h5
+++ b/tools/testfiles/tfilters.h5
diff --git a/tools/testfiles/tfvalues.h5 b/tools/testfiles/tfvalues.h5
index cb3172c..a6af958 100644
--- a/tools/testfiles/tfvalues.h5
+++ b/tools/testfiles/tfvalues.h5
diff --git a/tools/testfiles/tgroup.h5 b/tools/testfiles/tgroup.h5
index 13e10b4..565fb67 100644
--- a/tools/testfiles/tgroup.h5
+++ b/tools/testfiles/tgroup.h5
diff --git a/tools/testfiles/tgrp_comments.h5 b/tools/testfiles/tgrp_comments.h5
index b72edcc..70c7cce 100644
--- a/tools/testfiles/tgrp_comments.h5
+++ b/tools/testfiles/tgrp_comments.h5
diff --git a/tools/testfiles/tlarge_objname.h5 b/tools/testfiles/tlarge_objname.h5
index 0c59387..707d7b6 100644
--- a/tools/testfiles/tlarge_objname.h5
+++ b/tools/testfiles/tlarge_objname.h5
diff --git a/tools/testfiles/tlonglinks.h5 b/tools/testfiles/tlonglinks.h5
index 98ab61c..f54e5f5 100644
--- a/tools/testfiles/tlonglinks.h5
+++ b/tools/testfiles/tlonglinks.h5
diff --git a/tools/testfiles/tloop.h5 b/tools/testfiles/tloop.h5
index 12390fd..d7a2f47 100644
--- a/tools/testfiles/tloop.h5
+++ b/tools/testfiles/tloop.h5
diff --git a/tools/testfiles/tloop2.h5 b/tools/testfiles/tloop2.h5
index c54411e..995bfab 100644
--- a/tools/testfiles/tloop2.h5
+++ b/tools/testfiles/tloop2.h5
diff --git a/tools/testfiles/tmany.h5 b/tools/testfiles/tmany.h5
index 10e29d6..1f2bbaa 100644
--- a/tools/testfiles/tmany.h5
+++ b/tools/testfiles/tmany.h5
diff --git a/tools/testfiles/tname-amp.h5 b/tools/testfiles/tname-amp.h5
index eeaeb67..27ab521 100644
--- a/tools/testfiles/tname-amp.h5
+++ b/tools/testfiles/tname-amp.h5
diff --git a/tools/testfiles/tname-apos.h5 b/tools/testfiles/tname-apos.h5
index c86d2dd..42d0fc3 100644
--- a/tools/testfiles/tname-apos.h5
+++ b/tools/testfiles/tname-apos.h5
diff --git a/tools/testfiles/tname-gt.h5 b/tools/testfiles/tname-gt.h5
index b852be8..fabd154 100644
--- a/tools/testfiles/tname-gt.h5
+++ b/tools/testfiles/tname-gt.h5
diff --git a/tools/testfiles/tname-lt.h5 b/tools/testfiles/tname-lt.h5
index 698cf82..6b13375 100644
--- a/tools/testfiles/tname-lt.h5
+++ b/tools/testfiles/tname-lt.h5
diff --git a/tools/testfiles/tname-quot.h5 b/tools/testfiles/tname-quot.h5
index be7f448..eb8d6cc 100644
--- a/tools/testfiles/tname-quot.h5
+++ b/tools/testfiles/tname-quot.h5
diff --git a/tools/testfiles/tname-sp.h5 b/tools/testfiles/tname-sp.h5
index f21d79f..0201efd 100644
--- a/tools/testfiles/tname-sp.h5
+++ b/tools/testfiles/tname-sp.h5
diff --git a/tools/testfiles/tnestedcomp.h5 b/tools/testfiles/tnestedcomp.h5
index 47d2f68..b777ee3 100644
--- a/tools/testfiles/tnestedcomp.h5
+++ b/tools/testfiles/tnestedcomp.h5
diff --git a/tools/testfiles/tnodata.h5 b/tools/testfiles/tnodata.h5
index baaa3fb..8e0a89d 100644
--- a/tools/testfiles/tnodata.h5
+++ b/tools/testfiles/tnodata.h5
diff --git a/tools/testfiles/tnullspace.h5 b/tools/testfiles/tnullspace.h5
index 54242ca..b5dac5d 100644
--- a/tools/testfiles/tnullspace.h5
+++ b/tools/testfiles/tnullspace.h5
diff --git a/tools/testfiles/tobjref.h5 b/tools/testfiles/tobjref.h5
index 5b6b43b..ef42ff3 100644
--- a/tools/testfiles/tobjref.h5
+++ b/tools/testfiles/tobjref.h5
diff --git a/tools/testfiles/topaque.h5 b/tools/testfiles/topaque.h5
index 284a16d..d56b594 100644
--- a/tools/testfiles/topaque.h5
+++ b/tools/testfiles/topaque.h5
diff --git a/tools/testfiles/tref-escapes-at.h5 b/tools/testfiles/tref-escapes-at.h5
index c03c201..641513c 100644
--- a/tools/testfiles/tref-escapes-at.h5
+++ b/tools/testfiles/tref-escapes-at.h5
diff --git a/tools/testfiles/tref-escapes.h5 b/tools/testfiles/tref-escapes.h5
index b9bff90..6c7638b 100644
--- a/tools/testfiles/tref-escapes.h5
+++ b/tools/testfiles/tref-escapes.h5
diff --git a/tools/testfiles/tref.h5 b/tools/testfiles/tref.h5
index 12453be..73b4be5 100644
--- a/tools/testfiles/tref.h5
+++ b/tools/testfiles/tref.h5
diff --git a/tools/testfiles/tsaf.h5 b/tools/testfiles/tsaf.h5
index 88c1d72..c84c5b6 100644
--- a/tools/testfiles/tsaf.h5
+++ b/tools/testfiles/tsaf.h5
diff --git a/tools/testfiles/tslink.h5 b/tools/testfiles/tslink.h5
index c6b1b2d..753b62d 100644
--- a/tools/testfiles/tslink.h5
+++ b/tools/testfiles/tslink.h5
diff --git a/tools/testfiles/tstr.h5 b/tools/testfiles/tstr.h5
index 8539841..af5384f 100644
--- a/tools/testfiles/tstr.h5
+++ b/tools/testfiles/tstr.h5
diff --git a/tools/testfiles/tstr2.h5 b/tools/testfiles/tstr2.h5
index de168e8..d3b1588 100644
--- a/tools/testfiles/tstr2.h5
+++ b/tools/testfiles/tstr2.h5
diff --git a/tools/testfiles/tstr3.h5 b/tools/testfiles/tstr3.h5
index 5dee4c5..9f9112f 100644
--- a/tools/testfiles/tstr3.h5
+++ b/tools/testfiles/tstr3.h5
diff --git a/tools/testfiles/tstring-at.h5 b/tools/testfiles/tstring-at.h5
index c166dea..aa17960 100644
--- a/tools/testfiles/tstring-at.h5
+++ b/tools/testfiles/tstring-at.h5
diff --git a/tools/testfiles/tstring.h5 b/tools/testfiles/tstring.h5
index 41fb96d..667fe78 100644
--- a/tools/testfiles/tstring.h5
+++ b/tools/testfiles/tstring.h5
diff --git a/tools/testfiles/tvldtypes1.h5 b/tools/testfiles/tvldtypes1.h5
index df31249..b5b2bd7 100644
--- a/tools/testfiles/tvldtypes1.h5
+++ b/tools/testfiles/tvldtypes1.h5
diff --git a/tools/testfiles/tvldtypes2.h5 b/tools/testfiles/tvldtypes2.h5
index edb3e77..65bf63f 100644
--- a/tools/testfiles/tvldtypes2.h5
+++ b/tools/testfiles/tvldtypes2.h5
diff --git a/tools/testfiles/tvldtypes3.h5 b/tools/testfiles/tvldtypes3.h5
index e2e1697..dd4aca7 100644
--- a/tools/testfiles/tvldtypes3.h5
+++ b/tools/testfiles/tvldtypes3.h5
diff --git a/tools/testfiles/tvldtypes4.h5 b/tools/testfiles/tvldtypes4.h5
index ae5f967..70dc73e 100644
--- a/tools/testfiles/tvldtypes4.h5
+++ b/tools/testfiles/tvldtypes4.h5
diff --git a/tools/testfiles/tvldtypes5.h5 b/tools/testfiles/tvldtypes5.h5
index 702e45b..776c020 100644
--- a/tools/testfiles/tvldtypes5.h5
+++ b/tools/testfiles/tvldtypes5.h5
diff --git a/tools/testfiles/tvlstr.h5 b/tools/testfiles/tvlstr.h5
index c00defc..769d811 100644
--- a/tools/testfiles/tvlstr.h5
+++ b/tools/testfiles/tvlstr.h5