lib: automatic (de)allocation for ONEOFF_ENTRYID

Author: jengelh

exch/zcore/objects.hpp

@@ -222,10 +222,10 @@ struct user_object {
 
 struct oneoff_object {
 	protected:
-	oneoff_object(const ONEOFF_ENTRYID &);
+	oneoff_object(ONEOFF_ENTRYID &&);
 
 	public:
-	static std::unique_ptr<oneoff_object> create(const ONEOFF_ENTRYID &);
+	static std::unique_ptr<oneoff_object> create(ONEOFF_ENTRYID &&);
 	ec_error_t get_props(const PROPTAG_ARRAY *, TPROPVAL_ARRAY *);
 
 	static const uint32_t all_tags_raw[];

exch/zcore/user_object.cpp

@@ -17,9 +17,9 @@
 
 using namespace gromox;
 
-std::unique_ptr<oneoff_object> oneoff_object::create(const ONEOFF_ENTRYID &e) try
+std::unique_ptr<oneoff_object> oneoff_object::create(ONEOFF_ENTRYID &&e) try
 {
-	return std::unique_ptr<oneoff_object>(new oneoff_object(e));
+	return std::unique_ptr<oneoff_object>(new oneoff_object(std::move(e)));
 } catch (const std::bad_alloc &) {
 	return nullptr;
 }
@@ -32,9 +32,9 @@ const uint32_t oneoff_object::all_tags_raw[] = {
 const PROPTAG_ARRAY oneoff_object::all_tags =
 	{std::size(all_tags_raw), deconst(all_tags_raw)};
 
-oneoff_object::oneoff_object(const ONEOFF_ENTRYID &e) :
-	m_flags(e.ctrl_flags), m_dispname(znul(e.pdisplay_name)),
-	m_addrtype(znul(e.paddress_type)), m_emaddr(znul(e.pmail_address))
+oneoff_object::oneoff_object(ONEOFF_ENTRYID &&e) :
+	m_flags(e.ctrl_flags), m_dispname(std::move(e.pdisplay_name)),
+	m_addrtype(std::move(e.paddress_type)), m_emaddr(std::move(e.pmail_address))
 {}
 
 ec_error_t oneoff_object::get_props(const PROPTAG_ARRAY *tags, TPROPVAL_ARRAY *vals)

exch/zcore/zserver.cpp

@@ -1005,7 +1005,7 @@ static ec_error_t zs_openab_oop(USER_INFO_REF &&info, BINARY bin,
 	ep.init(bin.pv, bin.cb, common_util_alloc, EXT_FLAG_WCOUNT | EXT_FLAG_UTF16);
 	if (ep.g_oneoff_eid(&eid) != pack_result::ok)
 		return ecInvalidParam;
-	auto u = oneoff_object::create(eid);
+	auto u = oneoff_object::create(std::move(eid));
 	if (u == nullptr)
 		return ecServerOOM;
 	*zmg_type = zs_objtype::oneoff;
@@ -3006,7 +3006,6 @@ ec_error_t zs_modifyrecipients(GUID hsession,
 	TPROPVAL_ARRAY *prcpt;
 	FLATUID provider_uid;
 	TAGGED_PROPVAL *ppropval;
-	ONEOFF_ENTRYID oneoff_entry;
 
 	if (prcpt_list->count >= 0x7fef || (flags != MODRECIP_ADD &&
 	    flags != MODRECIP_MODIFY && flags != MODRECIP_REMOVE))
@@ -3080,6 +3079,8 @@ ec_error_t zs_modifyrecipients(GUID hsession,
 			continue;
 		if (provider_uid == muidEMSAB) {
 			EMSAB_ENTRYID ab_entryid;
+			EXT_PULL ext_pull;
+
 			ext_pull.init(pbin->pb, pbin->cb, common_util_alloc, EXT_FLAG_UTF16);
 			if (ext_pull.g_abk_eid(&ab_entryid) != pack_result::ok ||
 			    ab_entryid.type != DT_MAILUSER)
@@ -3114,9 +3115,12 @@ ec_error_t zs_modifyrecipients(GUID hsession,
 				return ecServerOOM;
 			cu_set_propval(prcpt, PR_DISPLAY_NAME, dupval);
 		} else if (provider_uid == muidOOP) {
+			ONEOFF_ENTRYID oneoff_entry;
+			EXT_PULL ext_pull;
+
 			ext_pull.init(pbin->pb, pbin->cb, common_util_alloc, EXT_FLAG_UTF16);
 			if (ext_pull.g_oneoff_eid(&oneoff_entry) != pack_result::ok ||
-			    strcasecmp(oneoff_entry.paddress_type, "SMTP") != 0)
+			    strcasecmp(oneoff_entry.paddress_type.c_str(), "SMTP") != 0)
 				continue;
 			ppropval = cu_alloc<TAGGED_PROPVAL>(prcpt->count + 5);
 			if (ppropval == nullptr)

include/gromox/ext_buffer.hpp

@@ -311,7 +311,7 @@ struct GX_EXPORT EXT_PUSH {
 	pack_result p_permission_data(const PERMISSION_DATA &);
 	pack_result p_rule_data(const RULE_DATA &);
 	pack_result p_abk_eid(const EMSAB_ENTRYID_view &);
-	pack_result p_oneoff_eid(const ONEOFF_ENTRYID &);
+	pack_result p_oneoff_eid(const ONEOFF_ENTRYID_view &);
 	pack_result p_persistdata_a(std::span<const PERSISTDATA>);
 	pack_result p_eid_a(const EID_ARRAY &);
 	pack_result p_systime(const SYSTEMTIME &);

include/gromox/mapidefs.h

@@ -1040,13 +1040,22 @@ struct GX_EXPORT NOTIF_SINK {
 	ADVISE_INFO *padvise;
 };
 
+struct GX_EXPORT ONEOFF_ENTRYID_view {
+	uint32_t flags = 0;
+	uint16_t version = 0;
+	uint16_t ctrl_flags = 0;
+	const char *pdisplay_name, *paddress_type, *pmail_address;
+};
+
 struct GX_EXPORT ONEOFF_ENTRYID {
-	uint32_t flags;
-	uint16_t version; /* should be 0x0000 */
-	uint16_t ctrl_flags;
-	char *pdisplay_name;
-	char *paddress_type;
-	char *pmail_address;
+	uint32_t flags = 0;
+	uint16_t version = 0; /* should be 0x0000 */
+	uint16_t ctrl_flags = 0;
+	std::string pdisplay_name, paddress_type, pmail_address;
+	operator ONEOFF_ENTRYID_view() const {
+		return {flags, version, ctrl_flags, pdisplay_name.c_str(),
+		        paddress_type.c_str(), pmail_address.c_str()};
+	}
 };
 
 struct GX_EXPORT PERMISSION_ROW {

lib/mapi/ext_buffer.cpp

@@ -3267,7 +3267,7 @@ pack_result EXT_PUSH::p_abk_eid(const EMSAB_ENTRYID_view &r)
 	return p_str(r.px500dn);
 }
 
-pack_result EXT_PUSH::p_oneoff_eid(const ONEOFF_ENTRYID &r)
+pack_result EXT_PUSH::p_oneoff_eid(const ONEOFF_ENTRYID_view &r)
 {
 	TRY(p_uint32(r.flags));
 	TRY(p_guid(muidOOP));
@@ -3601,11 +3601,11 @@ bool oneoff_to_parts(EXT_PULL &ser, char *type, size_t tsize,
 {
 	ONEOFF_ENTRYID eid;
 	if (ser.g_oneoff_eid(&eid) != pack_result::ok ||
-	    strcasecmp(eid.paddress_type, "SMTP") != 0)
+	    strcasecmp(eid.paddress_type.c_str(), "SMTP") != 0)
 		return false;
 	if (type != nullptr)
 		gx_strlcpy(type, "SMTP", tsize);
-	gx_strlcpy(addr, eid.pmail_address, asize);
+	gx_strlcpy(addr, eid.pmail_address.c_str(), asize);
 	return true;
 }
 

lib/mapi/oxcmail.cpp

@@ -2947,23 +2947,18 @@ static bool oxcmail_export_reply_to(const MESSAGE_CONTENT *pmsg,
 	for (size_t i = 0; i < address_array.count; ++i) {
 		EXT_PULL ep2;
 		ONEOFF_ENTRYID oo{};
-		auto cl_1 = HX::make_scope_exit([&]() {
-			free(oo.pdisplay_name);
-			free(oo.paddress_type);
-			free(oo.pmail_address);
-		});
 		ep2.init(address_array.pbin[i].pb, address_array.pbin[i].cb,
 			malloc, EXT_FLAG_UTF16);
 		if (ep2.g_oneoff_eid(&oo) != pack_result::ok ||
-		    strcasecmp(oo.paddress_type, "SMTP") != 0) {
+		    strcasecmp(oo.paddress_type.c_str(), "SMTP") != 0) {
 			mlog(LV_WARN, "W-1964: skipping non-SMTP reply-to entry");
 			continue;
 		}
 		auto mb = vmime::make_shared<vmime::mailbox>("");
-		if (oo.pdisplay_name != nullptr && *oo.pdisplay_name != '\0')
-			mb->setName(vmime::text(oo.pdisplay_name, vmime::charsets::UTF_8));
-		if (*oo.pmail_address != '\0')
-			mb->setEmail(oo.pmail_address);
+		if (!oo.pdisplay_name.empty())
+			mb->setName(vmime::text(std::move(oo.pdisplay_name), vmime::charsets::UTF_8));
+		if (!oo.pmail_address.empty())
+			mb->setEmail(std::move(oo.pmail_address));
 		adrlist.appendAddress(mb);
 	}
 	return true;

lib/mapi/usercvt.cpp

@@ -121,14 +121,10 @@ static ec_error_t cvt_oneoff_to_smtpaddr(EXT_PULL &ser, const char *org,
     cvt_id2user id2user, std::string &smtpaddr)
 {
 	ONEOFF_ENTRYID eid{};
-	auto cl_0 = HX::make_scope_exit([&]() {
-		free(eid.pdisplay_name);
-		free(eid.paddress_type);
-		free(eid.pmail_address);
-	});
 	if (ser.g_oneoff_eid(&eid) != pack_result::success)
 		return ecInvalidParam;
-	return cvt_genaddr_to_smtpaddr(eid.paddress_type, eid.pmail_address,
+	return cvt_genaddr_to_smtpaddr(eid.paddress_type.c_str(),
+	       eid.pmail_address.c_str(),
 	       org, std::move(id2user), smtpaddr);
 }
 

php_mapi/mapi.cpp

@@ -653,9 +653,9 @@ static ZEND_FUNCTION(mapi_parseoneoff)
 	if (pull_ctx.g_oneoff_eid(&oneoff_entry) != pack_result::ok)
 		pthrow(ecError);
 	zarray_init(return_value);
-	add_assoc_string(return_value, "name", oneoff_entry.pdisplay_name);
-	add_assoc_string(return_value, "type", oneoff_entry.paddress_type);
-	add_assoc_string(return_value, "address", oneoff_entry.pmail_address);
+	add_assoc_string(return_value, "name", oneoff_entry.pdisplay_name.c_str());
+	add_assoc_string(return_value, "type", oneoff_entry.paddress_type.c_str());
+	add_assoc_string(return_value, "address", oneoff_entry.pmail_address.c_str());
 	MAPI_G(hr) = ecSuccess;
 }