cron2 has submitted this change. ( http://gerrit.openvpn.net/c/openvpn/+/1669?usp=email )
Change subject: dco_freebsd: Add check_malloc_return after realloc ...................................................................... dco_freebsd: Add check_malloc_return after realloc cppcheck complained about a potential memleak due to realloc failure. But trying to handle that is probably not useful. Just abort like we do for other malloc failures. Change-Id: Icd8ea093dfe9f1888570f3d7b786b951b5262e47 Signed-off-by: Frank Lichtenheld <[email protected]> Acked-by: Gert Doering <[email protected]> Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1669 Message-Id: <[email protected]> URL: https://www.mail-archive.com/[email protected]/msg36842.html Signed-off-by: Gert Doering <[email protected]> --- M dev-tools/cppcheck-suppression M src/openvpn/dco_freebsd.c 2 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dev-tools/cppcheck-suppression b/dev-tools/cppcheck-suppression index 1f31edb..439cbb1 100644 --- a/dev-tools/cppcheck-suppression +++ b/dev-tools/cppcheck-suppression @@ -44,6 +44,8 @@ knownConditionTrueFalse:src/openvpnmsica/dllmain.c:164 # FP: cppcheck seems to be confused since we cast the pointer to integer memleak:src/plugins/down-root/down-root.c:337 +# IGN: we just abort instead +memleakOnRealloc:src/openvpn/dco_freebsd.c:845 # FP: eventmsg.h is not built on Unix missingInclude:src/openvpnserv/common.c:25 # IGN: strlen(NULL) is not nice code, but seems to work diff --git a/src/openvpn/dco_freebsd.c b/src/openvpn/dco_freebsd.c index 718cd8b..eaca86b 100644 --- a/src/openvpn/dco_freebsd.c +++ b/src/openvpn/dco_freebsd.c @@ -842,6 +842,7 @@ retry: buf = realloc(buf, buf_size); + check_malloc_return(buf); drv.ifd_len = buf_size; drv.ifd_data = buf; -- To view, visit http://gerrit.openvpn.net/c/openvpn/+/1669?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: Icd8ea093dfe9f1888570f3d7b786b951b5262e47 Gerrit-Change-Number: 1669 Gerrit-PatchSet: 3 Gerrit-Owner: flichtenheld <[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
