Module Name: src
Committed By: agc
Date: Sun Jan 2 18:13:10 UTC 2011
Modified Files:
src/crypto/external/bsd/netpgp/dist/src/lib: crypto.c
Log Message:
Fix a double free[*], pointed out by Anthony Bentley.
[*] This was actually a triple free. We go all the way to 11.
To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 \
src/crypto/external/bsd/netpgp/dist/src/lib/crypto.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/crypto.c
diff -u src/crypto/external/bsd/netpgp/dist/src/lib/crypto.c:1.34 src/crypto/external/bsd/netpgp/dist/src/lib/crypto.c:1.35
--- src/crypto/external/bsd/netpgp/dist/src/lib/crypto.c:1.34 Mon Nov 29 04:20:12 2010
+++ src/crypto/external/bsd/netpgp/dist/src/lib/crypto.c Sun Jan 2 18:13:10 2011
@@ -54,7 +54,7 @@
#if defined(__NetBSD__)
__COPYRIGHT("@(#) Copyright (c) 2009 The NetBSD Foundation, Inc. All rights reserved.");
-__RCSID("$NetBSD: crypto.c,v 1.34 2010/11/29 04:20:12 agc Exp $");
+__RCSID("$NetBSD: crypto.c,v 1.35 2011/01/02 18:13:10 agc Exp $");
#endif
#include <sys/types.h>
@@ -598,11 +598,8 @@
pgp_reader_pop_dearmour(parse);
}
-
/* tidy up */
pgp_teardown_memory_read(parse, inmem);
- pgp_memory_release(inmem);
- free(inmem);
pgp_writer_close(parse->cbinfo.output);
pgp_output_delete(parse->cbinfo.output);
