nano

commit 6d6f5bd4a700f1cb3b8a56a2ddf2e7b1f4bce788
parent e3dbffc9f77be26c55878c9cdcfb4f8515a6122d
Author: Benno Schulenberg <bensberg@justemail.net>
Date:   Thu, 28 Jul 2016 21:27:45 +0200

tweaks: check earlier on for sufficient length of the sequence

Diffstat:
M
src/winio.c
 | 
14
+++-----------

1 file changed, 3 insertions(+), 11 deletions(-)
diff --git a/src/winio.c b/src/winio.c
@@ -668,13 +668,10 @@ int convert_sequence(const int *seq, size_t seq_len)
 	    case 'O':
 		switch (seq[1]) {
 		    case '1':
-			if (seq_len >= 3) {
-			    switch (seq[2]) {
-				case ';':
-    if (seq_len >= 4) {
+			if (seq_len > 4  && seq[2] == ';') {
+
 	switch (seq[3]) {
 	    case '2':
-		if (seq_len >= 5) {
 		    switch (seq[4]) {
 			case 'A': /* Esc O 1 ; 2 A == Shift-Up on
 				   * Terminal. */
@@ -694,10 +691,8 @@ int convert_sequence(const int *seq, size_t seq_len)
 			case 'S': /* Esc O 1 ; 2 S == F16 on Terminal. */
 			    return KEY_F(16);
 		    }
-		}
 		break;
 	    case '5':
-		if (seq_len >= 5) {
 		    switch (seq[4]) {
 			case 'A': /* Esc O 1 ; 5 A == Ctrl-Up on Terminal. */
 			    return CONTROL_UP;
@@ -708,12 +703,9 @@ int convert_sequence(const int *seq, size_t seq_len)
 			case 'D': /* Esc O 1 ; 5 D == Ctrl-Left on Terminal. */
 			    return CONTROL_LEFT;
 		    }
-		}
 		break;
 	}
-    }
-				    break;
-			    }
+
 			}
 			break;
 		    case '2':