[Cmake-commits] CMake branch, next, updated. v3.7.1-1853-g1890504

[Domen Vrankar]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  1890504c1220777f247462f00d9889a6d242e4bd (commit)
       via  36bc7e4c3f91c560df8051afedddea3f49474264 (commit)
      from  6d47003d339c0be17efe467fe06bc97294479e73 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1890504c1220777f247462f00d9889a6d242e4bd
commit 1890504c1220777f247462f00d9889a6d242e4bd
Merge: 6d47003 36bc7e4
Author:     Domen Vrankar <domen.vrankar at gmail.com>
AuthorDate: Sun Dec 25 04:55:00 2016 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Dec 25 04:55:00 2016 -0500

    Merge topic 'cpack-new-tests' into next
    
    36bc7e4c store old locale to a temporary variable


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=36bc7e4c3f91c560df8051afedddea3f49474264
commit 36bc7e4c3f91c560df8051afedddea3f49474264
Author:     Domen Vrankar <domen.vrankar at gmail.com>
AuthorDate: Sun Dec 25 10:51:34 2016 +0100
Commit:     Domen Vrankar <domen.vrankar at gmail.com>
CommitDate: Sun Dec 25 10:51:34 2016 +0100

    store old locale to a temporary variable
    
    On Windows XP 32 bit setLocale seems to
    cause old pointer invalidation and causes
    program crash in destructor.
    This was causing CPackZIP to crash so to
    fix it we copy the value into a temporary
    variable.

diff --git a/Source/cmLocale.h b/Source/cmLocale.h
index e8e751d..cca7cf5 100644
--- a/Source/cmLocale.h
+++ b/Source/cmLocale.h
@@ -6,10 +6,11 @@
 #include <cmConfigure.h>
 
 #include <locale.h>
+#include <string>
 
 class cmLocaleRAII
 {
-  const char* OldLocale;
+  std::string OldLocale;
 
 public:
   cmLocaleRAII()
@@ -17,7 +18,7 @@ public:
   {
     setlocale(LC_CTYPE, "");
   }
-  ~cmLocaleRAII() { setlocale(LC_CTYPE, this->OldLocale); }
+  ~cmLocaleRAII() { setlocale(LC_CTYPE, this->OldLocale.c_str()); }
 };
 
 #endif

-----------------------------------------------------------------------

Summary of changes:
 Source/cmLocale.h |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake