Re: [PATCHv2 2/2] gdb/guile: Have gdbscm_safe_source_script return a unique_ptr

[Simon Marchi <simon.marchi@polymtl.ca>]

On 2021-05-05 5:01 p.m., Andrew Burgess wrote:
> diff --git a/gdb/guile/scm-safe-call.c b/gdb/guile/scm-safe-call.c
> index 5bea970239b..a475774f921 100644
> --- a/gdb/guile/scm-safe-call.c
> +++ b/gdb/guile/scm-safe-call.c
> @@ -432,7 +432,7 @@ scscm_source_scheme_script (void *data)
>     printed according to "set guile print-stack" and the result is an error
>     message allocated with malloc, caller must free.  */
>  
> -char *
> +gdb::unique_xmalloc_ptr<char>
>  gdbscm_safe_source_script (const char *filename)
>  {
>    /* scm_c_primitive_load_path only looks in %load-path for files with
> @@ -454,7 +454,7 @@ gdbscm_safe_source_script (const char *filename)
>  			      (void *) filename);
>  
>    if (result != NULL)
> -    return xstrdup (result);
> +    return make_unique_xstrdup (result);
>    return NULL;

Hmm, result comes from gdbscm_with_guile, which states:

   The result if NULL if no exception occurred, otherwise it is a statically
   allocated error message (caller must *not* free).  */

Simon