[openssh-commits] [openssh] 03/10: upstream commit

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

dtucker pushed a commit to branch master
in repository openssh.

commit 7ec4946fb686813eb5f8c57397e465f5485159f4
Author: dtucker at openbsd.org <dtucker at openbsd.org>
Date:   Tue May 24 02:31:57 2016 +0000

    upstream commit
    
    Back out 'plug memleak'.
    
    Upstream-ID: 4faacdde136c24a961e24538de373660f869dbc0
---
 compat.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/compat.c b/compat.c
index 53d1d9b..69a104f 100644
--- a/compat.c
+++ b/compat.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: compat.c,v 1.98 2016/05/23 00:17:27 dtucker Exp $ */
+/* $OpenBSD: compat.c,v 1.99 2016/05/24 02:31:57 dtucker Exp $ */
 /*
  * Copyright (c) 1999, 2000, 2001, 2002 Markus Friedl.  All rights reserved.
  *
@@ -252,7 +252,7 @@ proto_spec(const char *spec)
 
 /*
  * Filters a proposal string, excluding any algorithm matching the 'filter'
- * pattern list.  Returns a new string and frees the original proposal.
+ * pattern list.
  */
 static char *
 filter_proposal(char *proposal, const char *filter)
@@ -275,7 +275,6 @@ filter_proposal(char *proposal, const char *filter)
 	fix_prop = xstrdup((char *)buffer_ptr(&b));
 	buffer_free(&b);
 	free(orig_prop);
-	free(proposal);
 
 	return fix_prop;
 }

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.