summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorge Hazan <george.hazan@gmail.com>2014-10-16 21:07:35 +0000
committerGeorge Hazan <george.hazan@gmail.com>2014-10-16 21:07:35 +0000
commit94011c69f7d5982a471f93cff6880506132525ab (patch)
treec223af64977e670c61e190573668d54e554d6551
parentac4a9675eaceb841cea910f4c73563f720787c95 (diff)
crash fix
git-svn-id: http://svn.miranda-ng.org/main/trunk@10805 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
-rw-r--r--plugins/Import/src/import.cpp9
1 files changed, 7 insertions, 2 deletions
diff --git a/plugins/Import/src/import.cpp b/plugins/Import/src/import.cpp
index 31c5b63d6f..e30610416f 100644
--- a/plugins/Import/src/import.cpp
+++ b/plugins/Import/src/import.cpp
@@ -198,9 +198,14 @@ void CopySettings(MCONTACT srcID, const char *szSrcModule, MCONTACT dstID, const
static bool FindDestAccount(const char *szProto)
{
- for (int i = 0; i < arAccountMap.getCount(); i++)
- if (!strcmp(arAccountMap[i].szDstAcc, szProto))
+ for (int i = 0; i < arAccountMap.getCount(); i++) {
+ AccountMap &pam = arAccountMap[i];
+ if (pam.szDstAcc == NULL)
+ continue;
+
+ if (!strcmp(pam.szDstAcc, szProto))
return true;
+ }
return false;
}