210295 2020-04-09 12:07:57 -0700 Fix for crash in test accessibility/Mac/aria-grid-with-strange-hierarchy.html in isolated tree mode. 2020-04-09 14:56:14 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 andresg_22 andresg_22 aboxhall apinheiro cfleizach dmazzoni ews-watchlist jcraig jdiggs samuel_white webkit-bug-importer oldest_to_newest 1639768 0 andresg_22 2020-04-09 12:07:57 -0700 Fix for crash in test accessibility/Mac/aria-grid-with-strange-hierarchy.html in isolated tree mode. 1639781 1 395989 andresg_22 2020-04-09 12:28:23 -0700 Created attachment 395989 Patch 1639785 2 395989 cfleizach 2020-04-09 12:35:53 -0700 Comment on attachment 395989 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=395989&action=review > Source/WebCore/ChangeLog:20 > + - Added strcter assert checks to catch problems with the management of stricter > Source/WebCore/accessibility/isolatedtree/AXIsolatedTree.cpp:217 > auto object = nodeForID(axObjectID); should we assert that the lock is hold in nodeForID() ? 1639818 3 395995 andresg_22 2020-04-09 13:18:51 -0700 Created attachment 395995 Patch 1639895 4 ews-feeder 2020-04-09 14:55:57 -0700 Committed r259832: <https://trac.webkit.org/changeset/259832> All reviewed patches have been landed. Closing bug and clearing flags on attachment 395995. 1639896 5 webkit-bug-importer 2020-04-09 14:56:14 -0700 <rdar://problem/61541961> 395989 2020-04-09 12:28:23 -0700 2020-04-09 13:18:48 -0700 Patch bug-210295-20200409152822.patch text/plain 8165 andresg_22 U3VidmVyc2lvbiBSZXZpc2lvbjogMjU5NjMzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOThmN2I0ZDRjNzY2N2Q3 ZWU3MzQ0Y2UxMTI0MGViMTgxZDM3NDYzMi4uZGYyMGQ2OTdhNDUzMTliYWI3NThjMWFjNzZjMGYy NWMyYzY5MTY2YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMyIEBACisyMDIwLTA0LTA5ICBBbmRy ZXMgR29uemFsZXogIDxhbmRyZXNnXzIyQGFwcGxlLmNvbT4KKworICAgICAgICBGaXggZm9yIGNy YXNoIGluIHRlc3QgYWNjZXNzaWJpbGl0eS9tYWMvYXJpYS1ncmlkLXdpdGgtc3RyYW5nZS1oaWVy YXJjaHkuaHRtbCBpbiBpc29sYXRlZCB0cmVlIG1vZGUuCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTAyOTUKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBDb3ZlcmVkIGJ5IGFjY2Vzc2liaWxpdHkvbWFjL2Fy aWEtZ3JpZC13aXRoLXN0cmFuZ2UtaGllcmFyY2h5Lmh0bWwuCisKKyAgICAgICAgLSBXaGVuIEFY SXNvbGF0ZWRUcmVlOjphcHBseVBlbmRpbmdDaGFuZ2VzIGVuY291bnRlcnMgYSBjaGFuZ2UgZm9y IGFuCisgICAgICAgIGFscmVhZHkgZXhpc3Rpbmcgb2JqZWN0LCB0aGUgZXhpc3Rpbmcgb2JqZWN0 IGlzIGRpc2NhcmRlZCBhbmQgdGhlIG5ldworICAgICAgICBvYmplY3QgcmVwbGFjZXMgaXQgaW4g dGhlIG5vZGVzIG1hcC4gVGhlIGV4aXN0aW5nIGFuZCBuZXcgb2JqZWN0cyBtdXN0CisgICAgICAg IGhhdmUgdGhlIHNhbWUgcGxhdGZvcm0gd3JhcHBlci4gVGh1cyB0aGUgd3JhcHBlciBuZWVkcyB0 byBiZSBkZXRhY2hlZAorICAgICAgICBmcm9tIHRoZSBleGlzdGluZyBvYmplY3QgYWJvdXQgdG8g YmUgZGlzY2FyZGVkLCBhbmQgcmUtYXR0YWNoZWQgdG8gdGhlCisgICAgICAgIG5ldyBvYmplY3Qu IFdlIHdlcmUgbWlzc2luZyB0aGUgcmUtYXR0YWNobWVudCwgYW5kIGhlbmNlIHRoZSBjcmFzaCB3 aGVuCisgICAgICAgIHRoZSB3cmFwcGVyIHRyaWVzIHRvIGFjY2VzcyBpdHMgdW5kZXJseWluZyBv YmplY3QuCisgICAgICAgIC0gSW4gYWRkaXRpb24sIG1vdmVkIHRoZSBMb2NrSG9sZGVyIGluIGEg Y291cGxlIG9mIGludGFuY2VzIHRvIGJlZm9yZQorICAgICAgICBBWElzb2xhdGVkVHJlZTo6bm9k ZUZvcklELCBiZWNhdXNlIHRoaXMgbWV0aG9kIGFjY2Vzc2VzIGEgbWVtYmVyCisgICAgICAgIHZh cmlhYmxlIHVzZWQgaW4gYm90aCB0aHJlYWRzLgorICAgICAgICAtIEFkZGVkIHN0cmN0ZXIgYXNz ZXJ0IGNoZWNrcyB0byBjYXRjaCBwcm9ibGVtcyB3aXRoIHRoZSBtYW5hZ2VtZW50IG9mCisgICAg ICAgIG9iamVjdHMgYW5kIHdyYXBwZXJzIGR1cmluZyB0cmVlIHVwZGF0ZXMuCisKKyAgICAgICAg KiBhY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkVHJlZS5jcHA6CisgICAgICAg IChXZWJDb3JlOjpBWElzb2xhdGVkVHJlZTo6dXBkYXRlTm9kZSk6CisgICAgICAgIChXZWJDb3Jl OjpBWElzb2xhdGVkVHJlZTo6dXBkYXRlQ2hpbGRyZW4pOgorICAgICAgICAoV2ViQ29yZTo6QVhJ c29sYXRlZFRyZWU6OmFwcGx5UGVuZGluZ0NoYW5nZXMpOgorICAgICAgICAqIGFjY2Vzc2liaWxp dHkvbWFjL1dlYkFjY2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyQmFzZS5tbToKKyAgICAgICAgKC1b V2ViQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXJCYXNlIGF0dGFjaElzb2xhdGVkT2JqZWN0Ol0p OgorCiAyMDIwLTA0LTA3ICBBbmRyZXMgR29uemFsZXogIDxhbmRyZXNnXzIyQGFwcGxlLmNvbT4K IAogICAgICAgICBJbml0aWFsaXphdGlvbiBvZiBtb2RhbCBub2RlcyBzaG91bGQgaGFwcGVuIGxh emlseSwgbm90IGluIHRoZSBBWE9iamVjdENhY2hlIGNvbnN0cnVjdG9yLgpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZFRyZWUu Y3BwIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRl ZFRyZWUuY3BwCmluZGV4IDY2NmViNjI3ZWRlYzA1MjQxYTk3YzA2MjAyM2ZmNjUwZWM1Mjc1NGEu Ljk5NzkzYzA0YjZlZGIyOTQ0YzNiNzE2MzM2OGUwNWFjNTZmZWQ2NDYgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRUcmVlLmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xh dGVkVHJlZS5jcHAKQEAgLTE4NiwxMSArMTg2LDExIEBAIHZvaWQgQVhJc29sYXRlZFRyZWU6OnVw ZGF0ZU5vZGUoQVhDb3JlT2JqZWN0JiBheE9iamVjdCkKICAgICBhdXRvKiBheFBhcmVudCA9IGF4 T2JqZWN0LnBhcmVudE9iamVjdCgpOwogICAgIEFYSUQgcGFyZW50SUQgPSBheFBhcmVudCA/IGF4 UGFyZW50LT5vYmplY3RJRCgpIDogSW52YWxpZEFYSUQ7CiAKKyAgICBMb2NrSG9sZGVyIGxvY2tl ciB7IG1fY2hhbmdlTG9nTG9jayB9OwogICAgIGlmIChhdXRvIG9iamVjdCA9IG5vZGVGb3JJRChh eElEKSkgewogICAgICAgICBBU1NFUlQob2JqZWN0LT5vYmplY3RJRCgpID09IGF4SUQpOwogICAg ICAgICBhdXRvIG5ld09iamVjdCA9IEFYSXNvbGF0ZWRPYmplY3Q6OmNyZWF0ZShheE9iamVjdCwg bV90cmVlSUQsIHBhcmVudElEKTsKIAotICAgICAgICBMb2NrSG9sZGVyIGxvY2tlciB7IG1fY2hh bmdlTG9nTG9jayB9OwogICAgICAgICAvLyBUaGUgbmV3IG9iamVjdCBzaG91bGQgaGF2ZSB0aGUg c2FtZSBjaGlsZHJlbiBhcyB0aGUgb2xkIG9uZS4KICAgICAgICAgbmV3T2JqZWN0LT5tX2NoaWxk cmVuSURzID0gb2JqZWN0LT5tX2NoaWxkcmVuSURzOwogICAgICAgICAvLyBSZW1vdmUgdGhlIG9s ZCBvYmplY3QgYW5kIHNldCB0aGUgbmV3IG9uZSB0byBiZSB1cGRhdGVkIG9uIHRoZSBBWCB0aHJl YWQuCkBAIC0yMTIsMjYgKzIxMiwyNSBAQCB2b2lkIEFYSXNvbGF0ZWRUcmVlOjp1cGRhdGVDaGls ZHJlbihBWENvcmVPYmplY3QmIGF4T2JqZWN0KQogewogICAgIEFTU0VSVChpc01haW5UaHJlYWQo KSk7CiAgICAgQVhJRCBheE9iamVjdElEID0gYXhPYmplY3Qub2JqZWN0SUQoKTsKKworICAgIExv Y2tIb2xkZXIgbG9ja2VyIHsgbV9jaGFuZ2VMb2dMb2NrIH07CiAgICAgYXV0byBvYmplY3QgPSBu b2RlRm9ySUQoYXhPYmplY3RJRCk7CiAgICAgaWYgKCFvYmplY3QpCiAgICAgICAgIHJldHVybjsg Ly8gbm90aGluZyB0byB1cGRhdGUuCiAKLSAgICBjb25zdCBhdXRvJiBheENoaWxkcmVuID0gYXhP YmplY3QuY2hpbGRyZW4oKTsKLSAgICBhdXRvIGF4Q2hpbGRyZW5JRHMgPSBheE9iamVjdC5jaGls ZHJlbklEcygpOwotCi0gICAgTG9ja0hvbGRlciBsb2NrZXIgeyBtX2NoYW5nZUxvZ0xvY2sgfTsK ICAgICBhdXRvIHJlbW92YWxzID0gb2JqZWN0LT5tX2NoaWxkcmVuSURzOwotICAgIC8vIE1ha2Ug dGhlIGNoaWxkcmVuIElEcyBvZiB0aGUgaXNvbGF0ZWQgb2JqZWN0IHRvIGJlIHRoZSBzYW1lIGFz IHRoZSBBWE9iamVjdCdzLgotICAgIG9iamVjdC0+bV9jaGlsZHJlbklEcyA9IGF4Q2hpbGRyZW5J RHM7CiAgICAgbG9ja2VyLnVubG9ja0Vhcmx5KCk7CiAKKyAgICBjb25zdCBhdXRvJiBheENoaWxk cmVuID0gYXhPYmplY3QuY2hpbGRyZW4oKTsKKyAgICBhdXRvIGF4Q2hpbGRyZW5JRHMgPSBheE9i amVjdC5jaGlsZHJlbklEcygpOworCiAgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBheENoaWxk cmVuSURzLnNpemUoKTsgKytpKSB7CiAgICAgICAgIHNpemVfdCBpbmRleCA9IHJlbW92YWxzLmZp bmQoYXhDaGlsZHJlbklEc1tpXSk7CiAgICAgICAgIGlmIChpbmRleCAhPSBub3RGb3VuZCkKICAg ICAgICAgICAgIHJlbW92YWxzLnJlbW92ZShpbmRleCk7CiAgICAgICAgIGVsc2UgewogICAgICAg ICAgICAgLy8gVGhpcyBpcyBhIG5ldyBjaGlsZCwgYWRkIGl0IHRvIHRoZSB0cmVlLgotICAgICAg ICAgICAgZ2VuZXJhdGVTdWJ0cmVlKCpheENoaWxkcmVuW2ldLCBheE9iamVjdElELCBmYWxzZSk7 CisgICAgICAgICAgICBnZW5lcmF0ZVN1YnRyZWUoKmF4Q2hpbGRyZW5baV0sIGF4T2JqZWN0SUQs IHRydWUpOwogICAgICAgICB9CiAgICAgfQogCkBAIC0yMzksNiArMjM4LDEyIEBAIHZvaWQgQVhJ c29sYXRlZFRyZWU6OnVwZGF0ZUNoaWxkcmVuKEFYQ29yZU9iamVjdCYgYXhPYmplY3QpCiAgICAg Ly8gYXhPYmplY3QuIFRodXMsIHJlbW92ZSB0aGVtIGZyb20gdGhlIHRyZWUuCiAgICAgZm9yIChj b25zdCBBWElEJiBjaGlsZElEIDogcmVtb3ZhbHMpCiAgICAgICAgIHJlbW92ZVN1YnRyZWUoY2hp bGRJRCk7CisKKyAgICB7CisgICAgICAgIC8vIExhc3RseSwgbWFrZSB0aGUgY2hpbGRyZW4gSURz IG9mIHRoZSBpc29sYXRlZCBvYmplY3QgdG8gYmUgdGhlIHNhbWUgYXMgdGhlIEFYT2JqZWN0J3Mu CisgICAgICAgIExvY2tIb2xkZXIgbG9ja2VyIHsgbV9jaGFuZ2VMb2dMb2NrIH07CisgICAgICAg IG9iamVjdC0+bV9jaGlsZHJlbklEcyA9IGF4Q2hpbGRyZW5JRHM7CisgICAgfQogfQogCiBSZWZQ dHI8QVhJc29sYXRlZE9iamVjdD4gQVhJc29sYXRlZFRyZWU6OmZvY3VzZWRVSUVsZW1lbnQoKQpA QCAtMzMxLDI5ICszMzYsMzkgQEAgdm9pZCBBWElzb2xhdGVkVHJlZTo6YXBwbHlQZW5kaW5nQ2hh bmdlcygpCiAgICAgfQogCiAgICAgZm9yIChjb25zdCBhdXRvJiBpdGVtIDogbV9wZW5kaW5nQXBw ZW5kcykgewotICAgICAgICBBU1NFUlQoaXRlbS5tX2lzb2xhdGVkT2JqZWN0LT53cmFwcGVyKCkg fHwgaXRlbS5tX3dyYXBwZXIpOworICAgICAgICAvLyBFaXRoZXIgdGhlIG5ldyBvYmplY3QgaGFz IGEgd3JhcHBlciBhbHJlYWR5IGF0dGFjaGVkLCBvciBvbmUgaXMgcGFzc2VkIHRvIGJlIGF0dGFj aGVkLCBub3QgYm90aC4KKyAgICAgICAgQVNTRVJUKChpdGVtLm1faXNvbGF0ZWRPYmplY3QtPndy YXBwZXIoKSB8fCBpdGVtLm1fd3JhcHBlcikKKyAgICAgICAgICAgICYmICEoaXRlbS5tX2lzb2xh dGVkT2JqZWN0LT53cmFwcGVyKCkgJiYgaXRlbS5tX3dyYXBwZXIpKTsKICAgICAgICAgQVhJRCBh eElEID0gaXRlbS5tX2lzb2xhdGVkT2JqZWN0LT5vYmplY3RJRCgpOwogICAgICAgICBpZiAoYXhJ RCA9PSBJbnZhbGlkQVhJRCkKICAgICAgICAgICAgIGNvbnRpbnVlOwogCisgICAgICAgIGF1dG8m IHdyYXBwZXIgPSBpdGVtLm1fd3JhcHBlciA/IGl0ZW0ubV93cmFwcGVyIDogaXRlbS5tX2lzb2xh dGVkT2JqZWN0LT53cmFwcGVyKCk7CisKICAgICAgICAgaWYgKGF1dG8gb2JqZWN0ID0gbV9yZWFk ZXJUaHJlYWROb2RlTWFwLmdldChheElEKSkgewogICAgICAgICAgICAgaWYgKG9iamVjdCAhPSAm aXRlbS5tX2lzb2xhdGVkT2JqZWN0LmdldCgpCi0gICAgICAgICAgICAgICAgJiYgKG9iamVjdC0+ d3JhcHBlcigpID09IGl0ZW0ubV93cmFwcGVyIHx8IG9iamVjdC0+d3JhcHBlcigpID09IGl0ZW0u bV9pc29sYXRlZE9iamVjdC0+d3JhcHBlcigpKSkgeworICAgICAgICAgICAgICAgICYmIG9iamVj dC0+d3JhcHBlcigpID09IHdyYXBwZXIuZ2V0KCkpIHsKICAgICAgICAgICAgICAgICAvLyBUaGUg bmV3IElzb2xhdGVkT2JqZWN0IGlzIGEgcmVwbGFjZW1lbnQgZm9yIGFuIGV4aXN0aW5nIG9iamVj dAotICAgICAgICAgICAgICAgIC8vIGFzIHRoZSByZXN1bHQgb2YgYW4gdXBkYXRlLiBUaHVzIGRl dGFjaCB0aGUgZXhpc3Rpbmcgb25lIGJlZm9yZQotICAgICAgICAgICAgICAgIC8vIGFkZGluZyB0 aGUgbmV3IG9uZS4KKyAgICAgICAgICAgICAgICAvLyBhcyB0aGUgcmVzdWx0IG9mIGFuIHVwZGF0 ZS4gVGh1cyBkZXRhY2ggdGhlIHdyYXBwZXIgZnJvbSB0aGUKKyAgICAgICAgICAgICAgICAvLyBl eGlzdGluZyBvYmplY3QgYW5kIGF0dGFjaCBpdCB0byB0aGUgbmV3IG9uZS4KICAgICAgICAgICAg ICAgICBvYmplY3QtPmRldGFjaFdyYXBwZXIoQWNjZXNzaWJpbGl0eURldGFjaG1lbnRUeXBlOjpF bGVtZW50RGVzdHJveWVkKTsKKyAgICAgICAgICAgICAgICBpdGVtLm1faXNvbGF0ZWRPYmplY3Qt PmF0dGFjaFBsYXRmb3JtV3JhcHBlcih3cmFwcGVyLmdldCgpKTsKICAgICAgICAgICAgIH0KICAg ICAgICAgICAgIG1fcmVhZGVyVGhyZWFkTm9kZU1hcC5yZW1vdmUoYXhJRCk7CiAgICAgICAgIH0K IAotICAgICAgICBpZiAobV9yZWFkZXJUaHJlYWROb2RlTWFwLmFkZChheElELCBpdGVtLm1faXNv bGF0ZWRPYmplY3QuZ2V0KCkpICYmIGl0ZW0ubV93cmFwcGVyKQotICAgICAgICAgICAgbV9yZWFk ZXJUaHJlYWROb2RlTWFwLmdldChheElEKS0+YXR0YWNoUGxhdGZvcm1XcmFwcGVyKGl0ZW0ubV93 cmFwcGVyLmdldCgpKTsKKyAgICAgICAgaWYgKCFpdGVtLm1faXNvbGF0ZWRPYmplY3QtPndyYXBw ZXIoKSkgeworICAgICAgICAgICAgLy8gVGhlIG5ldyBvYmplY3QgaGFzbid0IGJlZW4gYXR0YWNo ZWQgYSB3cmFwcGVyIHlldCwgc28gYXR0YWNoIGl0LgorICAgICAgICAgICAgaXRlbS5tX2lzb2xh dGVkT2JqZWN0LT5hdHRhY2hQbGF0Zm9ybVdyYXBwZXIod3JhcHBlci5nZXQoKSk7CisgICAgICAg IH0KIAorICAgICAgICBhdXRvIGFkZFJlc3VsdCA9IG1fcmVhZGVyVGhyZWFkTm9kZU1hcC5hZGQo YXhJRCwgaXRlbS5tX2lzb2xhdGVkT2JqZWN0LmdldCgpKTsKKyAgICAgICAgLy8gVGhlIG5ld2x5 IGFkZGVkIG9iamVjdCBtdXN0IGhhdmUgYSB3cmFwcGVyLgorICAgICAgICBBU1NFUlRfVU5VU0VE KGFkZFJlc3VsdCwgYWRkUmVzdWx0Lml0ZXJhdG9yLT52YWx1ZS0+d3JhcHBlcigpKTsKICAgICAg ICAgLy8gVGhlIHJlZmVyZW5jZSBjb3VudCBvZiB0aGUganVzdCBhZGRlZCBJc29sYXRlZE9iamVj dCBtdXN0IGJlIDIKICAgICAgICAgLy8gYmVjYXVzZSBpdCBpcyByZWZlcmVuY2VkIGJ5IG1fcmVh ZGVyVGhyZWFkTm9kZU1hcCBhbmQgbV9wZW5kaW5nQXBwZW5kcy4KICAgICAgICAgLy8gV2hlbiBt X3BlbmRpbmdBcHBlbmRzIGlzIGNsZWFyZWQsIHRoZSBvYmplY3Qgd2lsbCBiZSBoZWxkIG9ubHkg YnkgbV9yZWFkZXJUaHJlYWROb2RlTWFwLgotICAgICAgICBBU1NFUlQobV9yZWFkZXJUaHJlYWRO b2RlTWFwLmdldChheElEKS0+cmVmQ291bnQoKSA9PSAyKTsKKyAgICAgICAgQVNTRVJUX1VOVVNF RChhZGRSZXN1bHQsIGFkZFJlc3VsdC5pdGVyYXRvci0+dmFsdWUtPnJlZkNvdW50KCkgPT0gMik7 CiAgICAgfQogICAgIG1fcGVuZGluZ0FwcGVuZHMuY2xlYXIoKTsKIH0KZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvbWFjL1dlYkFjY2Vzc2liaWxpdHlPYmplY3RXcmFw cGVyQmFzZS5tbSBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvbWFjL1dlYkFjY2Vzc2li aWxpdHlPYmplY3RXcmFwcGVyQmFzZS5tbQppbmRleCAxYWU2YWE5YzU4ZTRmZTQxZjVhZGQ1OGRi NTY1YTUzYTVjMjc5Yzg4Li42NmQzNTI2MGZkNjEzMjQ3ZmZlMjA1OTg2YzkxZWQ3M2Q0OTI3NDc3 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L21hYy9XZWJBY2Nlc3Np YmlsaXR5T2JqZWN0V3JhcHBlckJhc2UubW0KKysrIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJp bGl0eS9tYWMvV2ViQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXJCYXNlLm1tCkBAIC0zMDQsNiAr MzA0LDcgQEAgTlNBcnJheSAqY29udmVydFRvTlNBcnJheShjb25zdCBXZWJDb3JlOjpBWENvcmVP YmplY3Q6OkFjY2Vzc2liaWxpdHlDaGlsZHJlblZlY3QKIC0gKHZvaWQpYXR0YWNoSXNvbGF0ZWRP YmplY3Q6KEFYQ29yZU9iamVjdCopaXNvbGF0ZWRPYmplY3QKIHsKICAgICBBU1NFUlQoaXNvbGF0 ZWRPYmplY3QgJiYgKF9pZGVudGlmaWVyID09IEludmFsaWRBWElEIHx8IF9pZGVudGlmaWVyID09 IGlzb2xhdGVkT2JqZWN0LT5vYmplY3RJRCgpKSk7CisgICAgQVNTRVJUKG1fYXhPYmplY3QgJiYg aXNvbGF0ZWRPYmplY3QtPm9iamVjdElEKCkgPT0gbV9heE9iamVjdC0+b2JqZWN0SUQoKSk7CiAg ICAgbV9pc29sYXRlZE9iamVjdCA9IGlzb2xhdGVkT2JqZWN0OwogICAgIGlmIChfaWRlbnRpZmll ciA9PSBJbnZhbGlkQVhJRCkKICAgICAgICAgX2lkZW50aWZpZXIgPSBtX2lzb2xhdGVkT2JqZWN0 LT5vYmplY3RJRCgpOwo= 395995 2020-04-09 13:18:51 -0700 2020-04-09 14:55:58 -0700 Patch bug-210295-20200409161849.patch text/plain 8166 andresg_22 U3VidmVyc2lvbiBSZXZpc2lvbjogMjU5NjMzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOThmN2I0ZDRjNzY2N2Q3 ZWU3MzQ0Y2UxMTI0MGViMTgxZDM3NDYzMi4uYjUxZmJkNjIwYmQ4NWI5YjYzYjBjZDgxMDk4MjJm YzhlMTBhODMzYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMyIEBACisyMDIwLTA0LTA5ICBBbmRy ZXMgR29uemFsZXogIDxhbmRyZXNnXzIyQGFwcGxlLmNvbT4KKworICAgICAgICBGaXggZm9yIGNy YXNoIGluIHRlc3QgYWNjZXNzaWJpbGl0eS9tYWMvYXJpYS1ncmlkLXdpdGgtc3RyYW5nZS1oaWVy YXJjaHkuaHRtbCBpbiBpc29sYXRlZCB0cmVlIG1vZGUuCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTAyOTUKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBDb3ZlcmVkIGJ5IGFjY2Vzc2liaWxpdHkvbWFjL2Fy aWEtZ3JpZC13aXRoLXN0cmFuZ2UtaGllcmFyY2h5Lmh0bWwuCisKKyAgICAgICAgLSBXaGVuIEFY SXNvbGF0ZWRUcmVlOjphcHBseVBlbmRpbmdDaGFuZ2VzIGVuY291bnRlcnMgYSBjaGFuZ2UgZm9y IGFuCisgICAgICAgIGFscmVhZHkgZXhpc3Rpbmcgb2JqZWN0LCB0aGUgZXhpc3Rpbmcgb2JqZWN0 IGlzIGRpc2NhcmRlZCBhbmQgdGhlIG5ldworICAgICAgICBvYmplY3QgcmVwbGFjZXMgaXQgaW4g dGhlIG5vZGVzIG1hcC4gVGhlIGV4aXN0aW5nIGFuZCBuZXcgb2JqZWN0cyBtdXN0CisgICAgICAg IGhhdmUgdGhlIHNhbWUgcGxhdGZvcm0gd3JhcHBlci4gVGh1cyB0aGUgd3JhcHBlciBuZWVkcyB0 byBiZSBkZXRhY2hlZAorICAgICAgICBmcm9tIHRoZSBleGlzdGluZyBvYmplY3QgYWJvdXQgdG8g YmUgZGlzY2FyZGVkLCBhbmQgcmUtYXR0YWNoZWQgdG8gdGhlCisgICAgICAgIG5ldyBvYmplY3Qu IFdlIHdlcmUgbWlzc2luZyB0aGUgcmUtYXR0YWNobWVudCwgYW5kIGhlbmNlIHRoZSBjcmFzaCB3 aGVuCisgICAgICAgIHRoZSB3cmFwcGVyIHRyaWVzIHRvIGFjY2VzcyBpdHMgdW5kZXJseWluZyBv YmplY3QuCisgICAgICAgIC0gSW4gYWRkaXRpb24sIG1vdmVkIHRoZSBMb2NrSG9sZGVyIGluIGEg Y291cGxlIG9mIGludGFuY2VzIHRvIGJlZm9yZQorICAgICAgICBBWElzb2xhdGVkVHJlZTo6bm9k ZUZvcklELCBiZWNhdXNlIHRoaXMgbWV0aG9kIGFjY2Vzc2VzIGEgbWVtYmVyCisgICAgICAgIHZh cmlhYmxlIHVzZWQgaW4gYm90aCB0aHJlYWRzLgorICAgICAgICAtIEFkZGVkIHN0cmljdGVyIGFz c2VydCBjaGVja3MgdG8gY2F0Y2ggcHJvYmxlbXMgd2l0aCB0aGUgbWFuYWdlbWVudCBvZgorICAg ICAgICBvYmplY3RzIGFuZCB3cmFwcGVycyBkdXJpbmcgdHJlZSB1cGRhdGVzLgorCisgICAgICAg ICogYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZFRyZWUuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6QVhJc29sYXRlZFRyZWU6OnVwZGF0ZU5vZGUpOgorICAgICAgICAoV2ViQ29y ZTo6QVhJc29sYXRlZFRyZWU6OnVwZGF0ZUNoaWxkcmVuKToKKyAgICAgICAgKFdlYkNvcmU6OkFY SXNvbGF0ZWRUcmVlOjphcHBseVBlbmRpbmdDaGFuZ2VzKToKKyAgICAgICAgKiBhY2Nlc3NpYmls aXR5L21hYy9XZWJBY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlckJhc2UubW06CisgICAgICAgICgt W1dlYkFjY2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyQmFzZSBhdHRhY2hJc29sYXRlZE9iamVjdDpd KToKKwogMjAyMC0wNC0wNyAgQW5kcmVzIEdvbnphbGV6ICA8YW5kcmVzZ18yMkBhcHBsZS5jb20+ CiAKICAgICAgICAgSW5pdGlhbGl6YXRpb24gb2YgbW9kYWwgbm9kZXMgc2hvdWxkIGhhcHBlbiBs YXppbHksIG5vdCBpbiB0aGUgQVhPYmplY3RDYWNoZSBjb25zdHJ1Y3Rvci4KZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRUcmVl LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0 ZWRUcmVlLmNwcAppbmRleCA2NjZlYjYyN2VkZWMwNTI0MWE5N2MwNjIwMjNmZjY1MGVjNTI3NTRh Li45OTc5M2MwNGI2ZWRiMjk0NGMzYjcxNjMzNjhlMDVhYzU2ZmVkNjQ2IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkVHJlZS5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29s YXRlZFRyZWUuY3BwCkBAIC0xODYsMTEgKzE4NiwxMSBAQCB2b2lkIEFYSXNvbGF0ZWRUcmVlOjp1 cGRhdGVOb2RlKEFYQ29yZU9iamVjdCYgYXhPYmplY3QpCiAgICAgYXV0byogYXhQYXJlbnQgPSBh eE9iamVjdC5wYXJlbnRPYmplY3QoKTsKICAgICBBWElEIHBhcmVudElEID0gYXhQYXJlbnQgPyBh eFBhcmVudC0+b2JqZWN0SUQoKSA6IEludmFsaWRBWElEOwogCisgICAgTG9ja0hvbGRlciBsb2Nr ZXIgeyBtX2NoYW5nZUxvZ0xvY2sgfTsKICAgICBpZiAoYXV0byBvYmplY3QgPSBub2RlRm9ySUQo YXhJRCkpIHsKICAgICAgICAgQVNTRVJUKG9iamVjdC0+b2JqZWN0SUQoKSA9PSBheElEKTsKICAg ICAgICAgYXV0byBuZXdPYmplY3QgPSBBWElzb2xhdGVkT2JqZWN0OjpjcmVhdGUoYXhPYmplY3Qs IG1fdHJlZUlELCBwYXJlbnRJRCk7CiAKLSAgICAgICAgTG9ja0hvbGRlciBsb2NrZXIgeyBtX2No YW5nZUxvZ0xvY2sgfTsKICAgICAgICAgLy8gVGhlIG5ldyBvYmplY3Qgc2hvdWxkIGhhdmUgdGhl IHNhbWUgY2hpbGRyZW4gYXMgdGhlIG9sZCBvbmUuCiAgICAgICAgIG5ld09iamVjdC0+bV9jaGls ZHJlbklEcyA9IG9iamVjdC0+bV9jaGlsZHJlbklEczsKICAgICAgICAgLy8gUmVtb3ZlIHRoZSBv bGQgb2JqZWN0IGFuZCBzZXQgdGhlIG5ldyBvbmUgdG8gYmUgdXBkYXRlZCBvbiB0aGUgQVggdGhy ZWFkLgpAQCAtMjEyLDI2ICsyMTIsMjUgQEAgdm9pZCBBWElzb2xhdGVkVHJlZTo6dXBkYXRlQ2hp bGRyZW4oQVhDb3JlT2JqZWN0JiBheE9iamVjdCkKIHsKICAgICBBU1NFUlQoaXNNYWluVGhyZWFk KCkpOwogICAgIEFYSUQgYXhPYmplY3RJRCA9IGF4T2JqZWN0Lm9iamVjdElEKCk7CisKKyAgICBM b2NrSG9sZGVyIGxvY2tlciB7IG1fY2hhbmdlTG9nTG9jayB9OwogICAgIGF1dG8gb2JqZWN0ID0g bm9kZUZvcklEKGF4T2JqZWN0SUQpOwogICAgIGlmICghb2JqZWN0KQogICAgICAgICByZXR1cm47 IC8vIG5vdGhpbmcgdG8gdXBkYXRlLgogCi0gICAgY29uc3QgYXV0byYgYXhDaGlsZHJlbiA9IGF4 T2JqZWN0LmNoaWxkcmVuKCk7Ci0gICAgYXV0byBheENoaWxkcmVuSURzID0gYXhPYmplY3QuY2hp bGRyZW5JRHMoKTsKLQotICAgIExvY2tIb2xkZXIgbG9ja2VyIHsgbV9jaGFuZ2VMb2dMb2NrIH07 CiAgICAgYXV0byByZW1vdmFscyA9IG9iamVjdC0+bV9jaGlsZHJlbklEczsKLSAgICAvLyBNYWtl IHRoZSBjaGlsZHJlbiBJRHMgb2YgdGhlIGlzb2xhdGVkIG9iamVjdCB0byBiZSB0aGUgc2FtZSBh cyB0aGUgQVhPYmplY3Qncy4KLSAgICBvYmplY3QtPm1fY2hpbGRyZW5JRHMgPSBheENoaWxkcmVu SURzOwogICAgIGxvY2tlci51bmxvY2tFYXJseSgpOwogCisgICAgY29uc3QgYXV0byYgYXhDaGls ZHJlbiA9IGF4T2JqZWN0LmNoaWxkcmVuKCk7CisgICAgYXV0byBheENoaWxkcmVuSURzID0gYXhP YmplY3QuY2hpbGRyZW5JRHMoKTsKKwogICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgYXhDaGls ZHJlbklEcy5zaXplKCk7ICsraSkgewogICAgICAgICBzaXplX3QgaW5kZXggPSByZW1vdmFscy5m aW5kKGF4Q2hpbGRyZW5JRHNbaV0pOwogICAgICAgICBpZiAoaW5kZXggIT0gbm90Rm91bmQpCiAg ICAgICAgICAgICByZW1vdmFscy5yZW1vdmUoaW5kZXgpOwogICAgICAgICBlbHNlIHsKICAgICAg ICAgICAgIC8vIFRoaXMgaXMgYSBuZXcgY2hpbGQsIGFkZCBpdCB0byB0aGUgdHJlZS4KLSAgICAg ICAgICAgIGdlbmVyYXRlU3VidHJlZSgqYXhDaGlsZHJlbltpXSwgYXhPYmplY3RJRCwgZmFsc2Up OworICAgICAgICAgICAgZ2VuZXJhdGVTdWJ0cmVlKCpheENoaWxkcmVuW2ldLCBheE9iamVjdElE LCB0cnVlKTsKICAgICAgICAgfQogICAgIH0KIApAQCAtMjM5LDYgKzIzOCwxMiBAQCB2b2lkIEFY SXNvbGF0ZWRUcmVlOjp1cGRhdGVDaGlsZHJlbihBWENvcmVPYmplY3QmIGF4T2JqZWN0KQogICAg IC8vIGF4T2JqZWN0LiBUaHVzLCByZW1vdmUgdGhlbSBmcm9tIHRoZSB0cmVlLgogICAgIGZvciAo Y29uc3QgQVhJRCYgY2hpbGRJRCA6IHJlbW92YWxzKQogICAgICAgICByZW1vdmVTdWJ0cmVlKGNo aWxkSUQpOworCisgICAgeworICAgICAgICAvLyBMYXN0bHksIG1ha2UgdGhlIGNoaWxkcmVuIElE cyBvZiB0aGUgaXNvbGF0ZWQgb2JqZWN0IHRvIGJlIHRoZSBzYW1lIGFzIHRoZSBBWE9iamVjdCdz LgorICAgICAgICBMb2NrSG9sZGVyIGxvY2tlciB7IG1fY2hhbmdlTG9nTG9jayB9OworICAgICAg ICBvYmplY3QtPm1fY2hpbGRyZW5JRHMgPSBheENoaWxkcmVuSURzOworICAgIH0KIH0KIAogUmVm UHRyPEFYSXNvbGF0ZWRPYmplY3Q+IEFYSXNvbGF0ZWRUcmVlOjpmb2N1c2VkVUlFbGVtZW50KCkK QEAgLTMzMSwyOSArMzM2LDM5IEBAIHZvaWQgQVhJc29sYXRlZFRyZWU6OmFwcGx5UGVuZGluZ0No YW5nZXMoKQogICAgIH0KIAogICAgIGZvciAoY29uc3QgYXV0byYgaXRlbSA6IG1fcGVuZGluZ0Fw cGVuZHMpIHsKLSAgICAgICAgQVNTRVJUKGl0ZW0ubV9pc29sYXRlZE9iamVjdC0+d3JhcHBlcigp IHx8IGl0ZW0ubV93cmFwcGVyKTsKKyAgICAgICAgLy8gRWl0aGVyIHRoZSBuZXcgb2JqZWN0IGhh cyBhIHdyYXBwZXIgYWxyZWFkeSBhdHRhY2hlZCwgb3Igb25lIGlzIHBhc3NlZCB0byBiZSBhdHRh Y2hlZCwgbm90IGJvdGguCisgICAgICAgIEFTU0VSVCgoaXRlbS5tX2lzb2xhdGVkT2JqZWN0LT53 cmFwcGVyKCkgfHwgaXRlbS5tX3dyYXBwZXIpCisgICAgICAgICAgICAmJiAhKGl0ZW0ubV9pc29s YXRlZE9iamVjdC0+d3JhcHBlcigpICYmIGl0ZW0ubV93cmFwcGVyKSk7CiAgICAgICAgIEFYSUQg YXhJRCA9IGl0ZW0ubV9pc29sYXRlZE9iamVjdC0+b2JqZWN0SUQoKTsKICAgICAgICAgaWYgKGF4 SUQgPT0gSW52YWxpZEFYSUQpCiAgICAgICAgICAgICBjb250aW51ZTsKIAorICAgICAgICBhdXRv JiB3cmFwcGVyID0gaXRlbS5tX3dyYXBwZXIgPyBpdGVtLm1fd3JhcHBlciA6IGl0ZW0ubV9pc29s YXRlZE9iamVjdC0+d3JhcHBlcigpOworCiAgICAgICAgIGlmIChhdXRvIG9iamVjdCA9IG1fcmVh ZGVyVGhyZWFkTm9kZU1hcC5nZXQoYXhJRCkpIHsKICAgICAgICAgICAgIGlmIChvYmplY3QgIT0g Jml0ZW0ubV9pc29sYXRlZE9iamVjdC5nZXQoKQotICAgICAgICAgICAgICAgICYmIChvYmplY3Qt PndyYXBwZXIoKSA9PSBpdGVtLm1fd3JhcHBlciB8fCBvYmplY3QtPndyYXBwZXIoKSA9PSBpdGVt Lm1faXNvbGF0ZWRPYmplY3QtPndyYXBwZXIoKSkpIHsKKyAgICAgICAgICAgICAgICAmJiBvYmpl Y3QtPndyYXBwZXIoKSA9PSB3cmFwcGVyLmdldCgpKSB7CiAgICAgICAgICAgICAgICAgLy8gVGhl IG5ldyBJc29sYXRlZE9iamVjdCBpcyBhIHJlcGxhY2VtZW50IGZvciBhbiBleGlzdGluZyBvYmpl Y3QKLSAgICAgICAgICAgICAgICAvLyBhcyB0aGUgcmVzdWx0IG9mIGFuIHVwZGF0ZS4gVGh1cyBk ZXRhY2ggdGhlIGV4aXN0aW5nIG9uZSBiZWZvcmUKLSAgICAgICAgICAgICAgICAvLyBhZGRpbmcg dGhlIG5ldyBvbmUuCisgICAgICAgICAgICAgICAgLy8gYXMgdGhlIHJlc3VsdCBvZiBhbiB1cGRh dGUuIFRodXMgZGV0YWNoIHRoZSB3cmFwcGVyIGZyb20gdGhlCisgICAgICAgICAgICAgICAgLy8g ZXhpc3Rpbmcgb2JqZWN0IGFuZCBhdHRhY2ggaXQgdG8gdGhlIG5ldyBvbmUuCiAgICAgICAgICAg ICAgICAgb2JqZWN0LT5kZXRhY2hXcmFwcGVyKEFjY2Vzc2liaWxpdHlEZXRhY2htZW50VHlwZTo6 RWxlbWVudERlc3Ryb3llZCk7CisgICAgICAgICAgICAgICAgaXRlbS5tX2lzb2xhdGVkT2JqZWN0 LT5hdHRhY2hQbGF0Zm9ybVdyYXBwZXIod3JhcHBlci5nZXQoKSk7CiAgICAgICAgICAgICB9CiAg ICAgICAgICAgICBtX3JlYWRlclRocmVhZE5vZGVNYXAucmVtb3ZlKGF4SUQpOwogICAgICAgICB9 CiAKLSAgICAgICAgaWYgKG1fcmVhZGVyVGhyZWFkTm9kZU1hcC5hZGQoYXhJRCwgaXRlbS5tX2lz b2xhdGVkT2JqZWN0LmdldCgpKSAmJiBpdGVtLm1fd3JhcHBlcikKLSAgICAgICAgICAgIG1fcmVh ZGVyVGhyZWFkTm9kZU1hcC5nZXQoYXhJRCktPmF0dGFjaFBsYXRmb3JtV3JhcHBlcihpdGVtLm1f d3JhcHBlci5nZXQoKSk7CisgICAgICAgIGlmICghaXRlbS5tX2lzb2xhdGVkT2JqZWN0LT53cmFw cGVyKCkpIHsKKyAgICAgICAgICAgIC8vIFRoZSBuZXcgb2JqZWN0IGhhc24ndCBiZWVuIGF0dGFj aGVkIGEgd3JhcHBlciB5ZXQsIHNvIGF0dGFjaCBpdC4KKyAgICAgICAgICAgIGl0ZW0ubV9pc29s YXRlZE9iamVjdC0+YXR0YWNoUGxhdGZvcm1XcmFwcGVyKHdyYXBwZXIuZ2V0KCkpOworICAgICAg ICB9CiAKKyAgICAgICAgYXV0byBhZGRSZXN1bHQgPSBtX3JlYWRlclRocmVhZE5vZGVNYXAuYWRk KGF4SUQsIGl0ZW0ubV9pc29sYXRlZE9iamVjdC5nZXQoKSk7CisgICAgICAgIC8vIFRoZSBuZXds eSBhZGRlZCBvYmplY3QgbXVzdCBoYXZlIGEgd3JhcHBlci4KKyAgICAgICAgQVNTRVJUX1VOVVNF RChhZGRSZXN1bHQsIGFkZFJlc3VsdC5pdGVyYXRvci0+dmFsdWUtPndyYXBwZXIoKSk7CiAgICAg ICAgIC8vIFRoZSByZWZlcmVuY2UgY291bnQgb2YgdGhlIGp1c3QgYWRkZWQgSXNvbGF0ZWRPYmpl Y3QgbXVzdCBiZSAyCiAgICAgICAgIC8vIGJlY2F1c2UgaXQgaXMgcmVmZXJlbmNlZCBieSBtX3Jl YWRlclRocmVhZE5vZGVNYXAgYW5kIG1fcGVuZGluZ0FwcGVuZHMuCiAgICAgICAgIC8vIFdoZW4g bV9wZW5kaW5nQXBwZW5kcyBpcyBjbGVhcmVkLCB0aGUgb2JqZWN0IHdpbGwgYmUgaGVsZCBvbmx5 IGJ5IG1fcmVhZGVyVGhyZWFkTm9kZU1hcC4KLSAgICAgICAgQVNTRVJUKG1fcmVhZGVyVGhyZWFk Tm9kZU1hcC5nZXQoYXhJRCktPnJlZkNvdW50KCkgPT0gMik7CisgICAgICAgIEFTU0VSVF9VTlVT RUQoYWRkUmVzdWx0LCBhZGRSZXN1bHQuaXRlcmF0b3ItPnZhbHVlLT5yZWZDb3VudCgpID09IDIp OwogICAgIH0KICAgICBtX3BlbmRpbmdBcHBlbmRzLmNsZWFyKCk7CiB9CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L21hYy9XZWJBY2Nlc3NpYmlsaXR5T2JqZWN0V3Jh cHBlckJhc2UubW0gYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L21hYy9XZWJBY2Nlc3Np YmlsaXR5T2JqZWN0V3JhcHBlckJhc2UubW0KaW5kZXggMWFlNmFhOWM1OGU0ZmU0MWY1YWRkNThk YjU2NWE1M2E1YzI3OWM4OC4uNjZkMzUyNjBmZDYxMzI0N2ZmZTIwNTk4NmM5MWVkNzNkNDkyNzQ3 NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9tYWMvV2ViQWNjZXNz aWJpbGl0eU9iamVjdFdyYXBwZXJCYXNlLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2li aWxpdHkvbWFjL1dlYkFjY2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyQmFzZS5tbQpAQCAtMzA0LDYg KzMwNCw3IEBAIE5TQXJyYXkgKmNvbnZlcnRUb05TQXJyYXkoY29uc3QgV2ViQ29yZTo6QVhDb3Jl T2JqZWN0OjpBY2Nlc3NpYmlsaXR5Q2hpbGRyZW5WZWN0CiAtICh2b2lkKWF0dGFjaElzb2xhdGVk T2JqZWN0OihBWENvcmVPYmplY3QqKWlzb2xhdGVkT2JqZWN0CiB7CiAgICAgQVNTRVJUKGlzb2xh dGVkT2JqZWN0ICYmIChfaWRlbnRpZmllciA9PSBJbnZhbGlkQVhJRCB8fCBfaWRlbnRpZmllciA9 PSBpc29sYXRlZE9iamVjdC0+b2JqZWN0SUQoKSkpOworICAgIEFTU0VSVChtX2F4T2JqZWN0ICYm IGlzb2xhdGVkT2JqZWN0LT5vYmplY3RJRCgpID09IG1fYXhPYmplY3QtPm9iamVjdElEKCkpOwog ICAgIG1faXNvbGF0ZWRPYmplY3QgPSBpc29sYXRlZE9iamVjdDsKICAgICBpZiAoX2lkZW50aWZp ZXIgPT0gSW52YWxpZEFYSUQpCiAgICAgICAgIF9pZGVudGlmaWVyID0gbV9pc29sYXRlZE9iamVj dC0+b2JqZWN0SUQoKTsK