changeset 8834:5284f45c249a HEAD

master: Don't crash in login_executable -D checks if protocols line doesn't have imap.
author Timo Sirainen <tss@iki.fi>
date Sun, 15 Mar 2009 20:06:45 -0400
parents 6b84ced81da8
children 299e30db1ee9
files src/master/master-settings.c
diffstat 1 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/master/master-settings.c	Sun Mar 15 17:48:03 2009 -0400
+++ b/src/master/master-settings.c	Sun Mar 15 20:06:45 2009 -0400
@@ -945,10 +945,12 @@
 {
 	const char *p;
 
-	p = strstr(set->server->pop3->login_executable, " -D");
+	p = set->server->pop3 == NULL ? NULL :
+		strstr(set->server->pop3->login_executable, " -D");
 	if (p != NULL && p[3] == '\0')
 		return TRUE;
-	p = strstr(set->server->imap->login_executable, " -D");
+	p = set->server->imap == NULL ? NULL :
+		strstr(set->server->imap->login_executable, " -D");
 	if (p != NULL && p[3] == '\0')
 		return TRUE;
 	return FALSE;