projects
/
mono.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #2820 from kumpera/license-change-rebased
[mono.git]
/
mono
/
metadata
/
object.c
diff --git
a/mono/metadata/object.c
b/mono/metadata/object.c
index 6525f3fc0969dd71446a62cc20b5c3c1da3b3eb3..dc20b4e83212449db9ba9826eb4a0be57d796369 100644
(file)
--- a/
mono/metadata/object.c
+++ b/
mono/metadata/object.c
@@
-6296,9
+6296,11
@@
MonoString*
mono_ldstr (MonoDomain *domain, MonoImage *image, guint32 idx)
{
MONO_REQ_GC_UNSAFE_MODE;
mono_ldstr (MonoDomain *domain, MonoImage *image, guint32 idx)
{
MONO_REQ_GC_UNSAFE_MODE;
+ MonoError error;
if (image->dynamic) {
if (image->dynamic) {
- MonoString *str = (MonoString *)mono_lookup_dynamic_token (image, MONO_TOKEN_STRING | idx, NULL);
+ MonoString *str = (MonoString *)mono_lookup_dynamic_token (image, MONO_TOKEN_STRING | idx, NULL, &error);
+ mono_error_raise_exception (&error); /* FIXME don't raise here */
return str;
} else {
if (!mono_verifier_verify_string_signature (image, idx, NULL))
return str;
} else {
if (!mono_verifier_verify_string_signature (image, idx, NULL))