diff options
| author | Dana Robinson <43805+derobins@users.noreply.github.com> | 2023-09-03 18:12:53 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-03 18:12:53 (GMT) |
| commit | 90852b28c729e963a7ebf4b21fe216a44ce7ad2b (patch) | |
| tree | ecf4e03b91bedd929bef5babeea8b2d9dc004ae3 /src/H5Omessage.c | |
| parent | b1e65333b5c19457c53d5d6e7fd5e9add81e307d (diff) | |
| download | hdf5-90852b28c729e963a7ebf4b21fe216a44ce7ad2b.zip hdf5-90852b28c729e963a7ebf4b21fe216a44ce7ad2b.tar.gz hdf5-90852b28c729e963a7ebf4b21fe216a44ce7ad2b.tar.bz2 | |
Cherry-pick of CVE fixes from 1.10 (#3490)
* CVE-2016-4332
* CVE-2018-11202
* CVE-2018-11205
* CVE-2018-13866
* CVE-2018-13867
* CVE-2018-13871
* CVE-2018-15671
Diffstat (limited to 'src/H5Omessage.c')
| -rw-r--r-- | src/H5Omessage.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/H5Omessage.c b/src/H5Omessage.c index 8b06586..8c2d4de 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_NOAPI_NOINIT_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); |