[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdevelop/4.6] languages/cpp/cppduchain: Do not blindly access type before checking its validity.
From:       Milian Wolff <mail () milianw ! de>
Date:       2013-12-01 18:11:56
Message-ID: E1VnBUq-0005A8-4d () scm ! kde ! org
[Download RAW message or body]

Git commit f33e529ba9004b00b0d9a76812f965a168dcfa3b by Milian Wolff.
Committed on 01/12/2013 at 16:35.
Pushed by mwolff into branch '4.6'.

Do not blindly access type before checking its validity.

BUG: 325361

M  +1    -1    languages/cpp/cppduchain/typeconversion.cpp

http://commits.kde.org/kdevelop/f33e529ba9004b00b0d9a76812f965a168dcfa3b

diff --git a/languages/cpp/cppduchain/typeconversion.cpp b/languages/cpp/cppduchain/typeconversion.cpp
index dd1f23b..bc37068 100644
--- a/languages/cpp/cppduchain/typeconversion.cpp
+++ b/languages/cpp/cppduchain/typeconversion.cpp
@@ -148,7 +148,7 @@ uint TypeConversion::implicitConversion( const IndexedType& _from, const Indexed
   // in regard to constness
   // TODO: is this maybe something that should *always* be done in removeConstants?
   AbstractType::Ptr nonConstFrom = removeConstants(from, m_topContext);
-  if (nonConstFrom != from) {
+  if (nonConstFrom && nonConstFrom != from) {
     from = nonConstFrom;
     from->setModifiers(from->modifiers() | AbstractType::ConstModifier);
   }
[prev in list] [next in list] [prev in thread] [next in thread]