diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2018-08-13 04:41:05 +0200 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2018-08-13 04:42:13 +0200 |
| commit | c3903c38b0fd168ab3d925c2b129d1a599593426 (patch) | |
| tree | a0914654d1d42e32084afe2d34144c0fadc2735d /compat.h | |
| parent | upstream: better diagnosics on alg list assembly errors; ok (diff) | |
| download | openssh-c3903c38b0fd168ab3d925c2b129d1a599593426.tar.xz openssh-c3903c38b0fd168ab3d925c2b129d1a599593426.zip | |
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
Diffstat (limited to 'compat.h')
| -rw-r--r-- | compat.h | 14 |
1 files changed, 4 insertions, 10 deletions
@@ -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 |