diff options
| author | Larry Knox <lrknox@hdfgroup.org> | 2023-08-04 21:47:50 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-04 21:47:50 (GMT) |
| commit | f3de9ee39d9c5d24389cb652ce1a583e61d40af2 (patch) | |
| tree | 70b5bf96bfc853daf565b20114b22c7f1124c95a /src/H5Abtree2.c | |
| parent | 4cab7b08a0892a4fc92808e069084fdcf0931b4f (diff) | |
| download | hdf5-f3de9ee39d9c5d24389cb652ce1a583e61d40af2.zip hdf5-f3de9ee39d9c5d24389cb652ce1a583e61d40af2.tar.gz hdf5-f3de9ee39d9c5d24389cb652ce1a583e61d40af2.tar.bz2 | |
Merge hdf5_1_14 changes 07-29 to 08-04 (#3355)
* Fix loading plugin fails with missing directory GH issue #3248 (#3323)
* Switch parallel compression to use vector I/O (#3245) (#3327)
Updates parallel compression feature to use vector I/O instead of
creating and passing down MPI derived types to VFD
* Fix incorrect error check in H5Ofill.c for undefined fill values (#3312) (#3328)
* Fix H5Otoken_to_str call in h5dump and other minor cleanup (#3314) (#3329)
* Fix h5repack for variable-length datatyped datasets (#3331) (#3333)
* Merge Made HGOTO_ERROR a do-while loop changes from develop (#3334)
* Merge Fixes the last of the -Wextra-semi-stmt warnings #3326 (#3338)
* Fix assertion failure in H5D__mpio_collective_filtered_vec_io (#3340) (#3350)
* Merges from develop Aug 2-4 (#3354)
* Fix CVE-2018-11202 (#3330)
A malformed file could result in chunk index memory leaks. Under most
conditions (i.e., when the --enable-using-memchecker option is NOT
used), this would result in a small memory leak and and infinite loop
and abort when shutting down the library. The infinite loop would be
due to the "free list" package not being able to clear its resources
so the library couldn't shut down. When the "using a memory checker"
option is used, the free lists are disabled so there is just a memory
leak with no abort on library shutdown.
The chunk index resources are now correctly cleaned up when reading
misparsed files and valgrind confirms no memory leaks.
* Fix CVE-2018-13867 (#3336)
* Windows runtime items go into the bin folder (#3320)
* Commit changes to generated file generated by autogen.sh: configure,
H5Einit.h, and H5Tconv.c.
* Committing clang-format changes
Diffstat (limited to 'src/H5Abtree2.c')
| -rw-r--r-- | src/H5Abtree2.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/H5Abtree2.c b/src/H5Abtree2.c index 1de8a27..a25cd34 100644 --- a/src/H5Abtree2.c +++ b/src/H5Abtree2.c @@ -151,7 +151,7 @@ H5A__dense_fh_name_cmp(const void *obj, size_t obj_len, void *_udata) /* Decode attribute information */ if (NULL == (attr = (H5A_t *)H5O_msg_decode(udata->f, NULL, H5O_ATTR_ID, obj_len, (const unsigned char *)obj))) - HGOTO_ERROR(H5E_OHDR, H5E_CANTDECODE, FAIL, "can't decode attribute") + HGOTO_ERROR(H5E_OHDR, H5E_CANTDECODE, FAIL, "can't decode attribute"); /* Compare the string values */ udata->cmp = HDstrcmp(udata->name, attr->shared->name); @@ -167,7 +167,7 @@ H5A__dense_fh_name_cmp(const void *obj, size_t obj_len, void *_udata) /* Make callback */ if ((udata->found_op)(attr, &took_ownership, udata->found_op_data) < 0) - HGOTO_ERROR(H5E_OHDR, H5E_CANTOPERATE, FAIL, "attribute found callback failed") + HGOTO_ERROR(H5E_OHDR, H5E_CANTOPERATE, FAIL, "attribute found callback failed"); } /* end if */ done: @@ -261,7 +261,7 @@ H5A__dense_btree2_name_compare(const void *_bt2_udata, const void *_bt2_rec, int /* Check if the user's attribute and the B-tree's attribute have the same name */ if (H5HF_op(fheap, &bt2_rec->id, H5A__dense_fh_name_cmp, &fh_udata) < 0) - HGOTO_ERROR(H5E_HEAP, H5E_CANTCOMPARE, FAIL, "can't compare btree2 records") + HGOTO_ERROR(H5E_HEAP, H5E_CANTCOMPARE, FAIL, "can't compare btree2 records"); /* Callback will set comparison value */ *result = fh_udata.cmp; |