Merge pull request #1100 from Unity-Technologies/debugger-agent/crash-on-clear-assembly

joshpeterson · web-flow · commit 15cd016d741f · 2018-12-05T09:24:02.000-05:00
Fix parenthesis position in debugger-agent
diff --git a/mono/mini/debugger-agent.c b/mono/mini/debugger-agent.c
@@ -8051,7 +8051,7 @@ clear_assembly_from_modifier (EventRequest *req, Modifier *m, MonoAssembly *asse
 {
 	int i;
 
-	if (m->kind == MOD_KIND_EXCEPTION_ONLY && m->data.exc_class && mono_image_get_assembly (mono_class_get_image (m->data.exc_class) == assembly))
+	if (m->kind == MOD_KIND_EXCEPTION_ONLY && m->data.exc_class && mono_image_get_assembly (mono_class_get_image (m->data.exc_class)) == assembly)
 		m->kind = MOD_KIND_NONE;
 	if (m->kind == MOD_KIND_ASSEMBLY_ONLY && m->data.assemblies) {
 		int count = 0, match_count = 0, pos;

Original file line number	Diff line number	Diff line change
`@@ -8051,7 +8051,7 @@ clear_assembly_from_modifier (EventRequest req, Modifier m, MonoAssembly *asse`
`8051`	`8051`	`{`
`8052`	`8052`	`int i;`
`8053`	`8053`
`8054`		`- if (m->kind == MOD_KIND_EXCEPTION_ONLY && m->data.exc_class && mono_image_get_assembly (mono_class_get_image (m->data.exc_class) == assembly))`
	`8054`	`+ if (m->kind == MOD_KIND_EXCEPTION_ONLY && m->data.exc_class && mono_image_get_assembly (mono_class_get_image (m->data.exc_class)) == assembly)`
`8055`	`8055`	`m->kind = MOD_KIND_NONE;`
`8056`	`8056`	`if (m->kind == MOD_KIND_ASSEMBLY_ONLY && m->data.assemblies) {`
`8057`	`8057`	`int count = 0, match_count = 0, pos;`