From 12cebbf6760c46c9d958cc6f7661d34c0175ffab Mon Sep 17 00:00:00 2001
From: Ben Harris <bjh21@bjh21.me.uk>
Date: Wed, 25 May 2016 22:22:19 +0100
Subject: [PATCH] Assume that u.pfd.pf and u.x11.xconn are not NULL on
 appropriate channels.

Nothing ever sets them to NULL, and the various paths by which the
channel types can be set to CHAN_X11 or CHAN_SOCKDATA all ensure thet
the relevant union members are non-NULL.  All the removed conditionals
have been converted into assertions, just in case  I'm wrong.
---
 ssh.c | 32 ++++++++++++++------------------
 1 file changed, 14 insertions(+), 18 deletions(-)

diff --git a/ssh.c b/ssh.c
index 15c53a62..9ab1d771 100644
--- a/ssh.c
+++ b/ssh.c
@@ -5669,16 +5669,12 @@ static void ssh1_msg_channel_close(Ssh ssh, struct Packet *pktin)
 
             switch (c->type) {
               case CHAN_X11:
-                if (c->u.x11.xconn)
-                    x11_send_eof(c->u.x11.xconn);
-                else
-                    send_close = TRUE;
+                assert(c->u.x11.xconn != NULL);
+		x11_send_eof(c->u.x11.xconn);
 		break;
               case CHAN_SOCKDATA:
-                if (c->u.pfd.pf)
-                    pfd_send_eof(c->u.pfd.pf);
-                else
-                    send_close = TRUE;
+		assert(c->u.pfd.pf != NULL);
+		pfd_send_eof(c->u.pfd.pf);
 		break;
               case CHAN_AGENT:
                 send_close = TRUE;
@@ -8170,16 +8166,16 @@ static void ssh_channel_destroy(struct ssh_channel *c)
         update_specials_menu(ssh->frontend);
         break;
       case CHAN_X11:
-        if (c->u.x11.xconn != NULL)
-            x11_close(c->u.x11.xconn);
+        assert(c->u.x11.xconn != NULL);
+	x11_close(c->u.x11.xconn);
         logevent("Forwarded X11 connection terminated");
         break;
       case CHAN_AGENT:
         sfree(c->u.a.message);
         break;
       case CHAN_SOCKDATA:
-        if (c->u.pfd.pf != NULL)
-            pfd_close(c->u.pfd.pf);
+        assert(c->u.pfd.pf != NULL);
+	pfd_close(c->u.pfd.pf);
         logevent("Forwarded port closed");
         break;
     }
@@ -8376,8 +8372,8 @@ static void ssh2_msg_channel_open_confirmation(Ssh ssh, struct Packet *pktin)
     c->v.v2.remmaxpkt = ssh_pkt_getuint32(pktin);
 
     if (c->type == CHAN_SOCKDATA) {
-        if (c->u.pfd.pf)
-            pfd_confirm(c->u.pfd.pf);
+	assert(c->u.pfd.pf != NULL);
+	pfd_confirm(c->u.pfd.pf);
     } else if (c->type == CHAN_ZOMBIE) {
         /*
          * This case can occur if a local socket error occurred
@@ -11250,12 +11246,12 @@ static void ssh_free(void *handle)
 	while ((c = delpos234(ssh->channels, 0)) != NULL) {
 	    switch (c->type) {
 	      case CHAN_X11:
-		if (c->u.x11.xconn != NULL)
-		    x11_close(c->u.x11.xconn);
+		assert(c->u.x11.xconn != NULL);
+		x11_close(c->u.x11.xconn);
 		break;
 	      case CHAN_SOCKDATA:
-		if (c->u.pfd.pf != NULL)
-		    pfd_close(c->u.pfd.pf);
+		assert(c->u.pfd.pf != NULL);
+		pfd_close(c->u.pfd.pf);
 		break;
 	    }
 	    if (ssh->version == 2) {