projects
/
mono.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
4a71f9e
)
[runtime] Don't call mono_raise_exception in ves_icall_Mono_Runtime_GetNativeStackTrace
author
Aleksey Kliger
<aleksey@xamarin.com>
Tue, 29 Mar 2016 21:09:05 +0000
(17:09 -0400)
committer
Aleksey Kliger
<aleksey@xamarin.com>
Wed, 6 Apr 2016 21:14:20 +0000
(17:14 -0400)
mono/metadata/exception.c
patch
|
blob
|
history
diff --git
a/mono/metadata/exception.c
b/mono/metadata/exception.c
index 332ac557d1ee77e5e5eb86213eb59ae6e47beda5..e2e162f702a1efeb69e0226a5a4ab8eedb4d52d4 100644
(file)
--- a/
mono/metadata/exception.c
+++ b/
mono/metadata/exception.c
@@
-940,8
+940,10
@@
ves_icall_Mono_Runtime_GetNativeStackTrace (MonoException *exc)
{
char *trace;
MonoString *res;
- if (!exc)
- mono_raise_exception (mono_get_exception_argument_null ("exception"));
+ if (!exc) {
+ mono_set_pending_exception (mono_get_exception_argument_null ("exception"));
+ return NULL;
+ }
trace = mono_exception_get_native_backtrace (exc);
res = mono_string_new (mono_domain_get (), trace);