From 92fba02d577557b7fc2bb15423906e570675b64e Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Wed, 27 Aug 2014 22:25:37 +0000
Subject: [PATCH] Fix null dereference in ldisc_configure.

The IDM_RECONF handler unconditionally calls ldisc_configure to
reconfigure the line discipline for the new echo/edit settings, but in
fact ldisc can be NULL if no session is currently active. (Indeed, the
very next line acknowledges this, by testing it for NULL before
calling ldisc_send!) Thanks to Alexander Wong for the report.

[originally from svn r10214]
---
 windows/window.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/windows/window.c b/windows/window.c
index 6ee53434..7c320a0a 100644
--- a/windows/window.c
+++ b/windows/window.c
@@ -2234,9 +2234,10 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
 		 * Flush the line discipline's edit buffer in the
 		 * case where local editing has just been disabled.
 		 */
-		ldisc_configure(ldisc, conf);
-		if (ldisc)
+		if (ldisc) {
+                    ldisc_configure(ldisc, conf);
 		    ldisc_send(ldisc, NULL, 0, 0);
+                }
 		if (pal)
 		    DeleteObject(pal);
 		logpal = NULL;