summaryrefslogtreecommitdiffstats
path: root/src/H5Omessage.c
diff options
context:
space:
mode:
authorDana Robinson <43805+derobins@users.noreply.github.com>2023-08-29 12:45:44 (GMT)
committerGitHub <noreply@github.com>2023-08-29 12:45:44 (GMT)
commit6129233f4e5c892623e0533b13de3b987af436ea (patch)
tree1e07eece3afbe221419fd97f3d75c7c70973b1a2 /src/H5Omessage.c
parentbfe867c4cb7b636da21ff4245a2c1da6d96f1955 (diff)
downloadhdf5-6129233f4e5c892623e0533b13de3b987af436ea.zip
hdf5-6129233f4e5c892623e0533b13de3b987af436ea.tar.gz
hdf5-6129233f4e5c892623e0533b13de3b987af436ea.tar.bz2
10 CVE fixes (#3440)
* Fix for CVE-2018-15671 * Fix CVE-2016-4332 * Fix CVE-2018-11202 * Fix CVE-2018-11205 * Fix CVE-2018-13866 * Fix CVE-2018-13867 and CVE-2018-13871
Diffstat (limited to 'src/H5Omessage.c')
-rw-r--r--src/H5Omessage.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/H5Omessage.c b/src/H5Omessage.c
index 43b068d..975767f 100644
--- a/src/H5Omessage.c
+++ b/src/H5Omessage.c
@@ -675,12 +675,11 @@ H5O__msg_free_real(const H5O_msg_class_t *type, void *msg_native)
{
FUNC_ENTER_PACKAGE_NOERR
- /* check args */
- HDassert(type);
+ /* Don't assert on args since this could be called in cleanup code */
if (msg_native) {
H5O__msg_reset_real(type, msg_native);
- if (NULL != (type->free))
+ if (type && type->free)
(type->free)(msg_native);
else
H5MM_xfree(msg_native);