From 43ba803237c908420432b25edcd32c77a7ad0b2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Love=20H=C3=B6rnquist=20=C3=85strand?= Date: Tue, 5 Jun 2007 03:41:17 +0000 Subject: [PATCH] (hx509_certs_merge): its ok to merge in the NULL set of certs. git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@20911 ec53bebd-3082-4978-b11e-865c3cabbd6b --- lib/hx509/keyset.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/hx509/keyset.c b/lib/hx509/keyset.c index c9102654c..e884ab916 100644 --- a/lib/hx509/keyset.c +++ b/lib/hx509/keyset.c @@ -319,6 +319,8 @@ certs_merge_func(hx509_context context, void *ctx, hx509_cert c) int hx509_certs_merge(hx509_context context, hx509_certs to, hx509_certs from) { + if (from == NULL) + return 0; return hx509_certs_iter(context, from, certs_merge_func, to); }