[setup - the official Cygwin setup program used to install Cygwin and keep it up to date] branch master, updated. release_2.874-26-gf2a16af

[jturney@sourceware.org]

https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/setup.git;h=f2a16aff20f2fe58ab9cad651e2b94916a0a773b

commit f2a16aff20f2fe58ab9cad651e2b94916a0a773b
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date:   Thu Sep 1 13:45:59 2016 +0100

    Fix scope problem with the FileInUse dialog
    
    The std::string we make for dlg_data.msg must remain in scope while the
    FileInUse modal dialog is shown.
    
    Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>


Diff:
---
 install.cc |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/install.cc b/install.cc
index 8aad3a5..277737d 100644
--- a/install.cc
+++ b/install.cc
@@ -530,7 +530,8 @@ Installer::installOne (packagemeta &pkgm, const packageversion &ver,
                             // listed processes, or just ignore the problem and schedule the file to be
                             // replaced after a reboot
                             FileInuseDlgData dlg_data;
-                            dlg_data.msg = ("Unable to extract /" + fn).c_str ();
+                            std::string msg = "Unable to extract /" + fn;
+                            dlg_data.msg = msg.c_str ();
                             dlg_data.processlist = plm.c_str ();
                             dlg_data.iteration = iteration;