[metadata] Fix leaks when handling a few attributes (#16850)

monojenkins · web-flow · commit f755f3b53911 · 2019-09-16T20:16:02.000-04:00
[2019-08] [metadata] Fix leaks when handling a few attributes Callers of mono_reflection_create_custom_attr_data_args_noalloc were leaking some of the returned information. Accessed attributes are FixedBufferAttribute and UnmanagedFunctionPointerAttribute. Backport of #16675. /cc @BrzVlad
diff --git a/mono/metadata/marshal-ilgen.c b/mono/metadata/marshal-ilgen.c
@@ -182,6 +182,7 @@ get_fixed_buffer_attr (MonoClassField *field, MonoType **out_etype, int *out_len
 			return FALSE;
 		*out_etype = (MonoType*)typed_args [0];
 		*out_len = *(gint32*)typed_args [1];
+		g_free (typed_args [1]);
 		g_free (typed_args);
 		g_free (named_args);
 		g_free (arginfo);
diff --git a/mono/metadata/marshal.c b/mono/metadata/marshal.c
@@ -3902,7 +3902,9 @@ mono_marshal_get_managed_wrapper (MonoMethod *method, MonoClass *delegate_klass,
 				} else {
 					g_assert_not_reached ();
 				}
+				g_free (named_args [i]);
 			}
+			g_free (typed_args [0]);
 			g_free (typed_args);
 			g_free (named_args);
 			g_free (arginfo);
diff --git a/mono/mini/debugger-agent.c b/mono/mini/debugger-agent.c
@@ -3229,6 +3229,7 @@ static gint32 isFixedSizeArray (MonoClassField *f)
 				if (!is_ok (error))
 					return FALSE;
 				ret = *(gint32*)typed_args [1];
+				g_free (typed_args [1]);
 				g_free (typed_args);
 				g_free (named_args);
 				g_free (arginfo);

Original file line number	Diff line number	Diff line change
`@@ -3902,7 +3902,9 @@ mono_marshal_get_managed_wrapper (MonoMethod method, MonoClass delegate_klass,`
`3902`	`3902`	`} else {`
`3903`	`3903`	`g_assert_not_reached ();`
`3904`	`3904`	`}`
	`3905`	`+ g_free (named_args [i]);`
`3905`	`3906`	`}`
	`3907`	`+ g_free (typed_args [0]);`
`3906`	`3908`	`g_free (typed_args);`
`3907`	`3909`	`g_free (named_args);`
`3908`	`3910`	`g_free (arginfo);`