X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=send.c;h=acb01af4bacd9596fb0c0974386612554ff466c8;hp=86a6f35cd250065c7c44ecfeca30850f631872b2;hb=9468c36e7656e50a91f759e3f5498b7f86dbec30;hpb=07ccefd6c97ddd433d8432f7b4596a5572e09b48

diff --git a/send.c b/send.c
index 86a6f35..acb01af 100644
--- a/send.c
+++ b/send.c
@@ -292,7 +292,7 @@ static void process_user_recips (ENVELOPE * env)
         if (!p)
             continue;
 
-        switch (mime_which_token(uh->data, p - uh->data)) {
+        switch (mime_which_token(uh->data, p++ - uh->data)) {
           case MIME_TO:
             env->to = rfc822_parse_adrlist(env->to, p);
             break;
@@ -325,8 +325,10 @@ static void process_user_header(ENVELOPE * env)
 
     for (uh = UserHeader; uh; uh = uh->next) {
         const char *p = strchr(uh->data, ':');
+        if (!p)
+          continue;
 
-        switch (mime_which_token(uh->data, (p ?: uh->data) - uh->data)) {
+        switch (mime_which_token(uh->data, p++ - uh->data)) {
           case MIME_FROM:
             /* User has specified a default From: address.  Remove default address */
             address_list_wipe(&env->from);