From 2f2b1413e45701df1c3df6b4bb2b99697aef7876 Mon Sep 17 00:00:00 2001
From: stepan <stepan.sindelar@oracle.com>
Date: Thu, 10 Aug 2017 18:04:35 +0200
Subject: [PATCH] Fix NPE in ConsoleHandler
---
.../src/com/oracle/truffle/r/launcher/ConsoleHandler.java | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/com.oracle.truffle.r.launcher/src/com/oracle/truffle/r/launcher/ConsoleHandler.java b/com.oracle.truffle.r.launcher/src/com/oracle/truffle/r/launcher/ConsoleHandler.java
index 895f1edede..f83c933b57 100644
--- a/com.oracle.truffle.r.launcher/src/com/oracle/truffle/r/launcher/ConsoleHandler.java
+++ b/com.oracle.truffle.r.launcher/src/com/oracle/truffle/r/launcher/ConsoleHandler.java
@@ -57,7 +57,11 @@ public abstract class ConsoleHandler {
public int read() throws IOException {
if (buffer == null) {
pos = 0;
- buffer = readLine().getBytes(StandardCharsets.UTF_8);
+ String line = readLine();
+ if (line == null) {
+ return -1;
+ }
+ buffer = line.getBytes(StandardCharsets.UTF_8);
}
if (pos == buffer.length) {
buffer = null;
--
GitLab