From 40e66b1af1d4c2c66f238f178812e6f111469298 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Wed, 16 Jun 2004 09:36:59 +0000 Subject: (copy_secret_key): Fixed memory leak. --- THANKS | 1 + g10/ChangeLog | 4 ++++ g10/free-packet.c | 9 +++++++++ 3 files changed, 14 insertions(+) diff --git a/THANKS b/THANKS index 0336d65ff..9e3e1aa0f 100644 --- a/THANKS +++ b/THANKS @@ -11,6 +11,7 @@ Anand Kumria wildfire@progsoc.uts.edu.au Andreas Haumer andreas@xss.co.at Anthony Mulcahy anthony@kcn.ne.jp Ariel T Glenn ariel@columbia.edu +Atom 'Smasher' atom@suspicious.org Bob Mathews bobmathews@mindspring.com Bodo Moeller Bodo_Moeller@public.uni-hamburg.de Brendan O'Dea bod@debian.org diff --git a/g10/ChangeLog b/g10/ChangeLog index 822150399..cb73e2662 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,7 @@ +2004-06-16 Werner Koch + + * free-packet.c (copy_secret_key): Fixed memory leak. + 2004-06-01 David Shaw * g10.c (main): Alias --charset as --display-charset to help avoid diff --git a/g10/free-packet.c b/g10/free-packet.c index 89a67eb1f..d5965808c 100644 --- a/g10/free-packet.c +++ b/g10/free-packet.c @@ -264,11 +264,20 @@ copy_secret_key( PKT_secret_key *d, PKT_secret_key *s ) memcpy( d, s, sizeof *d ); n = pubkey_get_nskey( s->pubkey_algo ); if( !n ) + { + if (d->skey[0]) + mpi_free (d->skey[0]); d->skey[0] = mpi_copy(s->skey[0]); + } else { for(i=0; i < n; i++ ) + { + if (d->skey[i]) + mpi_free (d->skey[i]); d->skey[i] = mpi_copy( s->skey[i] ); + } } + return d; } -- cgit v1.2.3