From 9232d4d90014350681428e64b76ca9f697b0c548 Mon Sep 17 00:00:00 2001 From: benno Date: Mon, 25 May 2015 18:48:17 +0000 Subject: [PATCH] fix a panic in import_identities() in case the ID isnt loaded (triggered by bgpd). ok marku@s, mikeb@ --- sys/net/pfkeyv2_convert.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/sys/net/pfkeyv2_convert.c b/sys/net/pfkeyv2_convert.c index 946c11a545d..1170a0c6fcb 100644 --- a/sys/net/pfkeyv2_convert.c +++ b/sys/net/pfkeyv2_convert.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pfkeyv2_convert.c,v 1.51 2015/05/23 12:38:53 markus Exp $ */ +/* $OpenBSD: pfkeyv2_convert.c,v 1.52 2015/05/25 18:48:17 benno Exp $ */ /* * The author of this code is Angelos D. Keromytis (angelos@keromytis.org) * @@ -746,8 +746,10 @@ import_identities(struct ipsec_ids **ids, int swapped, if (*ids == tmp) return; } - free(tmp->id_local, M_CREDENTIALS, 0); - free(tmp->id_remote, M_CREDENTIALS, 0); + if (tmp->id_local != NULL) + free(tmp->id_local, M_CREDENTIALS, 0); + if (tmp->id_remote != NULL) + free(tmp->id_remote, M_CREDENTIALS, 0); free(tmp, M_CREDENTIALS, 0); } -- 2.20.1