TranscriptScreen: guard against null rowColorBuffer when getting transcript

steven676 · steven676 · commit 389f11796716 · 2012-09-30T23:54:16.000-07:00
This occurs, for instance, when we try to retrieve text from the transcript without caring about color information. Fixes crash when selecting/copying text introduced by 54d2530... ("Make blank lines track the current foreground/background color.").
diff --git a/libraries/emulatorview/src/jackpal/androidterm/emulatorview/TranscriptScreen.java b/libraries/emulatorview/src/jackpal/androidterm/emulatorview/TranscriptScreen.java
@@ -350,7 +350,7 @@ private String internalGetTranscriptText(GrowableIntArray colors, int selX1, int
                 char c = line[i];
                 if (c == 0) {
                     break;
-                } else if (c != ' ' || (rowColorBuffer.get(column) != defaultColor)) {
+                } else if (c != ' ' || ((rowColorBuffer != null) && (rowColorBuffer.get(column) != defaultColor))) {
                     lastPrintingChar = i;
                 }
                 if (!Character.isLowSurrogate(c)) {

Original file line number	Diff line number	Diff line change
`@@ -350,7 +350,7 @@ private String internalGetTranscriptText(GrowableIntArray colors, int selX1, int`
`350`	`350`	`char c = line[i];`
`351`	`351`	`if (c == 0) {`
`352`	`352`	`break;`
`353`		`- } else if (c != ' ' \|\| (rowColorBuffer.get(column) != defaultColor)) {`
	`353`	`+ } else if (c != ' ' \|\| ((rowColorBuffer != null) && (rowColorBuffer.get(column) != defaultColor))) {`
`354`	`354`	`lastPrintingChar = i;`
`355`	`355`	`}`
`356`	`356`	`if (!Character.isLowSurrogate(c)) {`