Cppcheck: Possible null pointer dereference: lpszString - otherwise it is redundant...

--HG--
branch : stable

diff --git a/Src/FilepathEdit.cpp b/Src/FilepathEdit.cpp
index 4f9b326..df516a3 100644 (file)
--- a/Src/FilepathEdit.cpp
+++ b/Src/FilepathEdit.cpp
@@ -143,13 +143,12 @@ void CFilepathEdit::GetOriginalText(CString& rString) const
  * This function sets the text (original text) to show in the control.
  * The control may modify the text for displaying in the GUI.
  */
-void CFilepathEdit::SetOriginalText(LPCTSTR lpszString)
+void CFilepathEdit::SetOriginalText(const CString& szString)
 {
-       if (_tcscmp(m_sOriginalText, lpszString) == 0)
+       if (m_sOriginalText == szString)
                return;
 
-       if (lpszString != 0)
-               m_sOriginalText = lpszString;
+       m_sOriginalText = szString;
 
        RefreshDisplayText();
 }

diff --git a/Src/FilepathEdit.h b/Src/FilepathEdit.h
index a182a0e..1ddcdf2 100644 (file)
--- a/Src/FilepathEdit.h
+++ b/Src/FilepathEdit.h
@@ -45,7 +45,7 @@ public :
        LPCTSTR GetUpdatedTipText(CDC * pDC, int maxWidth);
 
        void SetActive(BOOL bActive);
-       void SetOriginalText(LPCTSTR lpszString );
+       void SetOriginalText(const CString& szString );
        void SetBackColor(COLORREF rgb);
        void SetTextColor(COLORREF rgb);