Module Name:    src
Committed By:   agc
Date:           Mon Jan  3 05:34:54 UTC 2011

Modified Files:
        src/crypto/external/bsd/netpgp/dist/src/lib: netpgp.c

Log Message:
avoid a double free - from Anthony Bentley.


To generate a diff of this commit:
cvs rdiff -u -r1.88 -r1.89 \
    src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c
diff -u src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c:1.88 src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c:1.89
--- src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c:1.88	Sat Jan  1 23:00:24 2011
+++ src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c	Mon Jan  3 05:34:53 2011
@@ -34,7 +34,7 @@
 
 #if defined(__NetBSD__)
 __COPYRIGHT("@(#) Copyright (c) 2009 The NetBSD Foundation, Inc. All rights reserved.");
-__RCSID("$NetBSD: netpgp.c,v 1.88 2011/01/01 23:00:24 agc Exp $");
+__RCSID("$NetBSD: netpgp.c,v 1.89 2011/01/03 05:34:53 agc Exp $");
 #endif
 
 #include <sys/types.h>
@@ -1538,7 +1538,7 @@
 	ret = pgp_validate_mem(io, &result, signedmem,
 				(out) ? &cat : NULL,
 				armored, netpgp->pubring);
-	pgp_memory_free(signedmem);
+	/* signedmem is freed from pgp_validate_mem */
 	if (ret) {
 		resultp(io, "<stdin>", &result, netpgp->pubring);
 		if (out) {

Reply via email to