exch: switch ABK helper functions to yield std::string

Author: jengelh

exch/exmdb/common_util.cpp

@@ -3947,8 +3947,7 @@ bool cu_get_permission_property(int64_t member_id,
 	return TRUE;
 }
 
-BOOL common_util_parse_addressbook_entryid(const BINARY *pbin,
-    char *address_type, size_t atsize, char *email_address, size_t emsize)
+bool cu_parse_abkeid(const BINARY *pbin, std::string &type, std::string &addr)
 {
 	uint32_t flags;
 	EXT_PULL ext_pull;
@@ -3963,11 +3962,9 @@ BOOL common_util_parse_addressbook_entryid(const BINARY *pbin,
 	/* Tail functions will use EXT_PULL::*_eid, which parse a full EID */
 	ext_pull.m_offset = 0;
 	if (provider_uid == muidEMSAB)
-		return emsab_to_parts(ext_pull, address_type,
-		       atsize, email_address, emsize) ? TRUE : false;
+		return emsab_to_parts(ext_pull, type, addr);
 	if (provider_uid == muidOOP)
-		return oneoff_to_parts(ext_pull, address_type,
-		       atsize, email_address, emsize) ? TRUE : false;
+		return oneoff_to_parts(ext_pull, type, addr);
 	return FALSE;
 }
 

exch/exmdb/instance.cpp

@@ -1349,8 +1349,6 @@ BOOL exmdb_server::flush_instance(const char *dir, uint32_t instance_id,
     ec_error_t *pe_result)
 {
 	uint64_t folder_id;
-	char tmp_buff[1024];
-	char address_type[16];
 
 	auto pdb = db_engine_get_db(dir);
 	if (!pdb)
@@ -1462,11 +1460,10 @@ BOOL exmdb_server::flush_instance(const char *dir, uint32_t instance_id,
 	    !pmsgctnt->proplist.has(PR_SENT_REPRESENTING_EMAIL_ADDRESS)) {
 		auto sr_addrtype = pmsgctnt->proplist.get<const char>(PR_SENT_REPRESENTING_ADDRTYPE);
 		if (sr_addrtype == nullptr) {
-			if (common_util_parse_addressbook_entryid(pbin,
-			    address_type, std::size(address_type),
-			    tmp_buff, std::size(tmp_buff))) {
-				if (pmsgctnt->proplist.set(PR_SENT_REPRESENTING_ADDRTYPE, address_type) != ecSuccess ||
-				    pmsgctnt->proplist.set(PR_SENT_REPRESENTING_EMAIL_ADDRESS, tmp_buff) != ecSuccess)
+			std::string ntype, naddr;
+			if (cu_parse_abkeid(pbin, ntype, naddr)) {
+				if (pmsgctnt->proplist.set(PR_SENT_REPRESENTING_ADDRTYPE, ntype.c_str()) != ecSuccess ||
+				    pmsgctnt->proplist.set(PR_SENT_REPRESENTING_EMAIL_ADDRESS, naddr.c_str()) != ecSuccess)
 					return FALSE;
 			}
 		} else if (strcasecmp(sr_addrtype, "EX") == 0) {
@@ -1486,11 +1483,10 @@ BOOL exmdb_server::flush_instance(const char *dir, uint32_t instance_id,
 	if (pbin != nullptr && !pmsgctnt->proplist.has(PR_SENDER_EMAIL_ADDRESS)) {
 		auto sr_addrtype = pmsgctnt->proplist.get<const char>(PR_SENDER_ADDRTYPE);
 		if (sr_addrtype == nullptr) {
-			if (common_util_parse_addressbook_entryid(pbin,
-			    address_type, std::size(address_type),
-			    tmp_buff, std::size(tmp_buff))) {
-				if (pmsgctnt->proplist.set(PR_SENDER_ADDRTYPE, address_type) != ecSuccess ||
-				    pmsgctnt->proplist.set(PR_SENDER_EMAIL_ADDRESS, tmp_buff) != ecSuccess)
+			std::string ntype, naddr;
+			if (cu_parse_abkeid(pbin, ntype, naddr)) {
+				if (pmsgctnt->proplist.set(PR_SENDER_ADDRTYPE, ntype.c_str()) != ecSuccess ||
+				    pmsgctnt->proplist.set(PR_SENDER_EMAIL_ADDRESS, naddr.c_str()) != ecSuccess)
 					return FALSE;
 			}
 		} else if (strcasecmp(sr_addrtype, "EX") == 0) {

exch/zcore/common_util.cpp

@@ -410,8 +410,7 @@ char *common_util_dup(std::string_view sv)
 	return out;
 }
 
-BOOL common_util_parse_addressbook_entryid(BINARY entryid_bin, uint32_t *ptype,
-    char *pessdn, size_t dsize)
+bool cu_parse_abkeid(BINARY entryid_bin, uint32_t *ptype, std::string &essdn)
 {
 	EXT_PULL ext_pull;
 	EMSAB_ENTRYID tmp_entryid;
@@ -420,7 +419,7 @@ BOOL common_util_parse_addressbook_entryid(BINARY entryid_bin, uint32_t *ptype,
 	if (ext_pull.g_abk_eid(&tmp_entryid) != pack_result::ok)
 		return FALSE;
 	*ptype = tmp_entryid.type;
-	gx_strlcpy(pessdn, tmp_entryid.x500dn.c_str(), dsize);
+	essdn = std::move(tmp_entryid.x500dn);
 	return TRUE;
 }
 

exch/zcore/common_util.hpp

@@ -115,7 +115,7 @@ template<typename T> T *cu_alloc(size_t elem)
 void common_util_set_clifd(int clifd);
 extern int common_util_get_clifd();
 extern char *common_util_dup(std::string_view);
-extern BOOL common_util_parse_addressbook_entryid(BINARY, uint32_t *type, char *essdn, size_t);
+extern bool cu_parse_abkeid(BINARY, uint32_t *type, std::string &essdn);
 uint16_t common_util_get_messaging_entryid_type(BINARY bin);
 extern BOOL cu_entryid_to_fid(BINARY bin, BOOL *pb_private, int *pdb_id, uint64_t *pfolder_id);
 extern BOOL cu_entryid_to_mid(BINARY bin, BOOL *pb_private, int *pdb_id, uint64_t *pfolder_id, uint64_t *pmessage_id);

exch/zcore/zserver.cpp

@@ -713,7 +713,7 @@ ec_error_t zs_openentry(GUID hsession, BINARY entryid,
 {
 	BOOL b_private;
 	int account_id;
-	char essdn[1024];
+	std::string essdn;
 	uint64_t folder_id;
 	uint64_t message_id;
 	uint32_t address_type;
@@ -724,12 +724,10 @@ ec_error_t zs_openentry(GUID hsession, BINARY entryid,
 		return ecError;
 	if (strncmp(entryid.pc, "/exmdb=", 7) == 0) {
 		/* Stupid GUID-less entryid from submit.php */
-		gx_strlcpy(essdn, entryid.pc, sizeof(essdn));
-		return zs_openentry_emsab(hsession, entryid, flags, essdn,
+		return zs_openentry_emsab(hsession, entryid, flags, entryid.pc,
 		       DT_REMOTE_MAILUSER, pmapi_type, phobject);
-	} else if (common_util_parse_addressbook_entryid(entryid, &address_type,
-	    essdn, std::size(essdn))) {
-		return zs_openentry_emsab(hsession, entryid, flags, essdn,
+	} else if (cu_parse_abkeid(entryid, &address_type, essdn)) {
+		return zs_openentry_emsab(hsession, entryid, flags, essdn.c_str(),
 		       address_type, pmapi_type, phobject);
 	} else if (entryid.cb >= 20 && *reinterpret_cast<const FLATUID *>(&entryid.pb[4]) == muidZCSAB) {
 		return zs_openentry_zcsab(hsession, entryid, flags,
@@ -828,7 +826,6 @@ ec_error_t zs_openstoreentry(GUID hsession, uint32_t hobject, BINARY entryid,
 	uint16_t type;
 	BOOL b_private;
 	int account_id;
-	char essdn[1024];
 	uint64_t fid_val;
 	uint8_t loc_type;
 	zs_objtype mapi_type;
@@ -851,6 +848,9 @@ ec_error_t zs_openstoreentry(GUID hsession, uint32_t hobject, BINARY entryid,
 		            PRIVATE_FID_ROOT : PUBLIC_FID_ROOT);
 		message_id = 0;
 	} else {
+		std::string essdn_s;
+		const char *essdn = essdn_s.c_str();
+
 		type = common_util_get_messaging_entryid_type(entryid);
 		switch (type) {
 		case EITLT_PRIVATE_FOLDER:
@@ -869,12 +869,11 @@ ec_error_t zs_openstoreentry(GUID hsession, uint32_t hobject, BINARY entryid,
 			break;
 		}
 		if (strncmp(entryid.pc, "/exmdb=", 7) == 0) {
-			gx_strlcpy(essdn, entryid.pc, sizeof(essdn));
-		} else if (common_util_parse_addressbook_entryid(entryid,
-		     &address_type, essdn, std::size(essdn)) &&
-		     strncmp(essdn, "/exmdb=", 7) == 0 &&
+			essdn = entryid.pc;
+		} else if (cu_parse_abkeid(entryid, &address_type, essdn_s) &&
+		     strncmp(essdn_s.c_str(), "/exmdb=", 7) == 0 &&
 		     address_type == DT_REMOTE_MAILUSER) {
-			/* do nothing */	
+			essdn = essdn_s.c_str();
 		} else {
 			return ecInvalidParam;
 		}
@@ -1049,13 +1048,13 @@ static ec_error_t zs_openab_emsab(USER_INFO_REF &&pinfo, BINARY entryid,
     int base_id, zs_objtype *pmapi_type, uint32_t *phobject)
 {
 	int user_id, domain_id;
-	char essdn[1024];
+	std::string essdn_s;
 	uint32_t address_type;
 
-	if (!common_util_parse_addressbook_entryid(entryid, &address_type,
-	    essdn, std::size(essdn)))
+	if (!cu_parse_abkeid(entryid, &address_type, essdn_s))
 		return ecInvalidParam;
 
+	auto essdn = essdn_s.data();
 	if (address_type == DT_CONTAINER) {
 		CONTAINER_ID container_id;
 		uint8_t type;

include/gromox/exmdb_common_util.hpp

@@ -106,7 +106,7 @@ void common_util_set_message_read(sqlite3 *psqlite,
 	uint64_t message_id, uint8_t is_read);
 BINARY* common_util_username_to_addressbook_entryid(
 	const char *username);
-extern BOOL common_util_parse_addressbook_entryid(const BINARY *, char *address_type, size_t atsize, char *email_address, size_t emsize);
+extern bool cu_parse_abkeid(const BINARY *, std::string &type, std::string &addr);
 BINARY* common_util_to_private_folder_entryid(
 	sqlite3 *psqlite, const char *username,
 	uint64_t folder_id);

include/gromox/ext_buffer.hpp

@@ -332,5 +332,5 @@ struct GX_EXPORT EXT_PUSH {
 	EXT_BUFFER_MGT m_mgt{};
 };
 
-extern GX_EXPORT bool emsab_to_parts(EXT_PULL &, char *type, size_t tsize, char *addr, size_t asize);
-extern GX_EXPORT bool oneoff_to_parts(EXT_PULL &, char *type, size_t tsize, char *addr, size_t asize);
+extern GX_EXPORT bool emsab_to_parts(EXT_PULL &, std::string &type, std::string &addr);
+extern GX_EXPORT bool oneoff_to_parts(EXT_PULL &, std::string &type, std::string &addr);

lib/mapi/ext_buffer.cpp

@@ -3584,29 +3584,31 @@ uint8_t *EXT_PUSH::release()
 	return t;
 }
 
-bool emsab_to_parts(EXT_PULL &ser, char *type, size_t tsize,
-    char *addr, size_t asize)
+bool emsab_to_parts(EXT_PULL &ser, std::string &type, std::string &addr) try
 {
 	EMSAB_ENTRYID eid;
 	if (ser.g_abk_eid(&eid) != pack_result::ok || eid.type != DT_MAILUSER)
 		return false;
-	if (type != nullptr)
-		gx_strlcpy(type, "EX", tsize);
-	gx_strlcpy(addr, eid.x500dn.c_str(), asize);
+	type = "EX";
+	addr = std::move(eid.x500dn);
 	return true;
+} catch (const std::bad_alloc &) {
+	mlog(LV_ERR, "E-1991: ENOMEM");
+	return false;
 }
 
-bool oneoff_to_parts(EXT_PULL &ser, char *type, size_t tsize,
-    char *addr, size_t asize)
+bool oneoff_to_parts(EXT_PULL &ser, std::string &type, std::string &addr) try
 {
 	ONEOFF_ENTRYID eid;
 	if (ser.g_oneoff_eid(&eid) != pack_result::ok ||
 	    strcasecmp(eid.paddress_type.c_str(), "SMTP") != 0)
 		return false;
-	if (type != nullptr)
-		gx_strlcpy(type, "SMTP", tsize);
-	gx_strlcpy(addr, eid.pmail_address.c_str(), asize);
+	type = "SMTP";
+	addr = std::move(eid.pmail_address);
 	return true;
+} catch (const std::bad_alloc &) {
+	mlog(LV_ERR, "E-1990: ENOMEM");
+	return false;
 }
 
 freebusy_event::freebusy_event(time_t start, time_t end, uint32_t b_status,