Correct comparison size of assembly marker
@@ -52,7 +52,7 @@ int s_CLR_RT_fTrace_SimulateSpeed = NANOCLR_TRACE_DEFAULT(c_CLR_RT_
#endif
#if !defined(BUILD_RTM)
-int s_CLR_RT_fTrace_AssemblyOverhead = NANOCLR_TRACE_DEFAULT(c_CLR_RT_Trace_Info,c_CLR_RT_Trace_None);
+int s_CLR_RT_fTrace_AssemblyOverhead = NANOCLR_TRACE_DEFAULT(c_CLR_RT_Trace_Info,c_CLR_RT_Trace_Info);
#endif
#if defined(WIN32)
@@ -1324,7 +1324,7 @@ HRESULT CLR_RT_TypeDescriptor::ExtractTypeIndexFromObject( const CLR_RT_HeapBloc
///////////////////////////////////////////////////////////////////////////////////////////////////
//
-// Keep these strings less than 8-character long!! They are stuffed into an 8-byte structure.
+// Keep this string less than 8-character long (including terminator) because it's stuffed into an 8-byte structure.
//
static const char c_MARKER_ASSEMBLY_V1[] = "NFMRK1";
@@ -1337,7 +1337,7 @@ bool CLR_RECORD_ASSEMBLY::GoodHeader() const
if(this->stringTableVersion != c_CLR_StringTable_Version) return false;
- return memcmp( marker, c_MARKER_ASSEMBLY_V1, sizeof(marker) ) == 0;
+ return memcmp( marker, c_MARKER_ASSEMBLY_V1, sizeof(c_MARKER_ASSEMBLY_V1) ) == 0;
}
bool CLR_RECORD_ASSEMBLY::GoodAssembly() const
