summaryrefslogtreecommitdiffstats
path: root/testpar
diff options
context:
space:
mode:
authorLarry Knox <lrknox@hdfgroup.org>2023-03-18 01:25:04 (GMT)
committerGitHub <noreply@github.com>2023-03-18 01:25:04 (GMT)
commita01f570f97287295e960633feab4c3908ea318d7 (patch)
tree2e650c7046b014cd1b83942d8e902565fefc5895 /testpar
parentaee6290441102864d7c9a74b2b1521a58a8c7649 (diff)
downloadhdf5-a01f570f97287295e960633feab4c3908ea318d7.zip
hdf5-a01f570f97287295e960633feab4c3908ea318d7.tar.gz
hdf5-a01f570f97287295e960633feab4c3908ea318d7.tar.bz2
Minor merges to 1.10 (#2579)
* Elaborate how cd_values get stored (#2522) * Enclose MESG in do...while loop (#2576) Enclose MSG macro in a do...while loop * Add a clang-format comment about permissions (#2577) * Check for overflow when calculating on-disk attribute data size (#2459) * Remove duplicate code Signed-off-by: Egbert Eich <eich@suse.com> * Add test case for CVE-2021-37501 Bogus sizes in this test case causes the on-disk data size calculation in H5O__attr_decode() to overflow so that the calculated size becomes 0. This causes the read to overflow and h5dump to segfault. This test case was crafted, the test file was not directly generated by HDF5. Test case from: https://github.com/ST4RF4LL/Something_Found/blob/main/HDF5_v1.13.0_h5dump_heap_overflow.md --------- Co-authored-by: Mark (he/his) C. Miller <miller86@llnl.gov> Co-authored-by: glennsong09 <43005495+glennsong09@users.noreply.github.com> Co-authored-by: Dana Robinson <43805+derobins@users.noreply.github.com> Co-authored-by: Egbert Eich <eich@suse.com>
Diffstat (limited to 'testpar')
-rw-r--r--testpar/testpar.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/testpar/testpar.h b/testpar/testpar.h
index 6c380a9..58bcab4 100644
--- a/testpar/testpar.h
+++ b/testpar/testpar.h
@@ -30,8 +30,11 @@
* mesg is not an empty string.
*/
#define MESG(mesg) \
- if (VERBOSE_MED && *mesg != '\0') \
- HDprintf("%s\n", mesg)
+ do { \
+ if (VERBOSE_MED && *mesg != '\0') { \
+ HDprintf("%s\n", mesg); \
+ } \
+ } while (0)
/*
* VRFY: Verify if the condition val is true.