Code clean-up and added new checks

***NO_CI***

Author: josesimoes

src/CLR/Core/CLR_RT_HeapBlock_WaitForObject.cpp

@@ -29,12 +29,9 @@ HRESULT CLR_RT_HeapBlock_WaitForObject::CreateInstance(
 
     _ASSERTE(sizeof(CLR_RT_HeapBlock_WaitForObject) % 4 == 0);
 
-
     CLR_UINT32 totLength =
         (CLR_UINT32)(sizeof(CLR_RT_HeapBlock_WaitForObject) + cObjects * sizeof(struct CLR_RT_HeapBlock));
-    
-    _ASSERTE(sizeof(CLR_RT_HeapBlock_WaitForObject) % 4 == 0);
-    
+
     CLR_RT_HeapBlock_WaitForObject *wait = EVENTCACHE_EXTRACT_NODE_AS_BYTES(
         g_CLR_RT_EventCache,
         CLR_RT_HeapBlock_WaitForObject,

src/CLR/Core/GarbageCollector_Compaction.cpp

@@ -94,7 +94,7 @@ void CLR_RT_GarbageCollector::Heap_Compact()
     TestPointers_PopulateOld();
 
     CLR_RT_HeapCluster *freeRegion_hc = nullptr;
-    ;
+
     CLR_RT_HeapBlock_Node *freeRegion = nullptr;
 
     CLR_RT_HeapCluster *currentSource_hc = (CLR_RT_HeapCluster *)g_CLR_RT_ExecutionEngine.m_heap.FirstNode();

src/CLR/Core/TypeSystem.cpp

@@ -728,7 +728,12 @@ bool CLR_RT_TypeSpec_Instance::InitializeFromIndex(const CLR_RT_TypeSpec_Index &
         if (element.DataType == DATATYPE_GENERICINST)
         {
             // this is a generic instance, advance one more time to get the generic type definition
-            parser.Advance(element);
+            if (FAILED(parser.Advance(element)))
+            {
+                ClearInstance();
+
+                return false;
+            }
 
             genericTypeDef = element.Class;
         }
@@ -778,14 +783,24 @@ bool CLR_RT_TypeSpec_Instance::ResolveToken(
         CLR_RT_SignatureParser::Element element;
 
         // if this is a generic, advance another one
-        parser.Advance(element);
+        if (FAILED(parser.Advance(element)))
+        {
+            ClearInstance();
+
+            return false;
+        }
 
         levels = element.Levels;
 
         if (element.DataType == DATATYPE_GENERICINST)
         {
             // this is a generic instance, so we need to advance one more time
-            parser.Advance(element);
+            if (FAILED(parser.Advance(element)))
+            {
+                ClearInstance();
+
+                return false;
+            }
 
             genericTypeDef = element.Class;
         }