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 ddea27f456ba17430cf65324c1ff860b6d147122 (commit) via 0d2f5c8d6a3384816310aec2478cf9e3877e8569 (commit) via f3fe73da548a90e6682fd6a650d923151950003d (commit) from baf47101466b23d2c7544d67133d8709caf84963 (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=ddea27f456ba17430cf65324c1ff860b6d147122 commit ddea27f456ba17430cf65324c1ff860b6d147122 Merge: baf4710 0d2f5c8 Author: Björn Ricks <bjoern.ri...@intevation.de> AuthorDate: Sat Feb 25 12:27:17 2012 -0500 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Sat Feb 25 12:27:17 2012 -0500 Merge topic 'fix-macos-findprogramm-crash' into next 0d2f5c8 Fix crash if app bundle executeable couldn't be found f3fe73d KWSys Nightly Date Stamp http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0d2f5c8d6a3384816310aec2478cf9e3877e8569 commit 0d2f5c8d6a3384816310aec2478cf9e3877e8569 Author: Bjoern Ricks <bjoern.ri...@intevation.de> AuthorDate: Sat Feb 25 18:20:36 2012 +0100 Commit: Bjoern Ricks <bjoern.ri...@intevation.de> CommitDate: Sat Feb 25 18:20:36 2012 +0100 Fix crash if app bundle executeable couldn't be found Fix a crash on Mac OS X if a programm can't be found as an application bundle. CFRelease MUST NOT be called on a NULL value. See https://developer.apple.com/library/mac/documentation/CoreFOundation/Reference/CFTypeRef/Reference/reference.html#//apple_ref/doc/c_ref/CFRelease diff --git a/Source/cmFindProgramCommand.cxx b/Source/cmFindProgramCommand.cxx index 7c56ad7..00f5419 100644 --- a/Source/cmFindProgramCommand.cxx +++ b/Source/cmFindProgramCommand.cxx @@ -175,6 +175,8 @@ std::string cmFindProgramCommand::GetBundleExecutable(std::string bundlePath) // And finally to a c++ string executable = bundlePath + "/Contents/MacOS/" + std::string(buffer); + // Only release CFURLRef if it's not null + CFRelease( executableURL ); } // Any CF objects returned from functions with "create" or @@ -182,7 +184,6 @@ std::string cmFindProgramCommand::GetBundleExecutable(std::string bundlePath) CFRelease( bundlePathCFS ); CFRelease( bundleURL ); CFRelease( appBundle ); - CFRelease( executableURL ); #endif return executable; ----------------------------------------------------------------------- Summary of changes: Source/cmFindProgramCommand.cxx | 3 ++- Source/kwsys/kwsysDateStamp.cmake | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits