Fix incorrect sizes for memset() used in some places (#142)

maksqwe · gnanabaskaran · commit 57b54727618c · 2017-07-03T15:24:48.000+05:30
* Fix incorrect size for memset() in the JclHeader.h

* Fix incorrect size for memset in RecursiveMakeDir

* Fix another incorrect size for memset()

* Fix one more wrong memset() size
diff --git a/CodeXL/Components/CpuProfiling/Backend/AMDTThreadProfileAPI/src/Windows/tpCollectImpl.cpp b/CodeXL/Components/CpuProfiling/Backend/AMDTThreadProfileAPI/src/Windows/tpCollectImpl.cpp
@@ -111,7 +111,7 @@ AMDTResult tpCollectImpl::tpClear()
     }
 
     m_callstack = false;
-    memset(m_logFilePath, 0, TP_MAX_ETL_PATH_LEN);
+    memset(m_logFilePath, 0, TP_MAX_ETL_PATH_LEN * sizeof(wchar_t));
     m_sessionHandle = 0;
     m_tpState = AMDT_THREAD_PROFILE_STATE_UNINITIALIZED;
 
@@ -157,7 +157,7 @@ bool tpCollectImpl::tpGetUndocAPI()
 
 AMDTResult tpCollectImpl::tpInitialize()
 {
-    memset(m_logFilePath, 0, TP_MAX_ETL_PATH_LEN);
+    memset(m_logFilePath, 0, TP_MAX_ETL_PATH_LEN * sizeof(wchar_t));
 
     return AMDT_STATUS_OK;
 }
@@ -428,4 +428,4 @@ AMDTResult tpCollectImpl::tpStopThreadProfile()
     }
 
     return status;
-} // tpStopThreadProfile
+} // tpStopThreadProfile
diff --git a/CodeXL/Components/CpuProfiling/ProfilingAgents/AMDTClrProfAgent/src/ClrProfCallback.cpp b/CodeXL/Components/CpuProfiling/ProfilingAgents/AMDTClrProfAgent/src/ClrProfCallback.cpp
@@ -1737,7 +1737,7 @@ int ClrProfCallBack::RecursiveMakeDir(wchar_t* dir)
     wchar_t temp_dir[FILENAME_MAX];
     wchar_t* next_dir = dir;
 
-    memset(temp_dir, 0, FILENAME_MAX);
+    memset(temp_dir, 0, FILENAME_MAX * sizeof(wchar_t));
 
     while ((next_dir = wcschr(next_dir, L'\\')) != NULL)
     {
diff --git a/CodeXL/Components/CpuProfiling/ProfilingAgents/AMDTProfilingAgentsData/inc/JclHeader.h b/CodeXL/Components/CpuProfiling/ProfilingAgents/AMDTProfilingAgentsData/inc/JclHeader.h
@@ -57,7 +57,7 @@ struct JclHeader
         hdrInfo.numRecords = 0;
         hdrInfo.is32Bit    = 0;
 
-        memset(appName, 0, OS_MAX_PATH);
+        memset(appName, 0, OS_MAX_PATH * sizeof(wchar_t));
     }
 };
 
@@ -78,9 +78,9 @@ struct JitLoadRecord
 
     JitLoadRecord()
     {
-        memset(classFunctionName, 0, OS_MAX_PATH);
-        memset(jncFileName, 0, OS_MAX_PATH);
-        memset(srcFileName, 0, OS_MAX_PATH);
+        memset(classFunctionName, 0, OS_MAX_PATH * sizeof(wchar_t));
+        memset(jncFileName, 0, OS_MAX_PATH * sizeof(wchar_t));
+        memset(srcFileName, 0, OS_MAX_PATH * sizeof(wchar_t));
     }
 };
 
diff --git a/CodeXL/Components/PowerProfiling/Backend/AMDTPowerProfileAPI/src/AMDTPowerProfileDataAccess.cpp b/CodeXL/Components/PowerProfiling/Backend/AMDTPowerProfileAPI/src/AMDTPowerProfileDataAccess.cpp
@@ -258,7 +258,7 @@ AMDTResult GetCummulativePidProfDataInstatant(AMDTUInt32* pPIDCount,
     else
     {
         AMDTUInt32 count = 0;
-        memset(g_pidInfo, 0, sizeof(AMDTUInt32) * MAX_PID_CNT);
+        memset(g_pidInfo, 0, sizeof(AMDTPwrProcessInfo) * MAX_PID_CNT);
 
         for (AMDTUInt32 idx = 0; idx < entries; ++idx)
         {

Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,7 @@ AMDTResult tpCollectImpl::tpClear()`
`111`	`111`	`}`
`112`	`112`
`113`	`113`	`m_callstack = false;`
`114`		`- memset(m_logFilePath, 0, TP_MAX_ETL_PATH_LEN);`
	`114`	`+ memset(m_logFilePath, 0, TP_MAX_ETL_PATH_LEN * sizeof(wchar_t));`
`115`	`115`	`m_sessionHandle = 0;`
`116`	`116`	`m_tpState = AMDT_THREAD_PROFILE_STATE_UNINITIALIZED;`
`117`	`117`
`@@ -157,7 +157,7 @@ bool tpCollectImpl::tpGetUndocAPI()`
`157`	`157`
`158`	`158`	`AMDTResult tpCollectImpl::tpInitialize()`
`159`	`159`	`{`
`160`		`- memset(m_logFilePath, 0, TP_MAX_ETL_PATH_LEN);`
	`160`	`+ memset(m_logFilePath, 0, TP_MAX_ETL_PATH_LEN * sizeof(wchar_t));`
`161`	`161`
`162`	`162`	`return AMDT_STATUS_OK;`
`163`	`163`	`}`
`@@ -428,4 +428,4 @@ AMDTResult tpCollectImpl::tpStopThreadProfile()`
`428`	`428`	`}`
`429`	`429`
`430`	`430`	`return status;`
`431`		`-} // tpStopThreadProfile`
	`431`	`+} // tpStopThreadProfile`
Original file line number	Diff line number	Diff line change
`@@ -1737,7 +1737,7 @@ int ClrProfCallBack::RecursiveMakeDir(wchar_t* dir)`
`1737`	`1737`	`wchar_t temp_dir[FILENAME_MAX];`
`1738`	`1738`	`wchar_t* next_dir = dir;`
`1739`	`1739`
`1740`		`- memset(temp_dir, 0, FILENAME_MAX);`
	`1740`	`+ memset(temp_dir, 0, FILENAME_MAX * sizeof(wchar_t));`
`1741`	`1741`
`1742`	`1742`	`while ((next_dir = wcschr(next_dir, L'\\')) != NULL)`
`1743`	`1743`	`{`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ struct JclHeader`
`57`	`57`	`hdrInfo.numRecords = 0;`
`58`	`58`	`hdrInfo.is32Bit = 0;`
`59`	`59`
`60`		`- memset(appName, 0, OS_MAX_PATH);`
	`60`	`+ memset(appName, 0, OS_MAX_PATH * sizeof(wchar_t));`
`61`	`61`	`}`
`62`	`62`	`};`
`63`	`63`
`@@ -78,9 +78,9 @@ struct JitLoadRecord`
`78`	`78`
`79`	`79`	`JitLoadRecord()`
`80`	`80`	`{`
`81`		`- memset(classFunctionName, 0, OS_MAX_PATH);`
`82`		`- memset(jncFileName, 0, OS_MAX_PATH);`
`83`		`- memset(srcFileName, 0, OS_MAX_PATH);`
	`81`	`+ memset(classFunctionName, 0, OS_MAX_PATH * sizeof(wchar_t));`
	`82`	`+ memset(jncFileName, 0, OS_MAX_PATH * sizeof(wchar_t));`
	`83`	`+ memset(srcFileName, 0, OS_MAX_PATH * sizeof(wchar_t));`
`84`	`84`	`}`
`85`	`85`	`};`
`86`	`86`
Original file line number	Diff line number	Diff line change
`@@ -258,7 +258,7 @@ AMDTResult GetCummulativePidProfDataInstatant(AMDTUInt32* pPIDCount,`
`258`	`258`	`else`
`259`	`259`	`{`
`260`	`260`	`AMDTUInt32 count = 0;`
`261`		`- memset(g_pidInfo, 0, sizeof(AMDTUInt32) * MAX_PID_CNT);`
	`261`	`+ memset(g_pidInfo, 0, sizeof(AMDTPwrProcessInfo) * MAX_PID_CNT);`
`262`	`262`
`263`	`263`	`for (AMDTUInt32 idx = 0; idx < entries; ++idx)`
`264`	`264`	`{`