Skip to content

Commit 14f106c

Browse files
authored
oxcmail_parse_reply_to: fix email address- and name assignment
Assign tmp_entry, AFTER vmime:mailbox parsed email_addr has been retrieved. Fixes grommunio/gromox #185
1 parent ad84c9f commit 14f106c

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

lib/mapi/oxcmail.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -511,9 +511,7 @@ static BOOL oxcmail_parse_reply_to(const char *field, TPROPVAL_ARRAY *pproplist)
511511
return FALSE;
512512
tmp_entry.flags = 0;
513513
tmp_entry.version = 0;
514-
tmp_entry.pdisplay_name = email_addr.display_name;
515514
tmp_entry.paddress_type = deconst("SMTP");
516-
tmp_entry.pmail_address = email_addr.addr;
517515
/* Ensure the fields are a classic array and thus do not change address */
518516
static_assert(std::size(email_addr.display_name) > 0);
519517
static_assert(std::size(email_addr.addr) > 0);
@@ -526,6 +524,8 @@ static BOOL oxcmail_parse_reply_to(const char *field, TPROPVAL_ARRAY *pproplist)
526524
if (mb == nullptr)
527525
continue;
528526
email_addr.set(*mb);
527+
tmp_entry.pdisplay_name = email_addr.display_name;
528+
tmp_entry.pmail_address = email_addr.addr;
529529
if (!email_addr.has_addr())
530530
continue;
531531
if (names.size() > 0)

0 commit comments

Comments
 (0)