diff options
author | Brad King <brad.king@kitware.com> | 2013-07-16 17:59:30 (GMT) |
---|---|---|
committer | CMake Topic Stage <kwrobot@kitware.com> | 2013-07-16 17:59:30 (GMT) |
commit | ddfd3b85df51d1149e8a8346d6eb423d2d39dced (patch) | |
tree | a70f5f9a98a1849f1f5df47a269e9f9c3cfb7442 /Source | |
parent | 567440ce36c2a91d80f507e0cf431b7c8805d77b (diff) | |
parent | a20c819f6380ecef1ff7d03cdbc37d6d2d373ae3 (diff) | |
download | CMake-ddfd3b85df51d1149e8a8346d6eb423d2d39dced.zip CMake-ddfd3b85df51d1149e8a8346d6eb423d2d39dced.tar.gz CMake-ddfd3b85df51d1149e8a8346d6eb423d2d39dced.tar.bz2 |
Merge topic 'cppcheck-fixes'
a20c819 cmake: Fix resource leak reported by cppcheck
c8adab9 cmcurl: Fix resource leak reported by cppcheck
499531c libarchive: Fix free() order to avoid accessing freed memory
3b849a7 ccmake: Add missing initializers reported by cppcheck
Diffstat (limited to 'Source')
-rw-r--r-- | Source/CursesDialog/form/fty_ipv4.c | 2 | ||||
-rw-r--r-- | Source/cmake.cxx | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/Source/CursesDialog/form/fty_ipv4.c b/Source/CursesDialog/form/fty_ipv4.c index 4ac8a50..c855af6 100644 --- a/Source/CursesDialog/form/fty_ipv4.c +++ b/Source/CursesDialog/form/fty_ipv4.c @@ -30,7 +30,7 @@ static bool Check_IPV4_Field(FIELD * field, const void * argp) { char *bp = field_buffer(field,0); int num = 0, len; - unsigned int d1, d2, d3, d4; + unsigned int d1=256, d2=256, d3=256, d4=256; argp=0; /* Silence unused parameter warning. */ diff --git a/Source/cmake.cxx b/Source/cmake.cxx index 592b5ec..290aff0 100644 --- a/Source/cmake.cxx +++ b/Source/cmake.cxx @@ -3667,11 +3667,11 @@ void cmake::RecordPropertyAccess(const char *name, void cmake::ReportUndefinedPropertyAccesses(const char *filename) { + if(!this->GlobalGenerator) + { return; } FILE *progFile = fopen(filename,"w"); - if (!progFile || !this->GlobalGenerator) - { - return; - } + if(!progFile) + { return; } // what are the enabled languages? std::vector<std::string> enLangs; |