from_backend() should always be called with len > 0. Only rlogin

[u/mdw/putty] / terminal.c

diff --git a/terminal.c b/terminal.c
index 2962b0a..d76d734 100644 (file)
--- a/terminal.c
+++ b/terminal.c
@@ -1993,8 +1993,8 @@ void term_out(void)
                                break;
                              case 8:
                                if (esc_nargs >= 3) {
-                                   request_resize(def(esc_args[1], cfg.width),
-                                                  def(esc_args[2], cfg.height));
+                                   request_resize(def(esc_args[2], cfg.width),
+                                                  def(esc_args[1], cfg.height));
                                }
                                break;
                              case 9:
@@ -2017,7 +2017,7 @@ void term_out(void)
                                break;
                              case 18:
                                len = sprintf(buf, "\033[8;%d;%dt",
-                                             cols, rows);
+                                             rows, cols);
                                ldisc_send(buf, len, 0);
                                break;
                              case 19:
@@ -3603,6 +3603,8 @@ int term_ldisc(int option)
  */
 int from_backend(int is_stderr, char *data, int len)
 {
+    assert(len > 0);
+
     bufchain_add(&inbuf, data, len);
 
     /*