Mercurial > hg > graal-jvmci-8
changeset 22863:28e75d810c6e
8025667: Warning from b62 for hotspot.agent.src.os.solaris.proc: use after free
Summary: move free call few lines down
Reviewed-by: dholmes, sspitsyn
author | dsamersoff |
---|---|
date | Wed, 04 Mar 2015 02:46:07 -0800 |
parents | 1f60a119863a |
children | 96c46dd53027 |
files | agent/src/os/solaris/proc/saproc.cpp |
diffstat | 1 files changed, 6 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/agent/src/os/solaris/proc/saproc.cpp Mon Mar 02 11:08:09 2015 +0100 +++ b/agent/src/os/solaris/proc/saproc.cpp Wed Mar 04 02:46:07 2015 -0800 @@ -661,30 +661,30 @@ // read FileMapHeader size_t n = read(fd, pheader, sizeof(struct FileMapHeader)); if (n != sizeof(struct FileMapHeader)) { - free(pheader); - close(fd); char errMsg[ERR_MSG_SIZE]; sprintf(errMsg, "unable to read shared archive file map header from %s", classes_jsa); + close(fd); + free(pheader); THROW_NEW_DEBUGGER_EXCEPTION_(errMsg, 1); } // check file magic if (pheader->_magic != 0xf00baba2) { - free(pheader); - close(fd); char errMsg[ERR_MSG_SIZE]; sprintf(errMsg, "%s has bad shared archive magic 0x%x, expecting 0xf00baba2", classes_jsa, pheader->_magic); + close(fd); + free(pheader); THROW_NEW_DEBUGGER_EXCEPTION_(errMsg, 1); } // check version if (pheader->_version != CURRENT_ARCHIVE_VERSION) { - free(pheader); - close(fd); char errMsg[ERR_MSG_SIZE]; sprintf(errMsg, "%s has wrong shared archive version %d, expecting %d", classes_jsa, pheader->_version, CURRENT_ARCHIVE_VERSION); + close(fd); + free(pheader); THROW_NEW_DEBUGGER_EXCEPTION_(errMsg, 1); }