@@ -1007,14 +1007,11 @@ static void
1007
1007
compute_column_offsets (guint32 bitfield , guint8 column_offsets [MONO_TABLE_INFO_MAX_COLUMNS ])
1008
1008
{
1009
1009
int offset = 0 , c = mono_metadata_table_count (bitfield );
1010
- for (int i = 0 ; i < MONO_TABLE_INFO_MAX_COLUMNS ; i ++ ) {
1011
- if (i >= c ) {
1012
- column_offsets [i ] = 0xFFu ;
1013
- } else {
1014
- int size = mono_metadata_table_size (bitfield , i );
1015
- column_offsets [i ] = (guint8 )offset ;
1016
- offset += size ;
1017
- }
1010
+ memset (column_offsets , 0 , MONO_TABLE_INFO_MAX_COLUMNS );
1011
+ for (int i = 0 ; i < c ; i ++ ) {
1012
+ int size = mono_metadata_table_size (bitfield , i );
1013
+ column_offsets [i ] = (guint8 )offset ;
1014
+ offset += size ;
1018
1015
}
1019
1016
}
1020
1017
@@ -1488,16 +1485,10 @@ mono_metadata_decode_row_col_raw (const MonoTableInfo *t, int idx, guint col)
1488
1485
int n ;
1489
1486
guint8 column_offset ;
1490
1487
1491
- guint32 bitfield = t -> size_bitfield ;
1492
-
1493
1488
g_assert (GINT_TO_UINT32 (idx ) < table_info_get_rows (t ));
1494
- g_assert (col < mono_metadata_table_count (bitfield ));
1495
- data = t -> base + idx * t -> row_size ;
1496
-
1497
- n = mono_metadata_table_size (bitfield , col );
1498
- column_offset = t -> column_offsets [col ];
1499
- g_assert (column_offset < 0xFFu );
1500
- data += column_offset ;
1489
+ g_assert (col < mono_metadata_table_count (t -> size_bitfield ));
1490
+ data = t -> base + idx * t -> row_size + t -> column_offsets [col ];
1491
+ n = mono_metadata_table_size (t -> size_bitfield , col );
1501
1492
switch (n ) {
1502
1493
case 1 :
1503
1494
return * data ;
0 commit comments