From 6397118495f65a03a0d13114cf2c72d4a66f9cb1 Mon Sep 17 00:00:00 2001 From: Martin Liska Date: Tue, 18 Apr 2017 09:24:20 +0200 Subject: [PATCH] Validate that destination gcov file does not exist for gcov-tool (PR gcov-profile/78783). 2017-04-18 Martin Liska PR gcov-profile/78783 * libgcov-driver.c (gcov_get_filename): New function. 2017-04-18 Martin Liska PR gcov-profile/78783 * gcov-tool.c (gcov_output_files): Validate that destination file is either removed by the tool or by a user. From-SVN: r246961 --- gcc/ChangeLog | 6 ++++++ gcc/gcov-tool.c | 9 +++++++++ libgcc/ChangeLog | 5 +++++ libgcc/libgcov-driver.c | 9 +++++++++ 4 files changed, 29 insertions(+) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 2807eb23f85..f7eecc45d12 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2017-04-18 Martin Liska + + PR gcov-profile/78783 + * gcov-tool.c (gcov_output_files): Validate that destination + file is either removed by the tool or by a user. + 2017-04-14 Andrew Burgess Guy Benyei diff --git a/gcc/gcov-tool.c b/gcc/gcov-tool.c index cadf09377dd..80c08354857 100644 --- a/gcc/gcov-tool.c +++ b/gcc/gcov-tool.c @@ -46,6 +46,7 @@ extern int gcov_profile_normalize (struct gcov_info*, gcov_type); extern int gcov_profile_scale (struct gcov_info*, float, int, int); extern struct gcov_info* gcov_read_profile_dir (const char*, int); extern void gcov_do_dump (struct gcov_info *, int); +extern const char *gcov_get_filename (struct gcov_info *list); extern void gcov_set_verbose (void); /* Set to verbose output mode. */ @@ -114,6 +115,14 @@ gcov_output_files (const char *out, struct gcov_info *profile) if (ret) fatal_error (input_location, "Cannot change directory to %s", out); + /* Verify that output file does not exist (either was removed by + unlink_profile_data or removed by user). */ + const char *filename = gcov_get_filename (profile); + + if (access (filename, F_OK) != -1) + fatal_error (input_location, "output file %s already exists in folder %s", + filename, out); + gcov_do_dump (profile, 0); ret = chdir (pwd); diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog index 1dc5469cd8c..593cd09db8b 100644 --- a/libgcc/ChangeLog +++ b/libgcc/ChangeLog @@ -1,3 +1,8 @@ +2017-04-18 Martin Liska + + PR gcov-profile/78783 + * libgcov-driver.c (gcov_get_filename): New function. + 2017-04-07 Jeff Law * Makefile.in: Swap definition of LIBGCC_LINKS and inclusion of diff --git a/libgcc/libgcov-driver.c b/libgcc/libgcov-driver.c index 70fe69f26b5..c3b2fd4d5ce 100644 --- a/libgcc/libgcov-driver.c +++ b/libgcc/libgcov-driver.c @@ -852,6 +852,15 @@ gcov_do_dump (struct gcov_info *list, int run_counted) free (gf.filename); } +#if IN_GCOV_TOOL +const char * +__attribute__ ((unused)) +gcov_get_filename (struct gcov_info *list) +{ + return list->filename; +} +#endif + #if !IN_GCOV_TOOL void __gcov_dump_one (struct gcov_root *root)