mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2025-04-18 17:40:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1709 in HDFFV/hdf5 from ~JHENDERSON/hdf5:develop to develop

Browse Source 
* commit '802b2927254b1de163589b1e4eaced47ee81ad07':
  Assign NULL to func_name/file_name/desc error entry pointers when clearing error stack
  Avoid clearing error stack when calling H5Eget_msg()
This commit is contained in:
Jordan Henderson 2019-05-21 09:51:36 -05:00
commit f37a17a6ce
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/H5E.c
View File

@ -866,7 +866,7 @@ H5Eget_msg(hid_t msg_id, H5E_type_t *type, char *msg_str, size_t size)
H5E_msg_t *msg; /* Pointer to error message */
ssize_t ret_value = -1; /* Return value */
FUNC_ENTER_API((-1))
FUNC_ENTER_API_NOCLEAR((-1))
H5TRACE4("Zs", "i*Et*sz", msg_id, type, msg_str, size);
/* Get the message object */

6
src/H5Eint.c
View File

@ -883,11 +883,11 @@ H5E__clear_entries(H5E_t *estack, size_t nentries)
/* Release strings */
if(error->func_name)
H5MM_xfree((void *)error->func_name); /* Casting away const OK - QAK */
error->func_name = (const char *) H5MM_xfree((void *)error->func_name); /* Casting away const OK - QAK */
if(error->file_name)
H5MM_xfree((void *)error->file_name); /* Casting away const OK - QAK */
error->file_name = (const char *) H5MM_xfree((void *)error->file_name); /* Casting away const OK - QAK */
if(error->desc)
H5MM_xfree((void *)error->desc); /* Casting away const OK - QAK */
error->desc = (const char *) H5MM_xfree((void *)error->desc); /* Casting away const OK - QAK */
} /* end for */
/* Decrement number of errors on stack */