diff options
| author | Brad King <brad.king@kitware.com> | 2017-10-02 12:01:43 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-10-02 12:01:48 (GMT) |
| commit | a9870c92118e242dfbc079aa1cea6a4214378e14 (patch) | |
| tree | 863d990de0d6520d54c14d033f2d73103d88efee | |
| parent | 275b4a53eef8d10af069fbcb0d1d9bc4d0b5f6d5 (diff) | |
| parent | ec30129b41ca705cb1f41df24ad1e886b527385e (diff) | |
| download | CMake-a9870c92118e242dfbc079aa1cea6a4214378e14.zip CMake-a9870c92118e242dfbc079aa1cea6a4214378e14.tar.gz CMake-a9870c92118e242dfbc079aa1cea6a4214378e14.tar.bz2 | |
Merge topic 'DNDGen-stack-var'
ec30129b CPack: put local variable on the stack
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1331
| -rw-r--r-- | Source/CPack/cmCPackDragNDropGenerator.cxx | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Source/CPack/cmCPackDragNDropGenerator.cxx b/Source/CPack/cmCPackDragNDropGenerator.cxx index 45c7fc6..5a173fc 100644 --- a/Source/CPack/cmCPackDragNDropGenerator.cxx +++ b/Source/CPack/cmCPackDragNDropGenerator.cxx @@ -561,8 +561,9 @@ int cmCPackDragNDropGenerator::CreateDMG(const std::string& src_dir, cmCPackLogger(cmCPackLog::LOG_ERROR, languages[i] << " is not a recognized language" << std::endl); } - char* iso_language_cstr = static_cast<char*>(malloc(65)); - CFStringGetCString(iso_language, iso_language_cstr, 64, + char iso_language_cstr[65]; + CFStringGetCString(iso_language, iso_language_cstr, + sizeof(iso_language_cstr) - 1, kCFStringEncodingMacRoman); LangCode lang = 0; RegionCode region = 0; @@ -575,11 +576,9 @@ int cmCPackDragNDropGenerator::CreateDMG(const std::string& src_dir, cmCPackLogger(cmCPackLog::LOG_ERROR, "No language/region code available for " << iso_language_cstr << std::endl); - free(iso_language_cstr); return 0; } #ifdef HAVE_CoreServices - free(iso_language_cstr); header_data.push_back(region); header_data.push_back(i); header_data.push_back(0); |