summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2013-05-16 20:26:18 +1000
committerDarren Tucker <dtucker@zip.com.au>2013-05-16 20:26:18 +1000
commitcaf00109346e4ab6bb495b0e22bc5b1e7ee22f26 (patch)
tree9a393056e01903a3612e4a2a4b1935d5862f7061
parent7e831edbf7a1b0b9aeeb08328b9fceafaad1bf22 (diff)
- djm@cvs.openbsd.org 2013/05/10 04:08:01
[key.c] memleak in cert_free(), wasn't actually freeing the struct; bz#2096 from shm AT digitalsun.pl
-rw-r--r--ChangeLog4
-rw-r--r--key.c3
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 375e4d879..506faa40d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -15,6 +15,10 @@
15 [sshconnect2.c] 15 [sshconnect2.c]
16 fix bzero(ptr_to_struct, sizeof(ptr_to_struct)); bz#2100 from 16 fix bzero(ptr_to_struct, sizeof(ptr_to_struct)); bz#2100 from
17 Colin Watson 17 Colin Watson
18 - djm@cvs.openbsd.org 2013/05/10 04:08:01
19 [key.c]
20 memleak in cert_free(), wasn't actually freeing the struct;
21 bz#2096 from shm AT digitalsun.pl
18 22
1920130510 2320130510
20 - (dtucker) [configure.ac] Enable -Wsizeof-pointer-memaccess if the compiler 24 - (dtucker) [configure.ac] Enable -Wsizeof-pointer-memaccess if the compiler
diff --git a/key.c b/key.c
index 471cd1fcc..b8c60cb2c 100644
--- a/key.c
+++ b/key.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: key.c,v 1.101 2013/04/19 01:06:50 djm Exp $ */ 1/* $OpenBSD: key.c,v 1.102 2013/05/10 04:08:01 djm Exp $ */
2/* 2/*
3 * read_bignum(): 3 * read_bignum():
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -195,6 +195,7 @@ cert_free(struct KeyCert *cert)
195 xfree(cert->principals); 195 xfree(cert->principals);
196 if (cert->signature_key != NULL) 196 if (cert->signature_key != NULL)
197 key_free(cert->signature_key); 197 key_free(cert->signature_key);
198 xfree(cert);
198} 199}
199 200
200void 201void