From b4d874addbef08898205b6017dcb6363ddefef32 Mon Sep 17 00:00:00 2001
From: Peter Keller <petekeller2@gmail.com>
Date: Sun, 28 May 2017 18:02:48 -0400
Subject: [PATCH 1/2] readline: numeric strings converted to integers in
 cursorTo

---
 doc/api/readline.md                |  2 +-
 lib/readline.js                    | 20 +++++++++++++++-----
 test/parallel/test-readline-csi.js | 12 ++++++++++++
 3 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/doc/api/readline.md b/doc/api/readline.md
index 136d0e63ceb81d..007b9cd517fb6f 100644
--- a/doc/api/readline.md
+++ b/doc/api/readline.md
@@ -439,7 +439,7 @@ added: v0.7.7
 * `y` {number}
 
 The `readline.cursorTo()` method moves cursor to the specified position in a
-given [TTY][] `stream`.
+given [TTY][] `stream`. `x` and `y` can be numeric strings.
 
 ## readline.emitKeypressEvents(stream[, interface])
 <!-- YAML
diff --git a/lib/readline.js b/lib/readline.js
index 60864f40afdbc1..b1436b32b9a637 100644
--- a/lib/readline.js
+++ b/lib/readline.js
@@ -1049,16 +1049,26 @@ function cursorTo(stream, x, y) {
   if (stream === null || stream === undefined)
     return;
 
-  if (typeof x !== 'number' && typeof y !== 'number')
+  let X = x;
+  if (typeof X !== 'number') {
+    X = parseInt(X);
+  }
+
+  let Y = y;
+  if (typeof Y !== 'number') {
+    Y = parseInt(Y);
+  }
+
+  if (typeof X !== 'number' && typeof Y !== 'number')
     return;
 
-  if (typeof x !== 'number')
+  if (typeof X !== 'number')
     throw new Error('Can\'t set cursor row without also setting it\'s column');
 
-  if (typeof y !== 'number') {
-    stream.write(CSI`${x + 1}G`);
+  if (typeof Y !== 'number') {
+    stream.write(CSI`${X + 1}G`);
   } else {
-    stream.write(CSI`${y + 1};${x + 1}H`);
+    stream.write(CSI`${Y + 1};${X + 1}H`);
   }
 }
 
diff --git a/test/parallel/test-readline-csi.js b/test/parallel/test-readline-csi.js
index bde37138e3b3dd..13bc828b311bfe 100644
--- a/test/parallel/test-readline-csi.js
+++ b/test/parallel/test-readline-csi.js
@@ -88,3 +88,15 @@ assert.strictEqual(writable.data, '\x1b[2G');
 writable.data = '';
 assert.doesNotThrow(() => readline.cursorTo(writable, 1, 2));
 assert.strictEqual(writable.data, '\x1b[3;2H');
+
+writable.data = '';
+assert.doesNotThrow(() => readline.cursorTo(writable, '1', 2));
+assert.strictEqual(writable.data, '\x1b[3;2H');
+
+writable.data = '';
+assert.doesNotThrow(() => readline.cursorTo(writable, 1, '2'));
+assert.strictEqual(writable.data, '\x1b[3;2H');
+
+writable.data = '';
+assert.doesNotThrow(() => readline.cursorTo(writable, '1', '2'));
+assert.strictEqual(writable.data, '\x1b[3;2H');

From 7ec023712fb5cdf6b1202dacc419bfd4f84334d6 Mon Sep 17 00:00:00 2001
From: Peter Keller <petekeller2@gmail.com>
Date: Sun, 28 May 2017 18:53:20 -0400
Subject: [PATCH 2/2] readline: bug fix

---
 lib/readline.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lib/readline.js b/lib/readline.js
index b1436b32b9a637..9eb12f81190220 100644
--- a/lib/readline.js
+++ b/lib/readline.js
@@ -1052,11 +1052,17 @@ function cursorTo(stream, x, y) {
   let X = x;
   if (typeof X !== 'number') {
     X = parseInt(X);
+    if (isNaN(X)) {
+      X = x;
+    }
   }
 
   let Y = y;
   if (typeof Y !== 'number') {
     Y = parseInt(Y);
+    if (isNaN(Y)) {
+      Y = y;
+    }
   }
 
   if (typeof X !== 'number' && typeof Y !== 'number')