[Cmake-commits] CMake branch, next, updated. v3.0.0-rc1-598-ga1f7139

[Ben Boeckel]

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  a1f71397fb5c61bf66594100e5166cc8aa12c722 (commit)
       via  c029c04ae1f4325c1a2d250c470672d1d9283ef6 (commit)
      from  4c720d2a9d2bc6de9c9894dc0e51b1e26fd8099d (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a1f71397fb5c61bf66594100e5166cc8aa12c722
commit a1f71397fb5c61bf66594100e5166cc8aa12c722
Merge: 4c720d2 c029c04
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Thu Mar 6 17:23:40 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Mar 6 17:23:40 2014 -0500

    Merge topic 'dev/string-apis' into next
    
    c029c04a stringapi: Prevent a NULL dereference in WiX


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c029c04ae1f4325c1a2d250c470672d1d9283ef6
commit c029c04ae1f4325c1a2d250c470672d1d9283ef6
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Thu Mar 6 17:22:09 2014 -0500
Commit:     Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Thu Mar 6 17:22:09 2014 -0500

    stringapi: Prevent a NULL dereference in WiX

diff --git a/Source/CPack/cmCPackGenerator.cxx b/Source/CPack/cmCPackGenerator.cxx
index a8e104b..3915b31 100644
--- a/Source/CPack/cmCPackGenerator.cxx
+++ b/Source/CPack/cmCPackGenerator.cxx
@@ -1089,7 +1089,7 @@ int cmCPackGenerator::DoPackage()
    * may update this during PackageFiles.
    * (either putting several names or updating the provided one)
    */
-  packageFileNames.push_back(tempPackageFileName);
+  packageFileNames.push_back(tempPackageFileName ? tempPackageFileName : "");
   toplevel = tempDirectory;
   if ( !this->PackageFiles() || cmSystemTools::GetErrorOccuredFlag())
     {

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

Summary of changes:
 Source/CPack/cmCPackGenerator.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake