Skip to content

Commit 50ab372

Browse files
grammmikejengelh
authored andcommitted
exmdb: fix TPROPVAL_ARRAY::get template param
The template parameter for TPROPVAL_ARRAY::get was wrongly chosen for PR_CREATOR_ENTRYID, but since the pointer is never derefenced in the block but passed right back to TPROPVAL_ARRAY::emplace_back, it of no consequence. Switch to the untyped "get" function (getval).
1 parent 849bd3a commit 50ab372

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

exch/exmdb/message.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1535,30 +1535,30 @@ static ec_error_t message_rectify_message(const MESSAGE_CONTENT *src,
15351535
dprop.emplace_back(PR_BODY_CONTENT_ID, pvalue);
15361536
}
15371537
if (!sprop.has(PR_CREATOR_NAME)) {
1538-
auto pvalue = sprop.get<char>(PR_SENDER_NAME);
1538+
auto pvalue = sprop.getval(PR_SENDER_NAME);
15391539
if (pvalue == nullptr)
1540-
pvalue = sprop.get<char>(PR_SENT_REPRESENTING_NAME);
1540+
pvalue = sprop.getval(PR_SENT_REPRESENTING_NAME);
15411541
if (pvalue != nullptr)
15421542
dprop.emplace_back(PR_CREATOR_NAME, pvalue);
15431543
}
15441544
if (!sprop.has(PR_CREATOR_ENTRYID)) {
1545-
auto pvalue = sprop.get<char>(PR_SENDER_ENTRYID);
1545+
auto pvalue = sprop.getval(PR_SENDER_ENTRYID);
15461546
if (pvalue == nullptr)
1547-
pvalue = sprop.get<char>(PR_SENT_REPRESENTING_ENTRYID);
1547+
pvalue = sprop.getval(PR_SENT_REPRESENTING_ENTRYID);
15481548
if (pvalue != nullptr)
15491549
dprop.emplace_back(PR_CREATOR_ENTRYID, pvalue);
15501550
}
15511551
if (!sprop.has(PR_LAST_MODIFIER_NAME)) {
1552-
auto pvalue = sprop.get<char>(PR_SENDER_NAME);
1552+
auto pvalue = sprop.getval(PR_SENDER_NAME);
15531553
if (pvalue == nullptr)
1554-
pvalue = sprop.get<char>(PR_SENT_REPRESENTING_NAME);
1554+
pvalue = sprop.getval(PR_SENT_REPRESENTING_NAME);
15551555
if (pvalue != nullptr)
15561556
dprop.emplace_back(PR_LAST_MODIFIER_NAME, pvalue);
15571557
}
15581558
if (!sprop.has(PR_LAST_MODIFIER_ENTRYID)) {
1559-
auto pvalue = sprop.get<BINARY>(PR_SENDER_ENTRYID);
1559+
auto pvalue = sprop.getval(PR_SENDER_ENTRYID);
15601560
if (pvalue == nullptr)
1561-
pvalue = sprop.get<BINARY>(PR_SENT_REPRESENTING_ENTRYID);
1561+
pvalue = sprop.getval(PR_SENT_REPRESENTING_ENTRYID);
15621562
if (pvalue != nullptr)
15631563
dprop.emplace_back(PR_LAST_MODIFIER_ENTRYID, pvalue);
15641564
}

0 commit comments

Comments
 (0)