diff options
author | dtucker@openbsd.org <dtucker@openbsd.org> | 2016-05-24 02:31:57 +0000 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2016-06-06 11:25:37 +1000 |
commit | 7ec4946fb686813eb5f8c57397e465f5485159f4 (patch) | |
tree | 28b76b0108d669784f386c0aef4d7cd532f7457c | |
parent | 82f24c3ddc52053aeb7beb3332fa94c92014b0c5 (diff) |
upstream commit
Back out 'plug memleak'.
Upstream-ID: 4faacdde136c24a961e24538de373660f869dbc0
-rw-r--r-- | compat.c | 5 |
1 files changed, 2 insertions, 3 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: compat.c,v 1.98 2016/05/23 00:17:27 dtucker Exp $ */ | 1 | /* $OpenBSD: compat.c,v 1.99 2016/05/24 02:31:57 dtucker Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 1999, 2000, 2001, 2002 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 1999, 2000, 2001, 2002 Markus Friedl. All rights reserved. |
4 | * | 4 | * |
@@ -252,7 +252,7 @@ proto_spec(const char *spec) | |||
252 | 252 | ||
253 | /* | 253 | /* |
254 | * Filters a proposal string, excluding any algorithm matching the 'filter' | 254 | * Filters a proposal string, excluding any algorithm matching the 'filter' |
255 | * pattern list. Returns a new string and frees the original proposal. | 255 | * pattern list. |
256 | */ | 256 | */ |
257 | static char * | 257 | static char * |
258 | filter_proposal(char *proposal, const char *filter) | 258 | filter_proposal(char *proposal, const char *filter) |
@@ -275,7 +275,6 @@ filter_proposal(char *proposal, const char *filter) | |||
275 | fix_prop = xstrdup((char *)buffer_ptr(&b)); | 275 | fix_prop = xstrdup((char *)buffer_ptr(&b)); |
276 | buffer_free(&b); | 276 | buffer_free(&b); |
277 | free(orig_prop); | 277 | free(orig_prop); |
278 | free(proposal); | ||
279 | 278 | ||
280 | return fix_prop; | 279 | return fix_prop; |
281 | } | 280 | } |