Merge pull request jdart1#6 from Matthies/master

jdart1 · web-flow · commit fb9b8fe37c81 · 2022-10-30T12:31:30.000-07:00
Fix mapping offset for wide dtz tables.
diff --git a/src/tbprobe.c b/src/tbprobe.c
@@ -1562,7 +1562,7 @@ static bool init_table(struct BaseEntry *be, const char *str, int type)
         } else {
           data += (uintptr_t)data & 0x01;
           for (int i = 0; i < 4; i++) {
-            mapIdx[t][i] = (uint16_t)(data + 1 - (uint8_t *)map);
+            mapIdx[t][i] = (uint16_t)((uint16_t*)data + 1 - (uint16_t *)map);
             data += 2 + 2 * read_le_u16(data);
           }
         }

Original file line number	Diff line number	Diff line change
`@@ -1562,7 +1562,7 @@ static bool init_table(struct BaseEntry be, const char str, int type)`
`1562`	`1562`	`} else {`
`1563`	`1563`	`data += (uintptr_t)data & 0x01;`
`1564`	`1564`	`for (int i = 0; i < 4; i++) {`
`1565`		`- mapIdx[t][i] = (uint16_t)(data + 1 - (uint8_t *)map);`
	`1565`	`+ mapIdx[t][i] = (uint16_t)((uint16_t)data + 1 - (uint16_t )map);`
`1566`	`1566`	`data += 2 + 2 * read_le_u16(data);`
`1567`	`1567`	`}`
`1568`	`1568`	`}`