status-im
/
react-native
mirror of https://github.com/status-im/react-native.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Don't crash in StackTraceHelper.convertJsStackTrace 

Summary:
Don't crash in `StackTraceHelper.convertJsStackTrace` on missing `lineNumber`

I've seen the native Android app crash upon displaying a stack trace because of this bug.

Incidental and unrelated change: Refactor `StackTraceHelper.formatFrameSource` to use `StringBuilder`
Closes https://github.com/facebook/react-native/pull/12920

Differential Revision: D4709273

fbshipit-source-id: 95b3eb303f259460e33d8ee32a2db652360c645d
This commit is contained in:
Petter Hesselberg 2017-03-14 16:06:57 -07:00 committed by Facebook Github Bot
parent 87137cadd7
commit 957b55c769
1 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
ReactAndroid/src/main/java/com/facebook/react/devsupport/StackTraceHelper.java
View File

@ -22,6 +22,9 @@ import com.facebook.react.devsupport.interfaces.StackFrame;
*/ */
public class StackTraceHelper { public class StackTraceHelper {
public static final java.lang.String COLUMN_KEY = "column";
public static final java.lang.String LINE_NUMBER_KEY = "lineNumber";
/** /**
* Represents a generic entry in a stack trace, be it originally from JS or Java. * Represents a generic entry in a stack trace, be it originally from JS or Java.
*/ */
@ -101,10 +104,13 @@ public class StackTraceHelper {
ReadableMap frame = stack.getMap(i); ReadableMap frame = stack.getMap(i);
String methodName = frame.getString("methodName"); String methodName = frame.getString("methodName");
String fileName = frame.getString("file"); String fileName = frame.getString("file");
int lineNumber = frame.getInt("lineNumber"); int lineNumber = -1;
if (frame.hasKey(LINE_NUMBER_KEY) && !frame.isNull(LINE_NUMBER_KEY)) {
lineNumber = frame.getInt(LINE_NUMBER_KEY);
}
int columnNumber = -1; int columnNumber = -1;
if (frame.hasKey("column") && !frame.isNull("column")) { if (frame.hasKey(COLUMN_KEY) && !frame.isNull(COLUMN_KEY)) {
columnNumber = frame.getInt("column"); columnNumber = frame.getInt(COLUMN_KEY);
} }
result[i] = new StackFrameImpl(fileName, methodName, lineNumber, columnNumber); result[i] = new StackFrameImpl(fileName, methodName, lineNumber, columnNumber);
} }
@ -132,12 +138,17 @@ public class StackTraceHelper {
* Format a {@link StackFrame} to a String (method name is not included). * Format a {@link StackFrame} to a String (method name is not included).
*/ */
public static String formatFrameSource(StackFrame frame) { public static String formatFrameSource(StackFrame frame) {
String lineInfo = ""; StringBuilder lineInfo = new StringBuilder();
final int column = frame.getColumn(); lineInfo.append(frame.getFileName());
// If the column is 0, don't show it in red box. final int line = frame.getLine();
final String columnString = column <= 0 ? "" : ":" + column; if (line > 0) {
lineInfo += frame.getFileName() + ":" + frame.getLine() + columnString; lineInfo.append(":").append(line);
return lineInfo; final int column = frame.getColumn();
if (column > 0) {
lineInfo.append(":").append(column);
}
}
return lineInfo.toString();
} }
/** /**