Merged PR 159115: Small fix to avoid asserts later

VSadov · VSadov · commit 6e530f494386 · 2019-01-14T20:36:45.000Z
haslineByteOffsetCacheBuffer was read from incorrect offset and as a result could have false positives.
diff --git a/lib/Runtime/ByteCode/ByteCodeSerializer.cpp b/lib/Runtime/ByteCode/ByteCodeSerializer.cpp
@@ -3169,7 +3169,7 @@ class ByteCodeBufferReader
         string16IndexTable = (StringIndexRecord*)ReadInt32(string16s, &string16Count);
         lineCharacterOffsetCacheBuffer = (charcount_t *)ReadInt32(lineInfoCaches, &lineInfoCacheCount);
         byte haslineByteOffsetCacheBuffer;
-        current = ReadByte(lineInfoCaches + sizeof(charcount_t) * lineInfoCacheCount, &haslineByteOffsetCacheBuffer);
+        current = ReadByte((byte*)lineCharacterOffsetCacheBuffer + sizeof(charcount_t) * lineInfoCacheCount, &haslineByteOffsetCacheBuffer);
         if (haslineByteOffsetCacheBuffer)
         {
             lineByteOffsetCacheBuffer = (charcount_t *)current;

Original file line number	Diff line number	Diff line change
`@@ -3169,7 +3169,7 @@ class ByteCodeBufferReader`
`3169`	`3169`	`string16IndexTable = (StringIndexRecord*)ReadInt32(string16s, &string16Count);`
`3170`	`3170`	`lineCharacterOffsetCacheBuffer = (charcount_t *)ReadInt32(lineInfoCaches, &lineInfoCacheCount);`
`3171`	`3171`	`byte haslineByteOffsetCacheBuffer;`
`3172`		`- current = ReadByte(lineInfoCaches + sizeof(charcount_t) * lineInfoCacheCount, &haslineByteOffsetCacheBuffer);`
	`3172`	`+ current = ReadByte((byte)lineCharacterOffsetCacheBuffer + sizeof(charcount_t) lineInfoCacheCount, &haslineByteOffsetCacheBuffer);`
`3173`	`3173`	`if (haslineByteOffsetCacheBuffer)`
`3174`	`3174`	`{`
`3175`	`3175`	`lineByteOffsetCacheBuffer = (charcount_t *)current;`