From f0b9fde36a0296265dfc38f7d59d161cd66d451a Mon Sep 17 00:00:00 2001 From: dtucker Date: Fri, 4 Jul 2008 02:54:25 +0000 Subject: [PATCH] - otto@cvs.openbsd.org 2008/07/03 21:46:58 [auth2-pubkey.c] avoid nasty double free; ok dtucker@ djm@ --- ChangeLog | 3 +++ auth2-pubkey.c | 3 +-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index b5945b84..ce004fee 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,9 @@ enabled, delay the fork until after replies for any -R forwards have been seen. Allows for robust detection of -R forward failure when using -f (similar to bz#92); ok dtucker@ + - otto@cvs.openbsd.org 2008/07/03 21:46:58 + [auth2-pubkey.c] + avoid nasty double free; ok dtucker@ djm@ 20080702 - (dtucker) OpenBSD CVS Sync diff --git a/auth2-pubkey.c b/auth2-pubkey.c index daa751ca..b1e38e5f 100644 --- a/auth2-pubkey.c +++ b/auth2-pubkey.c @@ -1,4 +1,4 @@ -/* $OpenBSD: auth2-pubkey.c,v 1.18 2008/07/02 12:03:51 dtucker Exp $ */ +/* $OpenBSD: auth2-pubkey.c,v 1.19 2008/07/03 21:46:58 otto Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. * @@ -195,7 +195,6 @@ user_key_allowed2(struct passwd *pw, Key *key, char *file) f = auth_openkeyfile(file, pw, options.strict_modes); if (!f) { - xfree(file); restore_uid(); return 0; } -- 2.45.2