Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bound Telecom logging recursion

Browse Source 
Put a bound on the recursion in Session#toString
to ensure we do not accidently cause a Stack overflow

Bug: 186694546
AOSP: aosp/1691210
Test: atest TeleServiceTests
Change-Id: I52f44dd02d0d860d0894e9b84fded8cf5ff5a18e
This commit is contained in:
Brad Ebinger
2021-04-29 13:59:16 -07:00
parent ce5f5faab8
commit bde5c37520
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
telecomm/java/android/telecom/Logging/Session.java
View File

@@ -453,19 +453,19 @@ public class Session {
@Override @Override
public String toString() { public String toString() {
if (mParentSession != null && mIsStartedFromActiveSession) { Session sessionToPrint = this;
if (getParentSession() != null && isStartedFromActiveSession()) {
// Log.startSession was called from within another active session. Use the parent's // Log.startSession was called from within another active session. Use the parent's
// Id instead of the child to reduce confusion. // Id instead of the child to reduce confusion.
return mParentSession.toString(); sessionToPrint = getRootSession("toString");
} else { }
StringBuilder methodName = new StringBuilder(); StringBuilder methodName = new StringBuilder();
methodName.append(getFullMethodPath(false /*truncatePath*/)); methodName.append(sessionToPrint.getFullMethodPath(false /*truncatePath*/));
if (mOwnerInfo != null && !mOwnerInfo.isEmpty()) { if (sessionToPrint.getOwnerInfo() != null && !sessionToPrint.getOwnerInfo().isEmpty()) {
methodName.append("("); methodName.append("(");
methodName.append(mOwnerInfo); methodName.append(sessionToPrint.getOwnerInfo());
methodName.append(")"); methodName.append(")");
} }
return methodName.toString() + "@" + getFullSessionId(); return methodName.toString() + "@" + sessionToPrint.getFullSessionId();
}
} }
} }