From: Martin Willi <martin@revosec.ch>
Date: Tue, 24 Jul 2012 10:20:32 +0000 (+0200)
Subject: Check if subset calculation actually yields a TS in Unity narrowing
X-Git-Tag: 5.0.1~82^2~11
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e39e6974297e7031bd2f9fc2ecc0abb94b3caa87;p=thirdparty%2Fstrongswan.git

Check if subset calculation actually yields a TS in Unity narrowing
---

diff --git a/src/libcharon/plugins/unity/unity_narrow.c b/src/libcharon/plugins/unity/unity_narrow.c
index dada26dc6a..a5fcfabc72 100644
--- a/src/libcharon/plugins/unity/unity_narrow.c
+++ b/src/libcharon/plugins/unity/unity_narrow.c
@@ -53,7 +53,11 @@ METHOD(listener_t, narrow, bool,
 			{	/* got one, replace original TS */
 				remote->remove_first(remote, (void**)&orig);
 			}
-			remote->insert_last(remote, orig->get_subset(orig, current));
+			current = orig->get_subset(orig, current);
+			if (current)
+			{
+				remote->insert_last(remote, current);
+			}
 		}
 		enumerator->destroy(enumerator);
 		if (orig)