Module Name: src
Committed By: agc
Date: Tue Jun 9 19:32:11 UTC 2009
Modified Files:
src/crypto/external/bsd/netpgp/dist/src/lib: packet-parse.c
Log Message:
avoid a double-free of the passphrase
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 \
src/crypto/external/bsd/netpgp/dist/src/lib/packet-parse.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/packet-parse.c
diff -u src/crypto/external/bsd/netpgp/dist/src/lib/packet-parse.c:1.19 src/crypto/external/bsd/netpgp/dist/src/lib/packet-parse.c:1.20
--- src/crypto/external/bsd/netpgp/dist/src/lib/packet-parse.c:1.19 Tue Jun 9 00:51:02 2009
+++ src/crypto/external/bsd/netpgp/dist/src/lib/packet-parse.c Tue Jun 9 19:32:11 2009
@@ -58,7 +58,7 @@
#if defined(__NetBSD__)
__COPYRIGHT("@(#) Copyright (c) 2009 The NetBSD Foundation, Inc. All rights reserved.");
-__RCSID("$NetBSD: packet-parse.c,v 1.19 2009/06/09 00:51:02 agc Exp $");
+__RCSID("$NetBSD: packet-parse.c,v 1.20 2009/06/09 19:32:11 agc Exp $");
#endif
#ifdef HAVE_OPENSSL_CAST_H
@@ -167,7 +167,6 @@
&stream->readinfo, &stream->cbinfo)) {
return 0;
}
- /* ! ensure the string is NULL-terminated */
(*str)[len] = '\0';
return 1;
}
@@ -2620,7 +2619,6 @@
}
__ops_forget(passphrase, passlen);
- (void) free(passphrase);
__ops_crypt_any(&decrypt, pkt.u.seckey.alg);
if (__ops_get_debug_level(__FILE__)) {
