From ef65d01f2525cf6d52a59c0df06b4f8e4cf924ec Mon Sep 17 00:00:00 2001 From: Tobias Weimer Date: Sat, 10 Jan 2015 11:34:39 +0000 Subject: Import: - Fixed potentially uninitialized variables git-svn-id: http://svn.miranda-ng.org/main/trunk@11811 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Import/src/import.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'plugins') diff --git a/plugins/Import/src/import.cpp b/plugins/Import/src/import.cpp index fe4ee8f943..b0d5cd27c8 100644 --- a/plugins/Import/src/import.cpp +++ b/plugins/Import/src/import.cpp @@ -766,8 +766,6 @@ void ImportMeta(DBCachedContact *ccSrc) static MCONTACT ImportContact(MCONTACT hSrc) { - TCHAR id[40], *pszUniqueID; - // Check what protocol this contact belongs to DBCachedContact *cc = srcDb->m_cache->GetCachedContact(hSrc); if (cc == NULL || cc->szProto == NULL) { @@ -805,6 +803,7 @@ static MCONTACT ImportContact(MCONTACT hSrc) } // Does the contact already exist? + TCHAR id[40], *pszUniqueID; MCONTACT hDst; switch (dbv.type) { case DBVT_DWORD: @@ -817,6 +816,10 @@ static MCONTACT ImportContact(MCONTACT hSrc) pszUniqueID = NEWTSTR_ALLOCA(_A2T(dbv.pszVal)); hDst = HContactFromID(pda->pa->szModuleName, pszUniqueSetting, pszUniqueID); break; + + default: + hDst = INVALID_CONTACT_ID; + pszUniqueID = NULL; } if (hDst != INVALID_CONTACT_ID) { -- cgit v1.2.3