Do not segfault on MailProvider::*FolderPath in case of absence information about folders in providers.json (#1410)

1 files changed, 14 insertions, 0 deletions

diff --git a/src/core/provider/MCMailProvider.cpp b/src/core/provider/MCMailProvider.cpp
index 99fc4deb..ad186042 100644
--- a/src/core/provider/MCMailProvider.cpp
+++ b/src/core/provider/MCMailProvider.cpp
@@ -249,36 +249,50 @@ bool MailProvider::matchDomain(String * match, String * domain)
 
 String * MailProvider::sentMailFolderPath()
 {
+    if (mMailboxPaths == NULL)
+        return NULL;
     return (String *) mMailboxPaths->objectForKey(MCSTR("sentmail"));
 }
 
 String * MailProvider::starredFolderPath()
 {
+    if (mMailboxPaths == NULL)
+        return NULL;
     return (String *) mMailboxPaths->objectForKey(MCSTR("starred"));
 }
 
 String * MailProvider::allMailFolderPath()
 {
+    if (mMailboxPaths == NULL)
+        return NULL;
     return (String *) mMailboxPaths->objectForKey(MCSTR("allmail"));
 }
 
 String * MailProvider::trashFolderPath()
 {
+    if (mMailboxPaths == NULL)
+        return NULL;
     return (String *) mMailboxPaths->objectForKey(MCSTR("trash"));
 }
 
 String * MailProvider::draftsFolderPath()
 {
+    if (mMailboxPaths == NULL)
+        return NULL;
     return (String *) mMailboxPaths->objectForKey(MCSTR("drafts"));
 }
 
 String * MailProvider::spamFolderPath()
 {
+    if (mMailboxPaths == NULL)
+        return NULL;
     return (String *) mMailboxPaths->objectForKey(MCSTR("spam"));
 }
 
 String * MailProvider::importantFolderPath()
 {
+    if (mMailboxPaths == NULL)
+        return NULL;
     return (String *) mMailboxPaths->objectForKey(MCSTR("important"));
 }