X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=imap-send.c;h=10cce15a427646a1281afa5197f40def39151154;hb=f3ec549481827b10609a43bf504517a0e8063a12;hp=a429a76a6385bb7d7935cfaddec9cfc8508c77e5;hpb=03800743156fe4f331a10c0983b9d633bed3a687;p=git.git

diff --git a/imap-send.c b/imap-send.c
index a429a76a6..10cce15a4 100644
--- a/imap-send.c
+++ b/imap-send.c
@@ -472,7 +472,7 @@ v_issue_imap_cmd( imap_store_t *ctx, struct imap_cmd_cb *cb,
 	if (socket_write( &imap->buf.sock, buf, bufl ) != bufl) {
 		free( cmd->cmd );
 		free( cmd );
-		if (cb && cb->data)
+		if (cb)
 			free( cb->data );
 		return NULL;
 	}
@@ -858,8 +858,7 @@ get_cmd_result( imap_store_t *ctx, struct imap_cmd *tcmd )
 		  normal:
 			if (cmdp->cb.done)
 				cmdp->cb.done( ctx, cmdp, resp );
-			if (cmdp->cb.data)
-				free( cmdp->cb.data );
+			free( cmdp->cb.data );
 			free( cmdp->cmd );
 			free( cmdp );
 			if (!tcmd || tcmd == cmdp)
@@ -1254,6 +1253,10 @@ git_imap_config(const char *key, const char *val)
 
 	if (strncmp( key, imap_key, sizeof imap_key - 1 ))
 		return 0;
+
+	if (!val)
+		return config_error_nonbool(key);
+
 	key += sizeof imap_key - 1;
 
 	if (!strcmp( "folder", key )) {