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]

diff --git a/windows/window.c b/windows/window.c
index 6ee534348160f59365057de3411829659b50a12c..7c320a0acb5c80e93bca18db0d6745cd333b5857 100644 (file)
--- 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;