[src/trunk]: src/crypto/external/bsd/netpgp/dist/src/lib avoid a double free ...

[agc <agc%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/1e5025afa6d5
branches:  trunk
changeset: 760343:1e5025afa6d5
user:      agc <agc%NetBSD.org@localhost>
date:      Mon Jan 03 05:34:53 2011 +0000

description:
avoid a double free - from Anthony Bentley.

diffstat:

 crypto/external/bsd/netpgp/dist/src/lib/netpgp.c |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (21 lines):

diff -r 4614d8afa559 -r 1e5025afa6d5 crypto/external/bsd/netpgp/dist/src/lib/netpgp.c
--- a/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c  Mon Jan 03 03:43:22 2011 +0000
+++ b/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c  Mon Jan 03 05:34:53 2011 +0000
@@ -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) {