mirror of
https://github.com/bitwarden/android.git
synced 2024-12-25 02:18:27 +03:00
guard against infinite recursion and loops
This commit is contained in:
parent
7654bb7088
commit
d5c3ae3d19
1 changed files with 21 additions and 18 deletions
|
@ -19,6 +19,7 @@ namespace Bit.Android
|
||||||
{
|
{
|
||||||
private NotificationChannel _notificationChannel;
|
private NotificationChannel _notificationChannel;
|
||||||
|
|
||||||
|
private const string BitwardenTag = "bw_access";
|
||||||
private const int AutoFillNotificationId = 34573;
|
private const int AutoFillNotificationId = 34573;
|
||||||
private const string SystemUiPackage = "com.android.systemui";
|
private const string SystemUiPackage = "com.android.systemui";
|
||||||
private const string BitwardenPackage = "com.x8bit.bitwarden";
|
private const string BitwardenPackage = "com.x8bit.bitwarden";
|
||||||
|
@ -439,42 +440,44 @@ namespace Bit.Android
|
||||||
|
|
||||||
private NodeList GetWindowNodes(AccessibilityNodeInfo n, AccessibilityEvent e,
|
private NodeList GetWindowNodes(AccessibilityNodeInfo n, AccessibilityEvent e,
|
||||||
Func<AccessibilityNodeInfo, bool> condition, bool disposeIfUnused, NodeList nodes = null,
|
Func<AccessibilityNodeInfo, bool> condition, bool disposeIfUnused, NodeList nodes = null,
|
||||||
int recursionDepth = 0, AccessibilityNodeInfo parentNode = null)
|
int recursionDepth = 0)
|
||||||
{
|
{
|
||||||
if(nodes == null)
|
if(nodes == null)
|
||||||
{
|
{
|
||||||
nodes = new NodeList();
|
nodes = new NodeList();
|
||||||
}
|
}
|
||||||
|
|
||||||
//global::Android.Util.Log.Info("bw_access", "node: " + n.ToString());
|
|
||||||
//global::Android.Util.Log.Info("bw_access", "recursiveIterations = " + recursiveIterations);
|
|
||||||
|
|
||||||
var sameAsParent = n?.GetHashCode() == parentNode?.GetHashCode();
|
|
||||||
if(sameAsParent)
|
|
||||||
{
|
|
||||||
global::Android.Util.Log.Info("bw_access", "child is same as parent!");
|
|
||||||
}
|
|
||||||
|
|
||||||
if(n != null && recursionDepth < 50 && !sameAsParent)
|
|
||||||
{
|
|
||||||
var dispose = disposeIfUnused;
|
var dispose = disposeIfUnused;
|
||||||
|
if(n != null && recursionDepth < 50)
|
||||||
|
{
|
||||||
if(n.WindowId == e.WindowId && !(n.ViewIdResourceName?.StartsWith(SystemUiPackage) ?? false) && condition(n))
|
if(n.WindowId == e.WindowId && !(n.ViewIdResourceName?.StartsWith(SystemUiPackage) ?? false) && condition(n))
|
||||||
{
|
{
|
||||||
dispose = false;
|
dispose = false;
|
||||||
nodes.Add(n);
|
nodes.Add(n);
|
||||||
}
|
}
|
||||||
|
|
||||||
//global::Android.Util.Log.Info("bw_access", "ChildCount " + n.ChildCount);
|
|
||||||
for(var i = 0; i < n.ChildCount; i++)
|
for(var i = 0; i < n.ChildCount; i++)
|
||||||
{
|
{
|
||||||
var childNode = n.GetChild(i);
|
var childNode = n.GetChild(i);
|
||||||
GetWindowNodes(childNode, e, condition, true, nodes, recursionDepth++, n);
|
if(i > 100)
|
||||||
|
{
|
||||||
|
global::Android.Util.Log.Info(BitwardenTag, "Too many child iterations.");
|
||||||
|
}
|
||||||
|
else if(childNode.GetHashCode() == n.GetHashCode())
|
||||||
|
{
|
||||||
|
global::Android.Util.Log.Info(BitwardenTag,
|
||||||
|
"Child node is the same as parent for some reason.");
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
GetWindowNodes(childNode, e, condition, true, nodes, recursionDepth++);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if(dispose)
|
if(dispose)
|
||||||
{
|
{
|
||||||
n.Dispose();
|
n?.Dispose();
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return nodes;
|
return nodes;
|
||||||
|
|
Loading…
Reference in a new issue