From: Andreas Steffen <andreas.steffen@strongswan.org>
Date: Mon, 29 Mar 2010 15:44:37 +0000 (+0200)
Subject: fixed pluto crash caused by expired leftcert and rightca=%same
X-Git-Tag: 4.4.0~153
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=061c95b449f5c6ce9ca81eb1f6e8a846a69c447c;p=thirdparty%2Fstrongswan.git

fixed pluto crash caused by expired leftcert and rightca=%same
---

diff --git a/src/pluto/connections.c b/src/pluto/connections.c
index cd76370992..421dd79b43 100644
--- a/src/pluto/connections.c
+++ b/src/pluto/connections.c
@@ -1122,11 +1122,11 @@ void add_connection(const whack_message_t *wm)
 		same_leftca  = extract_end(&c->spd.this, &wm->left, "left");
 		same_rightca = extract_end(&c->spd.that, &wm->right, "right");
 
-		if (same_rightca)
+		if (same_rightca && c->spd.this.ca)
 		{
 			c->spd.that.ca = c->spd.this.ca->clone(c->spd.this.ca);
 		}
-		else if (same_leftca)
+		else if (same_leftca && c->spd.that.ca)
 		{
 			c->spd.this.ca = c->spd.that.ca->clone(c->spd.that.ca);
 		}