feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Core::Id: Fix possible crash in operator ==

Browse Source 
Revert a workaround applied earlier

Change-Id: I825bdf6df662a5509166b9b7d12a4fb305cba6cd
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Tobias Hunger
2013-01-23 15:51:52 +01:00
committed by Orgad Shaneh
parent 04db5c4479
commit 4e5e6b45fe
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/coreplugin/id.cpp
View File

@@ -89,7 +89,7 @@ public:
static bool operator==(const StringHolder &sh1, const StringHolder &sh2)
{
// sh.n is unlikely to discriminate better than the hash.
return sh1.h == sh2.h && strcmp(sh1.str, sh1.str) == 0;
return sh1.h == sh2.h && sh1.str && sh2.str && strcmp(sh1.str, sh2.str) == 0;
}
@@ -314,7 +314,11 @@ void Id::registerId(int uid, const char *name)
bool Id::operator==(const char *name) const
{
return strcmp(stringFromId.value(m_id).str, name) == 0;
const char *string = stringFromId.value(m_id).str;
if (string && name)
return strcmp(string, name) == 0;
else
return false;
}
// For debugging purposes