# HG changeset patch
# User dsamersoff
# Date 1425472608 0
# Node ID 96c46dd5302742eaa8017aee5803abc76dea5ae9
# Parent  f74dbdd457543edbf9b5d6341d1b1ef39d5bfbdd# Parent  28e75d810c6ed9a0b7b107c739e13bb2f6c7e8e9
Merge

diff -r f74dbdd45754 -r 96c46dd53027 agent/src/os/solaris/proc/saproc.cpp
--- a/agent/src/os/solaris/proc/saproc.cpp	Fri May 17 17:24:20 2013 +0200
+++ b/agent/src/os/solaris/proc/saproc.cpp	Wed Mar 04 12:36:48 2015 +0000
@@ -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);
   }