From de2675b46f165f28d8ce0612de2c38b9bdbc972d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= Date: Thu, 22 Jan 2009 21:20:40 +0000 Subject: [PATCH] cppcheck: The '&&' should be '||' when checking if a check should be called --- src/cppcheck.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/cppcheck.cpp b/src/cppcheck.cpp index d41097ce5..dd222a3c7 100644 --- a/src/cppcheck.cpp +++ b/src/cppcheck.cpp @@ -313,7 +313,7 @@ void CppCheck::checkFile(const std::string &code, const char FileName[]) // Memory leak CheckMemoryLeakClass checkMemoryLeak(&_tokenizer, _settings, this); - if (ErrorMessage::memleak() && ErrorMessage::mismatchAllocDealloc()) + if (ErrorMessage::memleak() || ErrorMessage::mismatchAllocDealloc()) checkMemoryLeak.CheckMemoryLeak(); // Check that all class constructors are ok. @@ -325,7 +325,7 @@ void CppCheck::checkFile(const std::string &code, const char FileName[]) checkClass.virtualDestructor(); // Array index out of bounds / Buffer overruns.. - if (ErrorMessage::arrayIndexOutOfBounds(_settings) && ErrorMessage::bufferOverrun(_settings)) + if (ErrorMessage::arrayIndexOutOfBounds(_settings) || ErrorMessage::bufferOverrun(_settings)) checkBufferOverrun.bufferOverrun(); // Dangerous functions, such as 'gets' and 'scanf'