From c3903c38b0fd168ab3d925c2b129d1a599593426 Mon Sep 17 00:00:00 2001 From: "djm@openbsd.org" Date: Mon, 13 Aug 2018 02:41:05 +0000 Subject: upstream: revert compat.[ch] section of the following change. It causes double-free under some circumstances. -- date: 2018/07/31 03:07:24; author: djm; state: Exp; lines: +33 -18; commitid: f7g4UI8eeOXReTPh; fix some memory leaks spotted by Coverity via Jakub Jelen in bz#2366 feedback and ok dtucker@ OpenBSD-Commit-ID: 1e77547f60fdb5e2ffe23e2e4733c54d8d2d1137 --- compat.h | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'compat.h') diff --git a/compat.h b/compat.h index e2877737..d611d33e 100644 --- a/compat.h +++ b/compat.h @@ -1,4 +1,4 @@ -/* $OpenBSD: compat.h,v 1.53 2018/07/31 03:07:24 djm Exp $ */ +/* $OpenBSD: compat.h,v 1.54 2018/08/13 02:41:05 djm Exp $ */ /* * Copyright (c) 1999, 2000, 2001 Markus Friedl. All rights reserved. @@ -65,15 +65,9 @@ u_int compat_datafellows(const char *); int proto_spec(const char *); - -/* - * compat_*_proposal will update their respective proposals based on the - * active compat flags. The replacement is performed in-place - i.e. they - * will free their argument and return a new heap-allocated string. - */ -char *compat_cipher_proposal(char *, u_int compat); -char *compat_pkalg_proposal(char *, u_int compat); -char *compat_kex_proposal(char *, u_int compat); +char *compat_cipher_proposal(char *); +char *compat_pkalg_proposal(char *); +char *compat_kex_proposal(char *); extern int datafellows; #endif -- cgit v1.2.3