Plug memory leak in attribute target_clones

Message ID 20221103210049.516886-1-aldot@gcc.gnu.org
State New
Headers
Series Plug memory leak in attribute target_clones |

Commit Message

Bernhard Reutner-Fischer Nov. 3, 2022, 9 p.m. UTC
  It looks like there was some memory leak in the handling
of attribute target_clones, introduced in 5928bc2ec06d .

Ok for trunk if testing passes?

gcc/ChangeLog:

	* multiple_target.cc (expand_target_clones): Free memory.

Signed-off-by: Bernhard Reutner-Fischer <aldot@gcc.gnu.org>
---
 gcc/multiple_target.cc | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)
  

Comments

Richard Biener Nov. 5, 2022, 11:13 a.m. UTC | #1
On Thu, Nov 3, 2022 at 10:01 PM Bernhard Reutner-Fischer via
Gcc-patches <gcc-patches@gcc.gnu.org> wrote:
>
> It looks like there was some memory leak in the handling
> of attribute target_clones, introduced in 5928bc2ec06d .
>
> Ok for trunk if testing passes?

OK

> gcc/ChangeLog:
>
>         * multiple_target.cc (expand_target_clones): Free memory.
>
> Signed-off-by: Bernhard Reutner-Fischer <aldot@gcc.gnu.org>
> ---
>  gcc/multiple_target.cc | 12 ++++++++----
>  1 file changed, 8 insertions(+), 4 deletions(-)
>
> diff --git a/gcc/multiple_target.cc b/gcc/multiple_target.cc
> index 67866a7c963..77e0f21dd05 100644
> --- a/gcc/multiple_target.cc
> +++ b/gcc/multiple_target.cc
> @@ -390,19 +390,23 @@ expand_target_clones (struct cgraph_node *node, bool definition)
>    for (i = 0; i < attrnum; i++)
>      {
>        char *attr = attrs[i];
> -      char *suffix = XNEWVEC (char, strlen (attr) + 1);
>
> -      create_new_asm_name (attr, suffix);
>        /* Create new target clone.  */
>        tree attributes = make_attribute ("target", attr,
>                                         DECL_ATTRIBUTES (node->decl));
>
> +      char *suffix = XNEWVEC (char, strlen (attr) + 1);
> +      create_new_asm_name (attr, suffix);
>        cgraph_node *new_node = create_target_clone (node, definition, suffix,
>                                                    attributes);
> +      XDELETEVEC (suffix);
>        if (new_node == NULL)
> -       return false;
> +       {
> +         XDELETEVEC (attrs);
> +         XDELETEVEC (attr_str);
> +         return false;
> +       }
>        new_node->local = false;
> -      XDELETEVEC (suffix);
>
>        decl2_v = new_node->function_version ();
>        if (decl2_v != NULL)
> --
> 2.38.1
>
  

Patch

diff --git a/gcc/multiple_target.cc b/gcc/multiple_target.cc
index 67866a7c963..77e0f21dd05 100644
--- a/gcc/multiple_target.cc
+++ b/gcc/multiple_target.cc
@@ -390,19 +390,23 @@  expand_target_clones (struct cgraph_node *node, bool definition)
   for (i = 0; i < attrnum; i++)
     {
       char *attr = attrs[i];
-      char *suffix = XNEWVEC (char, strlen (attr) + 1);
 
-      create_new_asm_name (attr, suffix);
       /* Create new target clone.  */
       tree attributes = make_attribute ("target", attr,
 					DECL_ATTRIBUTES (node->decl));
 
+      char *suffix = XNEWVEC (char, strlen (attr) + 1);
+      create_new_asm_name (attr, suffix);
       cgraph_node *new_node = create_target_clone (node, definition, suffix,
 						   attributes);
+      XDELETEVEC (suffix);
       if (new_node == NULL)
-	return false;
+	{
+	  XDELETEVEC (attrs);
+	  XDELETEVEC (attr_str);
+	  return false;
+	}
       new_node->local = false;
-      XDELETEVEC (suffix);
 
       decl2_v = new_node->function_version ();
       if (decl2_v != NULL)