From ddf7c6ac7b74440a28ce791d40094ab665c66472 Mon Sep 17 00:00:00 2001
From: Martin Willi <martin@strongswan.org>
Date: Thu, 13 Aug 2009 16:04:45 +0200
Subject: [PATCH] do not enumerate builders returning NULL

---
 src/libstrongswan/credentials/credential_factory.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/libstrongswan/credentials/credential_factory.c b/src/libstrongswan/credentials/credential_factory.c
index e50740710..40638119f 100644
--- a/src/libstrongswan/credentials/credential_factory.c
+++ b/src/libstrongswan/credentials/credential_factory.c
@@ -65,11 +65,17 @@ struct entry_t {
  */
 static bool builder_filter(entry_t *data, entry_t **in, builder_t **out)
 {
+	builder_t *builder;
+	
 	if (data->type == (*in)->type &&
 		data->subtype == (*in)->subtype)
 	{
-		*out = (*in)->constructor(data->subtype);
-		return TRUE;
+		builder = (*in)->constructor(data->subtype);
+		if (builder)
+		{
+			*out = builder;
+			return TRUE;
+		}
 	}
 	return FALSE;
 }