From 22dfc3e89d23070a7f46dd8a12b2fde201585353 Mon Sep 17 00:00:00 2001 From: Martin Liska Date: Wed, 3 Jul 2019 10:29:48 +0200 Subject: [PATCH] Fix use-after-scope in host-mingw32.c (PR target/88056). 2019-07-03 Martin Liska PR target/88056 * config/i386/host-mingw32.c (mingw32_gt_pch_use_address): Define local_object_name in outer scope in order to handle use-after-scope issue. From-SVN: r272991 --- gcc/ChangeLog | 7 +++++++ gcc/config/i386/host-mingw32.c | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index ca9ca7bfd06..3d1a07acb40 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2019-07-03 Martin Liska + + PR target/88056 + * config/i386/host-mingw32.c (mingw32_gt_pch_use_address): + Define local_object_name in outer scope in order to handle + use-after-scope issue. + 2019-07-03 Martin Liska * common.opt: Add fprofile-note. diff --git a/gcc/config/i386/host-mingw32.c b/gcc/config/i386/host-mingw32.c index f2b56d71c5b..3254d028313 100644 --- a/gcc/config/i386/host-mingw32.c +++ b/gcc/config/i386/host-mingw32.c @@ -157,10 +157,10 @@ mingw32_gt_pch_use_address (void *addr, size_t size, int fd, /* Determine the version of Windows we are running on and use a uniquely-named local object if running > 4. */ GetVersionEx (&version_info); + + char local_object_name[sizeof (OBJECT_NAME_FMT) + sizeof (DWORD) * 2]; if (version_info.dwMajorVersion > 4) { - char local_object_name [sizeof (OBJECT_NAME_FMT) - + sizeof (DWORD) * 2]; snprintf (local_object_name, sizeof (local_object_name), OBJECT_NAME_FMT "%lx", GetCurrentProcessId()); object_name = local_object_name;