diff options
| author | Dana Robinson <43805+derobins@users.noreply.github.com> | 2023-08-30 12:39:33 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-30 12:39:33 (GMT) |
| commit | 4646ac859c5c1ba45c8b864a0dbc713525467d1a (patch) | |
| tree | 002a3f3a180cc40aa87133c895b66e0ca82ac38e /src/H5Omessage.c | |
| parent | 8063108578873e512c4e5432955086c0bb04b878 (diff) | |
| download | hdf5-4646ac859c5c1ba45c8b864a0dbc713525467d1a.zip hdf5-4646ac859c5c1ba45c8b864a0dbc713525467d1a.tar.gz hdf5-4646ac859c5c1ba45c8b864a0dbc713525467d1a.tar.bz2 | |
Bring CVE fixes from develop (#3447)
* Bring CVE fixes from develop
* Fix for CVE-2018-15671
* Fix for CVE-2016-4332
* Update the CVE matrix
Diffstat (limited to 'src/H5Omessage.c')
| -rw-r--r-- | src/H5Omessage.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/src/H5Omessage.c b/src/H5Omessage.c index d76409d..e492ceb 100644 --- a/src/H5Omessage.c +++ b/src/H5Omessage.c @@ -619,13 +619,12 @@ H5O__msg_free_mesg(H5O_mesg_t *mesg) } /* end H5O__msg_free_mesg() */ /*------------------------------------------------------------------------- - * Function: H5O_msg_free_real + * Function: H5O_msg_free_real * - * Purpose: Similar to H5O_msg_reset() except it also frees the message - * pointer. + * Purpose: Similar to H5O_msg_reset() except it also frees the message + * pointer * - * Return: Success: NULL - * Failure: NULL + * Return: NULL (always) * *------------------------------------------------------------------------- */ @@ -634,16 +633,15 @@ H5O_msg_free_real(const H5O_msg_class_t *type, void *msg_native) { FUNC_ENTER_NOAPI_NOINIT_NOERR - /* check args */ - assert(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); - } /* end if */ + } FUNC_LEAVE_NOAPI(NULL) } /* end H5O_msg_free_real() */ |