cron2 has submitted this change. ( http://gerrit.openvpn.net/c/openvpn/+/1391?usp=email )
Change subject: iservice: return correct size when domains are truncated ...................................................................... iservice: return correct size when domains are truncated In case not all domains can be converted in the available buffer, return the size of the already converted domains size plus the second terminating zero for the MULTI_SZ. Reported-by: Marc Heuse <[email protected]> Reported-by: [email protected] Change-Id: Iabad046c930dd0f38ec50d1c43d8b3288816df7d Signed-off-by: Heiko Hund <[email protected]> Acked-by: Gert Doering <[email protected]> Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1391 Message-Id: <[email protected]> URL: https://www.mail-archive.com/[email protected]/msg34680.html Signed-off-by: Gert Doering <[email protected]> --- M src/openvpnserv/interactive.c 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/openvpnserv/interactive.c b/src/openvpnserv/interactive.c index ed3c928..4a3e689 100644 --- a/src/openvpnserv/interactive.c +++ b/src/openvpnserv/interactive.c @@ -2214,7 +2214,7 @@ { /* Domain doesn't fit, bad luck if it's the first one */ *pos = '\0'; - *size = converted_size == 0 ? 0 : *size + 1; + *size = converted_size == 0 ? 0 : converted_size + one_glyph; return ERROR_MORE_DATA; } -- To view, visit http://gerrit.openvpn.net/c/openvpn/+/1391?usp=email To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: openvpn Gerrit-Branch: master Gerrit-Change-Id: Iabad046c930dd0f38ec50d1c43d8b3288816df7d Gerrit-Change-Number: 1391 Gerrit-PatchSet: 4 Gerrit-Owner: d12fk <[email protected]> Gerrit-Reviewer: cron2 <[email protected]> Gerrit-Reviewer: plaisthos <[email protected]> Gerrit-CC: openvpn-devel <[email protected]>
_______________________________________________ Openvpn-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openvpn-devel
