From: Simon Marchi <simon.marchi@polymtl.ca>
To: Tom Tromey <tom@tromey.com>
Cc: gdb-patches@sourceware.org
Subject: Re: [RFA v2 03/24] Change return type of find_and_open_script
Date: Sat, 29 Jul 2017 23:54:00 -0000 [thread overview]
Message-ID: <2fed0a72cbcbf472906e4c4966cde63b@polymtl.ca> (raw)
In-Reply-To: <20170725172107.9799-4-tom@tromey.com>
Hi Tom,
I like the change, but one thing caught my attention.
On 2017-07-25 19:20, Tom Tromey wrote:
> @@ -953,26 +950,25 @@ source_script_file (struct auto_load_pspace_info
> *pspace_info,
> return;
> }
>
> - opened = find_and_open_script (file, 1 /*search_path*/,
> - &stream, &full_path);
> + gdb::optional<open_script> opened = find_and_open_script (file,
> + 1 /*search_path*/);
> + const char *path_ptr;
>
> - cleanups = make_cleanup (null_cleanup, NULL);
> if (opened)
> {
> - make_cleanup_fclose (stream);
> - make_cleanup (xfree, full_path);
> -
> - if (!file_is_auto_load_safe (full_path,
> + path_ptr = opened->full_path.get ();
> + if (!file_is_auto_load_safe (opened->full_path.get (),
> _("auto-load: Loading %s script "
> "\"%s\" from section \"%s\" of "
> "objfile \"%s\".\n"),
> - ext_lang_name (language), full_path,
> + ext_lang_name (language),
> + opened->full_path.get (),
> section_name, objfile_name (objfile)))
> - opened = 0;
> + opened.reset ();
> }
> else
> {
> - full_path = NULL;
> + path_ptr = NULL;
>
> /* If one script isn't found it's not uncommon for more to not
> be
> found either. We don't want to print a message for each script,
> @@ -986,14 +982,12 @@ source_script_file (struct auto_load_pspace_info
> *pspace_info,
> section_name, offset);
> }
>
> - in_hash_table = maybe_add_script_file (pspace_info, opened, file,
> full_path,
> - language);
> + in_hash_table = maybe_add_script_file (pspace_info, bool (opened),
> file,
> + path_ptr, language);
Here, isn't path_ptr used after free in case the auto-load was denied?
>
> /* If this file is not currently loaded, load it. */
> if (opened && !in_hash_table)
> - sourcer (language, objfile, stream, full_path);
> -
> - do_cleanups (cleanups);
> + sourcer (language, objfile, opened->stream.get (), path_ptr);
> }
>
> /* Subroutine of source_section_scripts to simplify it.
Thanks,
Simon
next prev parent reply other threads:[~2017-07-29 23:54 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-07-25 17:24 [RFA v2 00/24] More miscellaneous C++-ification Tom Tromey
2017-07-25 17:21 ` [RFA v2 23/24] Use gdb_argv in Python Tom Tromey
2017-07-31 20:26 ` Simon Marchi
2017-07-25 17:21 ` [RFA v2 22/24] Introduce gdb_argv, a class wrapper for buildargv Tom Tromey
2017-07-31 20:22 ` Simon Marchi
2017-07-25 17:21 ` [RFA v2 18/24] Use a scoped_restore for command_nest_depth Tom Tromey
2017-07-25 17:21 ` [RFA v2 19/24] Replace do_restore_instream_cleanup with scoped_restore Tom Tromey
2017-07-25 17:22 ` [RFA v2 05/24] Use gdb_file_up in source.c Tom Tromey
2017-07-30 18:59 ` Simon Marchi
2017-07-25 17:22 ` [RFA v2 12/24] More uses of scoped_restore Tom Tromey
2017-07-25 17:22 ` [RFA v2 16/24] Remove in_user_command Tom Tromey
2017-07-25 17:24 ` [RFA v2 24/24] Remove make_cleanup_freeargv and gdb_buildargv Tom Tromey
2017-07-31 20:26 ` Simon Marchi
2017-07-25 17:24 ` [RFA v2 09/24] Remove close cleanup Tom Tromey
2017-07-31 19:09 ` Simon Marchi
2017-07-25 17:24 ` [RFA v2 06/24] Change open_terminal_stream to return a gdb_file_up Tom Tromey
2017-07-30 19:04 ` Simon Marchi
2017-07-25 17:24 ` [RFA v2 08/24] Remove an unlink cleanup Tom Tromey
2017-07-31 18:47 ` Simon Marchi
2017-07-25 17:25 ` [RFA v2 10/24] Remove make_cleanup_restore_current_language Tom Tromey
2017-07-31 19:21 ` Simon Marchi
2017-07-31 22:17 ` Tom Tromey
2017-08-01 8:44 ` Simon Marchi
2017-07-25 17:26 ` [RFA v2 21/24] Remove a cleanup in Python Tom Tromey
2017-07-25 17:26 ` [RFA v2 04/24] Use gdb_file_up in fbsd-nat.c Tom Tromey
2017-07-29 23:56 ` Simon Marchi
2017-07-25 17:26 ` [RFA v2 02/24] Introduce and use gdb_file_up Tom Tromey
2017-07-29 23:40 ` Simon Marchi
2017-07-30 16:25 ` Tom Tromey
2017-07-30 18:31 ` Simon Marchi
2017-07-25 17:26 ` [RFA v2 01/24] Introduce and use ui_out_emit_table Tom Tromey
2017-07-29 23:10 ` Simon Marchi
2017-07-30 16:23 ` Tom Tromey
2017-07-30 18:29 ` Simon Marchi
2017-07-31 22:12 ` Tom Tromey
2017-07-25 17:26 ` [RFA v2 07/24] Remove make_cleanup_fclose Tom Tromey
2017-07-30 19:05 ` Simon Marchi
2017-07-25 17:27 ` [RFA v2 03/24] Change return type of find_and_open_script Tom Tromey
2017-07-29 23:54 ` Simon Marchi [this message]
2017-07-30 16:27 ` Tom Tromey
2017-07-25 17:27 ` [RFA v2 14/24] Use unique_xmalloc_ptr in jit.c Tom Tromey
2017-07-31 19:25 ` Simon Marchi
2017-07-25 17:27 ` [RFA v2 13/24] Replace tui_restore_gdbout with scoped_restore Tom Tromey
2017-07-25 17:27 ` [RFA v2 15/24] Use containers to avoid cleanups Tom Tromey
2017-07-31 19:42 ` Simon Marchi
2017-07-25 17:51 ` [RFA v2 20/24] Avoid some manual memory management in Python Tom Tromey
2017-07-25 18:02 ` [RFA v2 17/24] Remove user_call_depth Tom Tromey
2017-07-31 19:46 ` Simon Marchi
2017-07-25 18:04 ` [RFA v2 11/24] Remove make_cleanup_free_so Tom Tromey
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=2fed0a72cbcbf472906e4c4966cde63b@polymtl.ca \
--to=simon.marchi@polymtl.ca \
--cc=gdb-patches@sourceware.org \
--cc=tom@tromey.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).