commit b061cdb0e3a533ad6d6d6ffbd99a1b95d7de2e8b
author Xinliang David Li <davidxl@google.com> Wed Jul 20 05:10:56 2016 +0000
committer Xinliang David Li <davidxl@google.com> Wed Jul 20 05:10:56 2016 +0000
tree 5c66daa4d9f41ae6d898b5f1344deb3ca05553c3
parent 09b99c3a752651da405013fb3e49612d094fb1dd

Minor cleanup -- clear name structure before parsing

llvm-svn: 276089

compiler-rt/lib/profile/InstrProfilingFile.c

diff --git a/compiler-rt/lib/profile/InstrProfilingFile.c b/compiler-rt/lib/profile/InstrProfilingFile.c
index 52715dd..76d81d0 100644
--- a/compiler-rt/lib/profile/InstrProfilingFile.c
+++ b/compiler-rt/lib/profile/InstrProfilingFile.c
@@ -266,6 +266,11 @@
   char *Hostname = &lprofCurFilename.Hostname[0];
   int MergingEnabled = 0;
 
+  /* Clean up cached prefix.  */
+  if (lprofCurFilename.ProfilePathPrefix)
+    free((void *)lprofCurFilename.ProfilePathPrefix);
+  memset(&lprofCurFilename, 0, sizeof(lprofCurFilename));
+
   lprofCurFilename.FilenamePat = FilenamePat;
   /* Check the filename for "%p", which indicates a pid-substitution. */
   for (I = 0; FilenamePat[I]; ++I)
@@ -345,12 +350,6 @@
               getPNSStr(PNS));
   }
 
-  /* Clean up cached prefix.  */
-  if (lprofCurFilename.ProfilePathPrefix) {
-    free((void*)lprofCurFilename.ProfilePathPrefix);
-    lprofCurFilename.ProfilePathPrefix = NULL;
-  }
-
   if (!lprofCurFilename.MergePoolSize)
     truncateCurrentFile();
 }