projects
/
mono.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
11ce9ca
)
[runtime] Fix the size calculation for CustomAttributeType coded indexes, they can...
author
Zoltan Varga
<vargaz@gmail.com>
Tue, 25 Jul 2017 03:20:43 +0000
(23:20 -0400)
committer
GitHub
<noreply@github.com>
Tue, 25 Jul 2017 03:20:43 +0000
(23:20 -0400)
mono/metadata/metadata.c
patch
|
blob
|
history
diff --git
a/mono/metadata/metadata.c
b/mono/metadata/metadata.c
index 133310e69216ef965510445729d7c4cc7ff13861..651538c3c5cb3378ccdd2bef5423c4a81d73b49d 100644
(file)
--- a/
mono/metadata/metadata.c
+++ b/
mono/metadata/metadata.c
@@
-836,21
+836,11
@@
mono_metadata_compute_size (MonoImage *meta, int tableindex, guint32 *result_bit
break;
/*
break;
/*
- * CustomAttributeType: TypeDef, TypeRef, MethodDef,
- * MemberRef and String.
+ * CustomAttributeType: MethodDef, MemberRef.
*/
case MONO_MT_CAT_IDX:
*/
case MONO_MT_CAT_IDX:
- /* String is a heap, if it is wide, we know the size */
- /* See above, nope.
- if (meta->idx_string_wide){
- field_size = 4;
- break;
- }*/
-
- n = MAX (get_nrows (meta, MONO_TABLE_TYPEREF),
- get_nrows (meta, MONO_TABLE_TYPEDEF));
- n = MAX (n, get_nrows (meta, MONO_TABLE_METHOD));
- n = MAX (n, get_nrows (meta, MONO_TABLE_MEMBERREF));
+ n = MAX (get_nrows (meta, MONO_TABLE_METHOD),
+ get_nrows (meta, MONO_TABLE_MEMBERREF));
/* 3 bits to encode */
field_size = rtsize (meta, n, 16-3);
/* 3 bits to encode */
field_size = rtsize (meta, n, 16-3);