238550 2022-03-30 06:51:35 -0700 Split streaming of AX trees from the class AXLogger. 2022-03-30 23:03:52 -0700 1 1 1 Unclassified WebKit Accessibility WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 andresg_22 andresg_22 aboxhall andresg_22 apinheiro cfleizach dmazzoni ews-watchlist jcraig jdiggs samuel_white tyler_w webkit-bug-importer oldest_to_newest 1856373 0 andresg_22 2022-03-30 06:51:35 -0700 Split streaming of AX trees from the class AXLogger. 1856374 1 webkit-bug-importer 2022-03-30 06:51:47 -0700 <rdar://problem/91041921> 1856377 2 456117 andresg_22 2022-03-30 07:06:06 -0700 Created attachment 456117 Patch 1856397 3 456117 tyler_w 2022-03-30 08:16:25 -0700 Comment on attachment 456117 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=456117&action=review > Source/WebCore/accessibility/AXLogger.cpp:568 > + stream.dumpProperty("roleValue", role); I know this isn't new with your patch, but I wonder if it would be better to shorten this to role instead of roleValue to make the logs a little less noisy. I get that roleValue is the name of the method in AXCoreObject, but in this case I don't think it's necessary to include the full method name. 1856432 4 456137 andresg_22 2022-03-30 10:11:44 -0700 Created attachment 456137 Patch 1856437 5 andresg_22 2022-03-30 10:22:12 -0700 (In reply to Tyler Wilcock from comment #3) > Comment on attachment 456117 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=456117&action=review > > > Source/WebCore/accessibility/AXLogger.cpp:568 > > + stream.dumpProperty("roleValue", role); > > I know this isn't new with your patch, but I wonder if it would be better to > shorten this to role instead of roleValue to make the logs a little less > noisy. I get that roleValue is the name of the method in AXCoreObject, but > in this case I don't think it's necessary to include the full method name. Done. 1856691 6 ews-feeder 2022-03-30 23:03:48 -0700 Committed r292142 (249049@main): <https://commits.webkit.org/249049@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 456137. 456117 2022-03-30 07:06:06 -0700 2022-03-30 10:11:41 -0700 Patch bug-238550-20220330100605.patch text/plain 11442 andresg_22 U3VidmVyc2lvbiBSZXZpc2lvbjogMjkxNTU1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzgwOTYzNDY1YjQzZGFi MWFlNjkyYjg2YWRmODMzYjliN2FhMmZhZi4uYmQ3NTRiMzQ5ZmJiNmZmYmQxYTlkZTUxNGNlZDFi OGZjMWVjYjlmMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMyIEBACisyMDIyLTAzLTMwICBBbmRy ZXMgR29uemFsZXogIDxhbmRyZXNnXzIyQGFwcGxlLmNvbT4KKworICAgICAgICBTcGxpdCBzdHJl YW1pbmcgb2YgQVggdHJlZXMgZnJvbSB0aGUgY2xhc3MgQVhMb2dnZXIuCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzg1NTAKKyAgICAgICAgPHJkYXI6 Ly9wcm9ibGVtLzkxMDQxOTIxPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIEFYTG9nZ2VyIGZ1bmN0aW9uYWxpdHkgaXMgZGVidWcgb25seS4gV2UgbmVl ZCB0byBzdHJlYW0gdGhlIGNvbnRlbnQgb2YKKyAgICAgICAgdGhlIEFYIHRyZWVzIGJvdGggaW4g ZGVidWcgYW5kIHJlbGVhc2UgYnVpbGRzLiBUaGlzIHBhdGNoIHNwbGl0cworICAgICAgICBzdHJl YW1pbmcgb2YgdGhlIEFYIHRyZWVzIGZyb20gdGhlIEFYTG9nZ2VyIGNsYXNzLCB3aGljaCByZW1h aW5zIGEgZGVidWcKKyAgICAgICAgb25seSB1dGlsaXR5LgorICAgICAgICBJbiBhZGRpdGlvbiwg YWRkZWQgYSBtZWNoYW5pc20gdG8gY29udHJvbCB3aGF0IGlzIHN0cmVhbWVkIHZpYSB0aGUKKyAg ICAgICAgQVhTdHJlYW1PcHRpb25zIGVudW1lcmF0aW9uLgorCisgICAgICAgICogYWNjZXNzaWJp bGl0eS9BWExvZ2dlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpzaG91bGRMb2cpOgorICAgICAg ICAoV2ViQ29yZTo6b3BlcmF0b3I8PCk6CisgICAgICAgIChXZWJDb3JlOjpzdHJlYW1Jc29sYXRl ZFN1YnRyZWVPbk1haW5UaHJlYWQpOgorICAgICAgICBTdHJlYW1zIGEgc25hcHNob3Qgb2YgdGhl IGhpZXJhcmNoeSBvZiBBWElzb2xhdGVkT2JqZWN0cyBvbiB0aGUgbWFpbgorICAgICAgICB0aHJl YWQsIGxpbWl0aW5nIHRoZSBwcm9wZXJ0aWVzIG9mIHRoZSBBWElzb2xhdGVkT2JqZWN0IHRoYXQg Y2FuIGJlCisgICAgICAgIGFjY2Vzc2VkIHVzaW5nIEFYU3RyZWFtT3B0aW9ucy4KKworICAgICAg ICAoV2ViQ29yZTo6c3RyZWFtQVhDb3JlT2JqZWN0KToKKyAgICAgICAgKFdlYkNvcmU6OnN0cmVh bVN1YnRyZWUpOgorICAgICAgICAoV2ViQ29yZTo6QVhMb2dnZXI6OmFkZCk6IFJlcGxhY2VkIHdp dGggc3RyZWFtU3VidHJlZS4KKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L0FYTG9nZ2VyLmg6Cisg ICAgICAgICogYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZFRyZWUuaDoKKwog MjAyMi0wMy0yMSAgWmlyYW4gU3VuICA8enN1bkBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtzZWxl Y3Rpb25dIEhUTUxUZXh0Rm9ybUNvbnRyb2xFbGVtZW50OjpzdWJ0cmVlSGFzQ2hhbmdlZCgpIHNo b3VsZG4ndCBiZSBjYWxsZWQgaW4gc2V0UmFuZ2VUZXh0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9hY2Nlc3NpYmlsaXR5L0FYTG9nZ2VyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2li aWxpdHkvQVhMb2dnZXIuY3BwCmluZGV4IGYzM2E3YTZhYmU0MjY3NmIxYzA0ODFkNGU2Y2VjMWJh MzQyYzM0NTAuLmZiMjFkNmUwYzQwM2I4YzVkYTMxMzAxMWM2ODY0MjJjNmYxNWZmNzkgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQVhMb2dnZXIuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQVhMb2dnZXIuY3BwCkBAIC0yNyw4ICsyNyw2IEBA CiAgKi8KIAogI2luY2x1ZGUgImNvbmZpZy5oIgotCi0jaWYgIUxPR19ESVNBQkxFRAogI2luY2x1 ZGUgIkFYTG9nZ2VyLmgiCiAKICNpZiBFTkFCTEUoQUNDRVNTSUJJTElUWV9JU09MQVRFRF9UUkVF KQpAQCAtNDYsMTIgKzQ0LDE0IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIHN0YXRpYyBib29sIHNo b3VsZExvZygpCiB7CiAgICAgLy8gTW9kaWZ5IHRoZSBpbml0aWFsaXplciBsaXN0IGJlbG93IHRv IGNob29zZSB3aGF0IHRocmVhZCB5b3Ugd2FudCB0byBsb2cgbWVzc2FnZXMgZnJvbS4KLSAgICBz dGF0aWMgT3B0aW9uU2V0PEFYTG9nZ2luZ09wdGlvbnM+IGxvZ2dpbmdPcHRpb25zIHsgQVhMb2dn aW5nT3B0aW9uczo6TWFpblRocmVhZCwgQVhMb2dnaW5nT3B0aW9uczo6T2ZmTWFpblRocmVhZCB9 OworICAgIHN0YXRpYyBjb25zdGV4cHIgT3B0aW9uU2V0PEFYTG9nZ2luZ09wdGlvbnM+IGxvZ2dp bmdPcHRpb25zIHsgQVhMb2dnaW5nT3B0aW9uczo6TWFpblRocmVhZCwgQVhMb2dnaW5nT3B0aW9u czo6T2ZmTWFpblRocmVhZCB9OwogCiAgICAgcmV0dXJuIChpc01haW5UaHJlYWQoKSAmJiBsb2dn aW5nT3B0aW9ucyAmIEFYTG9nZ2luZ09wdGlvbnM6Ok1haW5UaHJlYWQpCiAgICAgICAgIHx8ICgh aXNNYWluVGhyZWFkKCkgJiYgbG9nZ2luZ09wdGlvbnMgJiBBWExvZ2dpbmdPcHRpb25zOjpPZmZN YWluVGhyZWFkKTsKIH0KIAorI2lmICFMT0dfRElTQUJMRUQKKwogQVhMb2dnZXI6OkFYTG9nZ2Vy KGNvbnN0IFN0cmluZyYgbWV0aG9kTmFtZSkKICAgICA6IG1fbWV0aG9kTmFtZShtZXRob2ROYW1l KQogewpAQCAtMTEwLDIzICsxMTAsNiBAQCB2b2lkIEFYTG9nZ2VyOjpsb2coY29uc3QgVmVjdG9y PFJlZlB0cjxBWENvcmVPYmplY3Q+PiYgb2JqZWN0cykKICAgICB9CiB9CiAKLXZvaWQgQVhMb2dn ZXI6OmFkZChUZXh0U3RyZWFtJiBzdHJlYW0sIGNvbnN0IFJlZlB0cjxBWENvcmVPYmplY3Q+JiBv YmplY3QsIGJvb2wgcmVjdXJzaXZlKQotewotICAgIGlmIChzaG91bGRMb2coKSkgewotICAgICAg ICBpZiAoIW9iamVjdCkKLSAgICAgICAgICAgIHJldHVybjsKLQotICAgICAgICBzdHJlYW0uaW5j cmVhc2VJbmRlbnQoKTsKLSAgICAgICAgc3RyZWFtIDw8ICpvYmplY3Q7Ci0KLSAgICAgICAgaWYg KHJlY3Vyc2l2ZSkgewotICAgICAgICAgICAgZm9yIChhdXRvJiBjaGlsZCA6IG9iamVjdC0+Y2hp bGRyZW4oZmFsc2UpKQotICAgICAgICAgICAgICAgIGFkZChzdHJlYW0sIGNoaWxkLCB0cnVlKTsK LSAgICAgICAgfQotICAgICAgICBzdHJlYW0uZGVjcmVhc2VJbmRlbnQoKTsKLSAgICB9Ci19Ci0K IHZvaWQgQVhMb2dnZXI6OmxvZyhjb25zdCBzdGQ6OnBhaXI8UmVmUHRyPEFYQ29yZU9iamVjdD4s IEFYT2JqZWN0Q2FjaGU6OkFYTm90aWZpY2F0aW9uPiYgbm90aWZpY2F0aW9uKQogewogICAgIGlm IChzaG91bGRMb2coKSkgewpAQCAtMTc0LDYgKzE1Nyw4IEBAIHZvaWQgQVhMb2dnZXI6OmxvZyhB WE9iamVjdENhY2hlJiBheE9iamVjdENhY2hlKQogICAgIH0KIH0KIAorI2VuZGlmIC8vICFMT0df RElTQUJMRUQKKwogVGV4dFN0cmVhbSYgb3BlcmF0b3I8PChUZXh0U3RyZWFtJiBzdHJlYW0sIEFj Y2Vzc2liaWxpdHlSb2xlIHJvbGUpCiB7CiAgICAgc3RyZWFtIDw8IGFjY2Vzc2liaWxpdHlSb2xl VG9TdHJpbmcocm9sZSk7CkBAIC01MTUsMzkgKzUwMCw0NiBAQCBUZXh0U3RyZWFtJiBvcGVyYXRv cjw8KFRleHRTdHJlYW0mIHN0cmVhbSwgQVhPYmplY3RDYWNoZTo6QVhOb3RpZmljYXRpb24gbm90 aWZpYwogCiBUZXh0U3RyZWFtJiBvcGVyYXRvcjw8KFRleHRTdHJlYW0mIHN0cmVhbSwgY29uc3Qg QVhDb3JlT2JqZWN0JiBvYmplY3QpCiB7Ci0gICAgVGV4dFN0cmVhbTo6R3JvdXBTY29wZSBncm91 cFNjb3BlKHN0cmVhbSk7Ci0gICAgc3RyZWFtIDw8ICJvYmplY3RJRCAiIDw8IG9iamVjdC5vYmpl Y3RJRCgpOwotICAgIGF1dG8gcm9sZSA9IG9iamVjdC5yb2xlVmFsdWUoKTsKLSAgICBzdHJlYW0u ZHVtcFByb3BlcnR5KCJyb2xlVmFsdWUiLCByb2xlKTsKLQotICAgIGF1dG8qIHBhcmVudCA9IG9i amVjdC5wYXJlbnRPYmplY3RVbmlnbm9yZWQoKTsKLSAgICBzdHJlYW0uZHVtcFByb3BlcnR5KCJw YXJlbnRPYmplY3QiLCBwYXJlbnQgPyBwYXJlbnQtPm9iamVjdElEKCkgOiBBWElEKCkpOwotCi0g ICAgc3RyZWFtLmR1bXBQcm9wZXJ0eSgiaWRlbnRpZmllckF0dHJpYnV0ZSIsIG9iamVjdC5pZGVu dGlmaWVyQXR0cmlidXRlKCkpOwotCi0gICAgYXV0byogb2JqZWN0V2l0aEludGVyZXN0aW5nSFRN TCA9IHJvbGUgPT0gQWNjZXNzaWJpbGl0eVJvbGU6OkJ1dHRvbiA/IC8vIEFkZCBoZXJlIG90aGVy IHJvbGVzIG9mIGludGVyZXN0LgotICAgICAgICAmb2JqZWN0IDogbnVsbHB0cjsKLSAgICBpZiAo cm9sZSA9PSBBY2Nlc3NpYmlsaXR5Um9sZTo6U3RhdGljVGV4dCAmJiBwYXJlbnQpCi0gICAgICAg IG9iamVjdFdpdGhJbnRlcmVzdGluZ0hUTUwgPSBwYXJlbnQ7Ci0gICAgaWYgKG9iamVjdFdpdGhJ bnRlcmVzdGluZ0hUTUwpCi0gICAgICAgIHN0cmVhbS5kdW1wUHJvcGVydHkoIm91dGVySFRNTCIs IG9iamVjdFdpdGhJbnRlcmVzdGluZ0hUTUwtPm91dGVySFRNTCgpKTsKLQotICAgIHN0cmVhbS5k dW1wUHJvcGVydHkoImFkZHJlc3MiLCAmb2JqZWN0KTsKLSAgICBzdHJlYW0uZHVtcFByb3BlcnR5 KCJ3cmFwcGVyIiwgb2JqZWN0LndyYXBwZXIoKSk7Ci0KKyAgICBjb25zdGV4cHIgT3B0aW9uU2V0 PEFYU3RyZWFtT3B0aW9ucz4gb3B0aW9ucyA9IHsgQVhTdHJlYW1PcHRpb25zOjpPYmplY3RJRCwg QVhTdHJlYW1PcHRpb25zOjpSb2xlLCBBWFN0cmVhbU9wdGlvbnM6OlBhcmVudElELCBBWFN0cmVh bU9wdGlvbnM6OklkZW50aWZpZXJBdHRyaWJ1dGUsIEFYU3RyZWFtT3B0aW9uczo6T3V0ZXJIVE1M LCBBWFN0cmVhbU9wdGlvbnM6OkFkZHJlc3MgfTsKKyAgICBzdHJlYW1BWENvcmVPYmplY3Qoc3Ry ZWFtLCBvYmplY3QsIG9wdGlvbnMpOwogICAgIHJldHVybiBzdHJlYW07CiB9CiAKICNpZiBFTkFC TEUoQUNDRVNTSUJJTElUWV9JU09MQVRFRF9UUkVFKQogVGV4dFN0cmVhbSYgb3BlcmF0b3I8PChU ZXh0U3RyZWFtJiBzdHJlYW0sIEFYSXNvbGF0ZWRUcmVlJiB0cmVlKQogeworICAgIEFTU0VSVCgh aXNNYWluVGhyZWFkKCkpOwogICAgIFRleHRTdHJlYW06Okdyb3VwU2NvcGUgZ3JvdXBTY29wZShz dHJlYW0pOwogICAgIHN0cmVhbSA8PCAidHJlZUlEICIgPDwgdHJlZS50cmVlSUQoKTsKICAgICBz dHJlYW0uZHVtcFByb3BlcnR5KCJyb290Tm9kZUlEIiwgdHJlZS5yb290Tm9kZSgpLT5vYmplY3RJ RCgpKTsKICAgICBzdHJlYW0uZHVtcFByb3BlcnR5KCJmb2N1c2VkTm9kZUlEIiwgdHJlZS5tX2Zv Y3VzZWROb2RlSUQpOwotICAgIEFYTG9nZ2VyOjphZGQoc3RyZWFtLCB0cmVlLnJvb3ROb2RlKCks IHRydWUpOworICAgIGNvbnN0ZXhwciBPcHRpb25TZXQ8QVhTdHJlYW1PcHRpb25zPiBvcHRpb25z ID0geyBBWFN0cmVhbU9wdGlvbnM6Ok9iamVjdElELCBBWFN0cmVhbU9wdGlvbnM6OlJvbGUsIEFY U3RyZWFtT3B0aW9uczo6UGFyZW50SUQsIEFYU3RyZWFtT3B0aW9uczo6SWRlbnRpZmllckF0dHJp YnV0ZSwgQVhTdHJlYW1PcHRpb25zOjpPdXRlckhUTUwsIEFYU3RyZWFtT3B0aW9uczo6QWRkcmVz cyB9OworICAgIHN0cmVhbVN1YnRyZWUoc3RyZWFtLCB0cmVlLnJvb3ROb2RlKCksIG9wdGlvbnMp OwogICAgIHJldHVybiBzdHJlYW07CiB9CisKK3ZvaWQgc3RyZWFtSXNvbGF0ZWRTdWJ0cmVlT25N YWluVGhyZWFkKFRleHRTdHJlYW0mIHN0cmVhbSwgY29uc3QgQVhJc29sYXRlZFRyZWUmIHRyZWUs IEFYSUQgb2JqZWN0SUQsIGNvbnN0IE9wdGlvblNldDxBWFN0cmVhbU9wdGlvbnM+JiBvcHRpb25z KQoreworICAgIEFTU0VSVChpc01haW5UaHJlYWQoKSk7CisKKyAgICBpZiAoIXNob3VsZExvZygp KQorICAgICAgICByZXR1cm47CisKKyAgICBzdHJlYW0uaW5jcmVhc2VJbmRlbnQoKTsKKyAgICBU ZXh0U3RyZWFtOjpHcm91cFNjb3BlIGdyb3VwU2NvcGUoc3RyZWFtKTsKKworICAgIGlmIChvcHRp b25zICYgQVhTdHJlYW1PcHRpb25zOjpPYmplY3RJRCkKKyAgICAgICAgc3RyZWFtIDw8ICJvYmpl Y3RJRCAiIDw8IG9iamVjdElEOworCisgICAgYXV0byBpZHMgPSB0cmVlLm1fbm9kZU1hcC5nZXQo b2JqZWN0SUQpOworICAgIGlmIChvcHRpb25zICYgQVhTdHJlYW1PcHRpb25zOjpQYXJlbnRJRCkK KyAgICAgICAgc3RyZWFtLmR1bXBQcm9wZXJ0eSgicGFyZW50T2JqZWN0IiwgaWRzLnBhcmVudElE KTsKKworICAgIGZvciAoYXV0byYgY2hpbGRJRCA6IGlkcy5jaGlsZHJlbklEcykKKyAgICAgICAg c3RyZWFtSXNvbGF0ZWRTdWJ0cmVlT25NYWluVGhyZWFkKHN0cmVhbSwgdHJlZSwgY2hpbGRJRCwg b3B0aW9ucyk7CisKKyAgICBzdHJlYW0uZGVjcmVhc2VJbmRlbnQoKTsKK30KICNlbmRpZgogCiBU ZXh0U3RyZWFtJiBvcGVyYXRvcjw8KFRleHRTdHJlYW0mIHN0cmVhbSwgQVhPYmplY3RDYWNoZSYg YXhPYmplY3RDYWNoZSkKQEAgLTU1NSwxNCArNTQ3LDY2IEBAIFRleHRTdHJlYW0mIG9wZXJhdG9y PDwoVGV4dFN0cmVhbSYgc3RyZWFtLCBBWE9iamVjdENhY2hlJiBheE9iamVjdENhY2hlKQogICAg IFRleHRTdHJlYW06Okdyb3VwU2NvcGUgZ3JvdXBTY29wZShzdHJlYW0pOwogICAgIHN0cmVhbSA8 PCAiQVhPYmplY3RDYWNoZSAiIDw8ICZheE9iamVjdENhY2hlOwogCi0gICAgaWYgKGF1dG8qIHJv b3QgPSBheE9iamVjdENhY2hlLmdldChheE9iamVjdENhY2hlLmRvY3VtZW50KCkudmlldygpKSkK LSAgICAgICAgQVhMb2dnZXI6OmFkZChzdHJlYW0sIHJvb3QsIHRydWUpOwotICAgIGVsc2UKKyAg ICBpZiAoYXV0byogcm9vdCA9IGF4T2JqZWN0Q2FjaGUuZ2V0KGF4T2JqZWN0Q2FjaGUuZG9jdW1l bnQoKS52aWV3KCkpKSB7CisgICAgICAgIGNvbnN0ZXhwciBPcHRpb25TZXQ8QVhTdHJlYW1PcHRp b25zPiBvcHRpb25zID0geyBBWFN0cmVhbU9wdGlvbnM6Ok9iamVjdElELCBBWFN0cmVhbU9wdGlv bnM6OlJvbGUsIEFYU3RyZWFtT3B0aW9uczo6UGFyZW50SUQsIEFYU3RyZWFtT3B0aW9uczo6SWRl bnRpZmllckF0dHJpYnV0ZSwgQVhTdHJlYW1PcHRpb25zOjpPdXRlckhUTUwsIEFYU3RyZWFtT3B0 aW9uczo6QWRkcmVzcyB9OworICAgICAgICBzdHJlYW1TdWJ0cmVlKHN0cmVhbSwgcm9vdCwgb3B0 aW9ucyk7CisgICAgfSBlbHNlCiAgICAgICAgIHN0cmVhbSA8PCAiTm8gcm9vdCEiOwogCiAgICAg cmV0dXJuIHN0cmVhbTsKIH0KIAotfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQordm9pZCBzdHJlYW1B WENvcmVPYmplY3QoVGV4dFN0cmVhbSYgc3RyZWFtLCBjb25zdCBBWENvcmVPYmplY3QmIG9iamVj dCwgY29uc3QgT3B0aW9uU2V0PEFYU3RyZWFtT3B0aW9ucz4mIG9wdGlvbnMpCit7CisgICAgVGV4 dFN0cmVhbTo6R3JvdXBTY29wZSBncm91cFNjb3BlKHN0cmVhbSk7CiAKLSNlbmRpZiAvLyAhTE9H X0RJU0FCTEVECisgICAgaWYgKG9wdGlvbnMgJiBBWFN0cmVhbU9wdGlvbnM6Ok9iamVjdElEKQor ICAgICAgICBzdHJlYW0gPDwgIm9iamVjdElEICIgPDwgb2JqZWN0Lm9iamVjdElEKCk7CisKKyAg ICBpZiAob3B0aW9ucyAmIEFYU3RyZWFtT3B0aW9uczo6Um9sZSkgeworICAgICAgICBhdXRvIHJv bGUgPSBvYmplY3Qucm9sZVZhbHVlKCk7CisgICAgICAgIHN0cmVhbS5kdW1wUHJvcGVydHkoInJv bGVWYWx1ZSIsIHJvbGUpOworICAgIH0KKworICAgIGlmIChvcHRpb25zICYgQVhTdHJlYW1PcHRp b25zOjpQYXJlbnRJRCkgeworICAgICAgICBhdXRvKiBwYXJlbnQgPSBvYmplY3QucGFyZW50T2Jq ZWN0VW5pZ25vcmVkKCk7CisgICAgICAgIHN0cmVhbS5kdW1wUHJvcGVydHkoInBhcmVudE9iamVj dCIsIHBhcmVudCA/IHBhcmVudC0+b2JqZWN0SUQoKSA6IEFYSUQoKSk7CisgICAgfQorCisgICAg aWYgKG9wdGlvbnMgJiBBWFN0cmVhbU9wdGlvbnM6OklkZW50aWZpZXJBdHRyaWJ1dGUpCisgICAg ICAgIHN0cmVhbS5kdW1wUHJvcGVydHkoImlkZW50aWZpZXJBdHRyaWJ1dGUiLCBvYmplY3QuaWRl bnRpZmllckF0dHJpYnV0ZSgpKTsKKworICAgIGlmIChvcHRpb25zICYgQVhTdHJlYW1PcHRpb25z OjpPdXRlckhUTUwpIHsKKyAgICAgICAgYXV0byByb2xlID0gb2JqZWN0LnJvbGVWYWx1ZSgpOwor ICAgICAgICBhdXRvKiBvYmplY3RXaXRoSW50ZXJlc3RpbmdIVE1MID0gcm9sZSA9PSBBY2Nlc3Np YmlsaXR5Um9sZTo6QnV0dG9uID8gLy8gQWRkIGhlcmUgb3RoZXIgcm9sZXMgb2YgaW50ZXJlc3Qu CisgICAgICAgICAgICAmb2JqZWN0IDogbnVsbHB0cjsKKworICAgICAgICBhdXRvKiBwYXJlbnQg PSBvYmplY3QucGFyZW50T2JqZWN0VW5pZ25vcmVkKCk7CisgICAgICAgIGlmIChyb2xlID09IEFj Y2Vzc2liaWxpdHlSb2xlOjpTdGF0aWNUZXh0ICYmIHBhcmVudCkKKyAgICAgICAgICAgIG9iamVj dFdpdGhJbnRlcmVzdGluZ0hUTUwgPSBwYXJlbnQ7CisKKyAgICAgICAgaWYgKG9iamVjdFdpdGhJ bnRlcmVzdGluZ0hUTUwpCisgICAgICAgICAgICBzdHJlYW0uZHVtcFByb3BlcnR5KCJvdXRlckhU TUwiLCBvYmplY3RXaXRoSW50ZXJlc3RpbmdIVE1MLT5vdXRlckhUTUwoKSk7CisgICAgfQorCisg ICAgaWYgKG9wdGlvbnMgJiBBWFN0cmVhbU9wdGlvbnM6OkFkZHJlc3MpIHsKKyAgICAgICAgc3Ry ZWFtLmR1bXBQcm9wZXJ0eSgiYWRkcmVzcyIsICZvYmplY3QpOworICAgICAgICBzdHJlYW0uZHVt cFByb3BlcnR5KCJ3cmFwcGVyIiwgb2JqZWN0LndyYXBwZXIoKSk7CisgICAgfQorfQorCit2b2lk IHN0cmVhbVN1YnRyZWUoVGV4dFN0cmVhbSYgc3RyZWFtLCBjb25zdCBSZWZQdHI8QVhDb3JlT2Jq ZWN0PiYgb2JqZWN0LCBjb25zdCBPcHRpb25TZXQ8QVhTdHJlYW1PcHRpb25zPiYgb3B0aW9ucykK K3sKKyAgICBpZiAoIW9iamVjdCB8fCAhc2hvdWxkTG9nKCkpCisgICAgICAgIHJldHVybjsKKwor ICAgIHN0cmVhbS5pbmNyZWFzZUluZGVudCgpOworCisgICAgc3RyZWFtQVhDb3JlT2JqZWN0KHN0 cmVhbSwgKm9iamVjdCwgb3B0aW9ucyk7CisgICAgZm9yIChhdXRvJiBjaGlsZCA6IG9iamVjdC0+ Y2hpbGRyZW4oZmFsc2UpKQorICAgICAgICBzdHJlYW1TdWJ0cmVlKHN0cmVhbSwgY2hpbGQsIG9w dGlvbnMpOworCisgICAgc3RyZWFtLmRlY3JlYXNlSW5kZW50KCk7Cit9CisKK30gLy8gbmFtZXNw YWNlIFdlYkNvcmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQVhM b2dnZXIuaCBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQVhMb2dnZXIuaAppbmRleCBl YTg5MmYyZjk2NmM1NGRjMGNlY2UxZGE3OTI4NGU3OTgxYTBjOTU2Li4wNGJhNTExMTc3NGE0MGEz ZGFiYWUwOTUwYzE2Y2ZlZjVlZDM4MDRiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9hY2Nl c3NpYmlsaXR5L0FYTG9nZ2VyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9B WExvZ2dlci5oCkBAIC0yNSw4ICsyNSw2IEBACiAKICNwcmFnbWEgb25jZQogCi0jaWYgIUxPR19E SVNBQkxFRAotCiAjaW5jbHVkZSAiQVhPYmplY3RDYWNoZS5oIgogI2luY2x1ZGUgIkFjY2Vzc2li aWxpdHlPYmplY3RJbnRlcmZhY2UuaCIKIApAQCAtMzcsNiArMzUsMTcgQEAgZW51bSBjbGFzcyBB WExvZ2dpbmdPcHRpb25zIDogdWludDhfdCB7CiAgICAgT2ZmTWFpblRocmVhZCA9IDEgPDwgMSwg Ly8gTG9ncyBtZXNzYWdlcyBvZmYgdGhlIG1haW4gdGhyZWFkLgogfTsKIAorZW51bSBjbGFzcyBB WFN0cmVhbU9wdGlvbnMgOiB1aW50OF90IHsKKyAgICBPYmplY3RJRCA9IDEgPDwgMCwKKyAgICBS b2xlID0gMSA8PCAxLAorICAgIFBhcmVudElEID0gMSA8PCAyLAorICAgIElkZW50aWZpZXJBdHRy aWJ1dGUgPSAxIDw8IDMsCisgICAgT3V0ZXJIVE1MID0gMSA8PCA0LAorICAgIEFkZHJlc3MgPSAx IDw8IDUsCit9OworCisjaWYgIUxPR19ESVNBQkxFRAorCiBjbGFzcyBBWExvZ2dlciB7CiBwdWJs aWM6CiAgICAgQVhMb2dnZXIoKSA9IGRlZmF1bHQ7CkBAIC02MCwxMSArNjksMTQgQEAgcHJpdmF0 ZToKICNkZWZpbmUgQVhUUkFDRShtZXRob2ROYW1lKSBBWExvZ2dlciBheExvZ2dlcihtZXRob2RO YW1lKQogI2RlZmluZSBBWExPRyh4KSBBWExvZ2dlcjo6bG9nKHgpCiAKLX0gLy8gbmFtZXNwYWNl IFdlYkNvcmUKLQogI2Vsc2UKIAogI2RlZmluZSBBWFRSQUNFKG1ldGhvZE5hbWUpICh2b2lkKTAK ICNkZWZpbmUgQVhMT0coeCkgKHZvaWQpMAogCiAjZW5kaWYgLy8gIUxPR19ESVNBQkxFRAorCit2 b2lkIHN0cmVhbUFYQ29yZU9iamVjdChUZXh0U3RyZWFtJiwgY29uc3QgQVhDb3JlT2JqZWN0Jiwg Y29uc3QgT3B0aW9uU2V0PEFYU3RyZWFtT3B0aW9ucz4mKTsKK3ZvaWQgc3RyZWFtU3VidHJlZShU ZXh0U3RyZWFtJiwgY29uc3QgUmVmUHRyPEFYQ29yZU9iamVjdD4mLCBjb25zdCBPcHRpb25TZXQ8 QVhTdHJlYW1PcHRpb25zPiYpOworCit9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkVHJl ZS5oIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRl ZFRyZWUuaAppbmRleCBmMWY4ZjBlZGZkNDg1YTJjMjA4ZjdlOGQ0YWFlYTM5ZTk3NGE3M2U4Li45 OTZjZjQ4N2ZkYzBmZDAyNzk0ZDNjM2ZiYmFiODQxMzQzN2ZiNDhlIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkVHJlZS5oCisr KyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRU cmVlLmgKQEAgLTQ0LDYgKzQ0LDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogY2xhc3MgQVhJc29s YXRlZE9iamVjdDsKIGNsYXNzIEFYT2JqZWN0Q2FjaGU7CiBjbGFzcyBQYWdlOworZW51bSBjbGFz cyBBWFN0cmVhbU9wdGlvbnMgOiB1aW50OF90OwogCiB1c2luZyBBWElzb2xhdGVkVHJlZUlEID0g dW5zaWduZWQ7CiAKQEAgLTMyNiw2ICszMjcsNyBAQCBzdHJ1Y3QgQVhQcm9wZXJ0eUNoYW5nZSB7 CiBjbGFzcyBBWElzb2xhdGVkVHJlZSA6IHB1YmxpYyBUaHJlYWRTYWZlUmVmQ291bnRlZDxBWElz b2xhdGVkVHJlZT4gewogICAgIFdURl9NQUtFX05PTkNPUFlBQkxFKEFYSXNvbGF0ZWRUcmVlKTsg V1RGX01BS0VfRkFTVF9BTExPQ0FURUQ7CiAgICAgZnJpZW5kIFdURjo6VGV4dFN0cmVhbSYgb3Bl cmF0b3I8PChXVEY6OlRleHRTdHJlYW0mLCBBWElzb2xhdGVkVHJlZSYpOworICAgIGZyaWVuZCB2 b2lkIHN0cmVhbUlzb2xhdGVkU3VidHJlZU9uTWFpblRocmVhZChUZXh0U3RyZWFtJiwgY29uc3Qg QVhJc29sYXRlZFRyZWUmLCBBWElELCBjb25zdCBPcHRpb25TZXQ8QVhTdHJlYW1PcHRpb25zPiYp OwogcHVibGljOgogICAgIHN0YXRpYyBSZWY8QVhJc29sYXRlZFRyZWU+IGNyZWF0ZShBWE9iamVj dENhY2hlKik7CiAgICAgdmlydHVhbCB+QVhJc29sYXRlZFRyZWUoKTsK 456137 2022-03-30 10:11:44 -0700 2022-03-30 23:03:50 -0700 Patch bug-238550-20220330131143.patch text/plain 11928 andresg_22 U3VidmVyc2lvbiBSZXZpc2lvbjogMjkyMTA2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYmViYTMyNTZmOGI3MmZm ZjJkYjlhNTY2ODkyMWI0ZjFjMTQ4OGFkYi4uY2NjMThiOGRmMzg1MjI3ZWEwNDZiN2UwYjMzYzcz YzM5ZjQyYWViMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMyIEBACisyMDIyLTAzLTMwICBBbmRy ZXMgR29uemFsZXogIDxhbmRyZXNnXzIyQGFwcGxlLmNvbT4KKworICAgICAgICBTcGxpdCBzdHJl YW1pbmcgb2YgQVggdHJlZXMgZnJvbSB0aGUgY2xhc3MgQVhMb2dnZXIuCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzg1NTAKKyAgICAgICAgPHJkYXI6 Ly9wcm9ibGVtLzkxMDQxOTIxPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIEFYTG9nZ2VyIGZ1bmN0aW9uYWxpdHkgaXMgZGVidWcgb25seS4gV2UgbmVl ZCB0byBzdHJlYW0gdGhlIGNvbnRlbnQgb2YKKyAgICAgICAgdGhlIEFYIHRyZWVzIGJvdGggaW4g ZGVidWcgYW5kIHJlbGVhc2UgYnVpbGRzLiBUaGlzIHBhdGNoIHNwbGl0cworICAgICAgICBzdHJl YW1pbmcgb2YgdGhlIEFYIHRyZWVzIGZyb20gdGhlIEFYTG9nZ2VyIGNsYXNzLCB3aGljaCByZW1h aW5zIGEgZGVidWcKKyAgICAgICAgb25seSB1dGlsaXR5LgorICAgICAgICBJbiBhZGRpdGlvbiwg YWRkZWQgYSBtZWNoYW5pc20gdG8gY29udHJvbCB3aGF0IGlzIHN0cmVhbWVkIHZpYSB0aGUKKyAg ICAgICAgQVhTdHJlYW1PcHRpb25zIGVudW1lcmF0aW9uLgorCisgICAgICAgICogYWNjZXNzaWJp bGl0eS9BWExvZ2dlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpzaG91bGRMb2cpOgorICAgICAg ICAoV2ViQ29yZTo6b3BlcmF0b3I8PCk6CisgICAgICAgIChXZWJDb3JlOjpzdHJlYW1Jc29sYXRl ZFN1YnRyZWVPbk1haW5UaHJlYWQpOgorICAgICAgICBTdHJlYW1zIGEgc25hcHNob3Qgb2YgdGhl IGhpZXJhcmNoeSBvZiBBWElzb2xhdGVkT2JqZWN0cyBvbiB0aGUgbWFpbgorICAgICAgICB0aHJl YWQsIGxpbWl0aW5nIHRoZSBwcm9wZXJ0aWVzIG9mIHRoZSBBWElzb2xhdGVkT2JqZWN0IHRoYXQg Y2FuIGJlCisgICAgICAgIGFjY2Vzc2VkIHVzaW5nIEFYU3RyZWFtT3B0aW9ucy4KKworICAgICAg ICAoV2ViQ29yZTo6c3RyZWFtQVhDb3JlT2JqZWN0KToKKyAgICAgICAgKFdlYkNvcmU6OnN0cmVh bVN1YnRyZWUpOgorICAgICAgICAoV2ViQ29yZTo6QVhMb2dnZXI6OmFkZCk6IFJlcGxhY2VkIHdp dGggc3RyZWFtU3VidHJlZS4KKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L0FYTG9nZ2VyLmg6Cisg ICAgICAgICogYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZFRyZWUuaDoKKwog MjAyMi0wMy0zMCAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgogCiAgICAgICAgIEFk ZCBIYXNoVHJhbnNsYXRvciBmb3IgQVNDSUlMaXRlcmFsIGZvciBmYXN0ZXIgbG9va3VwIGluIEhh c2hNYXBzIC8gSGFzaFNldHMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxp dHkvQVhMb2dnZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BWExvZ2dlci5j cHAKaW5kZXggOTQxNDYxODJhNWFiZGRiMmM5MGU2MTYxYjBmZGZhMGY2YzNlZTU0ZC4uMTUyMjVh NGIxMzcxNDYxOTk3ZmI1N2ZiYzlhOWY1NjI2YjYzN2YzNCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvYWNjZXNzaWJpbGl0eS9BWExvZ2dlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYWNj ZXNzaWJpbGl0eS9BWExvZ2dlci5jcHAKQEAgLTI3LDggKzI3LDYgQEAKICAqLwogCiAjaW5jbHVk ZSAiY29uZmlnLmgiCi0KLSNpZiAhTE9HX0RJU0FCTEVECiAjaW5jbHVkZSAiQVhMb2dnZXIuaCIK IAogI2lmIEVOQUJMRShBQ0NFU1NJQklMSVRZX0lTT0xBVEVEX1RSRUUpCkBAIC00NiwxMiArNDQs MTQgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogc3RhdGljIGJvb2wgc2hvdWxkTG9nKCkKIHsKICAg ICAvLyBNb2RpZnkgdGhlIGluaXRpYWxpemVyIGxpc3QgYmVsb3cgdG8gY2hvb3NlIHdoYXQgdGhy ZWFkIHlvdSB3YW50IHRvIGxvZyBtZXNzYWdlcyBmcm9tLgotICAgIHN0YXRpYyBPcHRpb25TZXQ8 QVhMb2dnaW5nT3B0aW9ucz4gbG9nZ2luZ09wdGlvbnMgeyBBWExvZ2dpbmdPcHRpb25zOjpNYWlu VGhyZWFkLCBBWExvZ2dpbmdPcHRpb25zOjpPZmZNYWluVGhyZWFkIH07CisgICAgc3RhdGljIGNv bnN0ZXhwciBPcHRpb25TZXQ8QVhMb2dnaW5nT3B0aW9ucz4gbG9nZ2luZ09wdGlvbnMgeyBBWExv Z2dpbmdPcHRpb25zOjpNYWluVGhyZWFkLCBBWExvZ2dpbmdPcHRpb25zOjpPZmZNYWluVGhyZWFk IH07CiAKICAgICByZXR1cm4gKGlzTWFpblRocmVhZCgpICYmIGxvZ2dpbmdPcHRpb25zICYgQVhM b2dnaW5nT3B0aW9uczo6TWFpblRocmVhZCkKICAgICAgICAgfHwgKCFpc01haW5UaHJlYWQoKSAm JiBsb2dnaW5nT3B0aW9ucyAmIEFYTG9nZ2luZ09wdGlvbnM6Ok9mZk1haW5UaHJlYWQpOwogfQog CisjaWYgIUxPR19ESVNBQkxFRAorCiBBWExvZ2dlcjo6QVhMb2dnZXIoY29uc3QgU3RyaW5nJiBt ZXRob2ROYW1lKQogICAgIDogbV9tZXRob2ROYW1lKG1ldGhvZE5hbWUpCiB7CkBAIC0xMTYsMjMg KzExNiw2IEBAIHZvaWQgQVhMb2dnZXI6OmxvZyhjb25zdCBWZWN0b3I8UmVmUHRyPEFYQ29yZU9i amVjdD4+JiBvYmplY3RzKQogICAgIH0KIH0KIAotdm9pZCBBWExvZ2dlcjo6YWRkKFRleHRTdHJl YW0mIHN0cmVhbSwgY29uc3QgUmVmUHRyPEFYQ29yZU9iamVjdD4mIG9iamVjdCwgYm9vbCByZWN1 cnNpdmUpCi17Ci0gICAgaWYgKHNob3VsZExvZygpKSB7Ci0gICAgICAgIGlmICghb2JqZWN0KQot ICAgICAgICAgICAgcmV0dXJuOwotCi0gICAgICAgIHN0cmVhbS5pbmNyZWFzZUluZGVudCgpOwot ICAgICAgICBzdHJlYW0gPDwgKm9iamVjdDsKLQotICAgICAgICBpZiAocmVjdXJzaXZlKSB7Ci0g ICAgICAgICAgICBmb3IgKGF1dG8mIGNoaWxkIDogb2JqZWN0LT5jaGlsZHJlbihmYWxzZSkpCi0g ICAgICAgICAgICAgICAgYWRkKHN0cmVhbSwgY2hpbGQsIHRydWUpOwotICAgICAgICB9Ci0gICAg ICAgIHN0cmVhbS5kZWNyZWFzZUluZGVudCgpOwotICAgIH0KLX0KLQogdm9pZCBBWExvZ2dlcjo6 bG9nKGNvbnN0IHN0ZDo6cGFpcjxSZWZQdHI8QVhDb3JlT2JqZWN0PiwgQVhPYmplY3RDYWNoZTo6 QVhOb3RpZmljYXRpb24+JiBub3RpZmljYXRpb24pCiB7CiAgICAgaWYgKHNob3VsZExvZygpKSB7 CkBAIC0xODAsNiArMTYzLDggQEAgdm9pZCBBWExvZ2dlcjo6bG9nKEFYT2JqZWN0Q2FjaGUmIGF4 T2JqZWN0Q2FjaGUpCiAgICAgfQogfQogCisjZW5kaWYgLy8gIUxPR19ESVNBQkxFRAorCiBUZXh0 U3RyZWFtJiBvcGVyYXRvcjw8KFRleHRTdHJlYW0mIHN0cmVhbSwgQWNjZXNzaWJpbGl0eVJvbGUg cm9sZSkKIHsKICAgICBzdHJlYW0gPDwgYWNjZXNzaWJpbGl0eVJvbGVUb1N0cmluZyhyb2xlKTsK QEAgLTUyMSw0MSArNTA2LDQ2IEBAIFRleHRTdHJlYW0mIG9wZXJhdG9yPDwoVGV4dFN0cmVhbSYg c3RyZWFtLCBBWE9iamVjdENhY2hlOjpBWE5vdGlmaWNhdGlvbiBub3RpZmljCiAKIFRleHRTdHJl YW0mIG9wZXJhdG9yPDwoVGV4dFN0cmVhbSYgc3RyZWFtLCBjb25zdCBBWENvcmVPYmplY3QmIG9i amVjdCkKIHsKLSAgICBUZXh0U3RyZWFtOjpHcm91cFNjb3BlIGdyb3VwU2NvcGUoc3RyZWFtKTsK LSAgICBzdHJlYW0gPDwgIm9iamVjdElEICIgPDwgb2JqZWN0Lm9iamVjdElEKCk7Ci0gICAgYXV0 byByb2xlID0gb2JqZWN0LnJvbGVWYWx1ZSgpOwotICAgIHN0cmVhbS5kdW1wUHJvcGVydHkoInJv bGVWYWx1ZSIsIHJvbGUpOwotCi0gICAgYXV0byogcGFyZW50ID0gb2JqZWN0LnBhcmVudE9iamVj dFVuaWdub3JlZCgpOwotICAgIHN0cmVhbS5kdW1wUHJvcGVydHkoInBhcmVudE9iamVjdCIsIHBh cmVudCA/IHBhcmVudC0+b2JqZWN0SUQoKSA6IEFYSUQoKSk7Ci0KLSAgICBzdHJlYW0uZHVtcFBy b3BlcnR5KCJpZGVudGlmaWVyQXR0cmlidXRlIiwgb2JqZWN0LmlkZW50aWZpZXJBdHRyaWJ1dGUo KSk7Ci0KLSAgICBhdXRvKiBvYmplY3RXaXRoSW50ZXJlc3RpbmdIVE1MID0gcm9sZSA9PSBBY2Nl c3NpYmlsaXR5Um9sZTo6QnV0dG9uID8gLy8gQWRkIGhlcmUgb3RoZXIgcm9sZXMgb2YgaW50ZXJl c3QuCi0gICAgICAgICZvYmplY3QgOiBudWxscHRyOwotICAgIGlmIChyb2xlID09IEFjY2Vzc2li aWxpdHlSb2xlOjpTdGF0aWNUZXh0ICYmIHBhcmVudCkKLSAgICAgICAgb2JqZWN0V2l0aEludGVy ZXN0aW5nSFRNTCA9IHBhcmVudDsKLSAgICBpZiAob2JqZWN0V2l0aEludGVyZXN0aW5nSFRNTCkK LSAgICAgICAgc3RyZWFtLmR1bXBQcm9wZXJ0eSgib3V0ZXJIVE1MIiwgb2JqZWN0V2l0aEludGVy ZXN0aW5nSFRNTC0+b3V0ZXJIVE1MKCkpOwotCi0gICAgaWYgKGF1dG8qIGF4T2JqZWN0ID0gZHlu YW1pY0Rvd25jYXN0PEFjY2Vzc2liaWxpdHlPYmplY3Q+KCZvYmplY3QpOyBheE9iamVjdCAmJiBh eE9iamVjdC0+aGFzRGlzcGxheUNvbnRlbnRzKCkpCi0gICAgICAgIHN0cmVhbS5kdW1wUHJvcGVy dHkoImhhc0Rpc3BsYXlDb250ZW50cyIsIHRydWUpOwotICAgIHN0cmVhbS5kdW1wUHJvcGVydHko ImFkZHJlc3MiLCAmb2JqZWN0KTsKLSAgICBzdHJlYW0uZHVtcFByb3BlcnR5KCJ3cmFwcGVyIiwg b2JqZWN0LndyYXBwZXIoKSk7Ci0KKyAgICBjb25zdGV4cHIgT3B0aW9uU2V0PEFYU3RyZWFtT3B0 aW9ucz4gb3B0aW9ucyA9IHsgQVhTdHJlYW1PcHRpb25zOjpPYmplY3RJRCwgQVhTdHJlYW1PcHRp b25zOjpSb2xlLCBBWFN0cmVhbU9wdGlvbnM6OlBhcmVudElELCBBWFN0cmVhbU9wdGlvbnM6Oklk ZW50aWZpZXJBdHRyaWJ1dGUsIEFYU3RyZWFtT3B0aW9uczo6T3V0ZXJIVE1MLCBBWFN0cmVhbU9w dGlvbnM6OkRpc3BsYXlDb250ZW50cywgQVhTdHJlYW1PcHRpb25zOjpBZGRyZXNzIH07CisgICAg c3RyZWFtQVhDb3JlT2JqZWN0KHN0cmVhbSwgb2JqZWN0LCBvcHRpb25zKTsKICAgICByZXR1cm4g c3RyZWFtOwogfQogCiAjaWYgRU5BQkxFKEFDQ0VTU0lCSUxJVFlfSVNPTEFURURfVFJFRSkKIFRl eHRTdHJlYW0mIG9wZXJhdG9yPDwoVGV4dFN0cmVhbSYgc3RyZWFtLCBBWElzb2xhdGVkVHJlZSYg dHJlZSkKIHsKKyAgICBBU1NFUlQoIWlzTWFpblRocmVhZCgpKTsKICAgICBUZXh0U3RyZWFtOjpH cm91cFNjb3BlIGdyb3VwU2NvcGUoc3RyZWFtKTsKICAgICBzdHJlYW0gPDwgInRyZWVJRCAiIDw8 IHRyZWUudHJlZUlEKCk7CiAgICAgc3RyZWFtLmR1bXBQcm9wZXJ0eSgicm9vdE5vZGVJRCIsIHRy ZWUucm9vdE5vZGUoKS0+b2JqZWN0SUQoKSk7CiAgICAgc3RyZWFtLmR1bXBQcm9wZXJ0eSgiZm9j dXNlZE5vZGVJRCIsIHRyZWUubV9mb2N1c2VkTm9kZUlEKTsKLSAgICBBWExvZ2dlcjo6YWRkKHN0 cmVhbSwgdHJlZS5yb290Tm9kZSgpLCB0cnVlKTsKKyAgICBjb25zdGV4cHIgT3B0aW9uU2V0PEFY U3RyZWFtT3B0aW9ucz4gb3B0aW9ucyA9IHsgQVhTdHJlYW1PcHRpb25zOjpPYmplY3RJRCwgQVhT dHJlYW1PcHRpb25zOjpSb2xlLCBBWFN0cmVhbU9wdGlvbnM6OlBhcmVudElELCBBWFN0cmVhbU9w dGlvbnM6OklkZW50aWZpZXJBdHRyaWJ1dGUsIEFYU3RyZWFtT3B0aW9uczo6T3V0ZXJIVE1MLCBB WFN0cmVhbU9wdGlvbnM6OkRpc3BsYXlDb250ZW50cywgQVhTdHJlYW1PcHRpb25zOjpBZGRyZXNz IH07CisgICAgc3RyZWFtU3VidHJlZShzdHJlYW0sIHRyZWUucm9vdE5vZGUoKSwgb3B0aW9ucyk7 CiAgICAgcmV0dXJuIHN0cmVhbTsKIH0KKwordm9pZCBzdHJlYW1Jc29sYXRlZFN1YnRyZWVPbk1h aW5UaHJlYWQoVGV4dFN0cmVhbSYgc3RyZWFtLCBjb25zdCBBWElzb2xhdGVkVHJlZSYgdHJlZSwg QVhJRCBvYmplY3RJRCwgY29uc3QgT3B0aW9uU2V0PEFYU3RyZWFtT3B0aW9ucz4mIG9wdGlvbnMp Cit7CisgICAgQVNTRVJUKGlzTWFpblRocmVhZCgpKTsKKworICAgIGlmICghc2hvdWxkTG9nKCkp CisgICAgICAgIHJldHVybjsKKworICAgIHN0cmVhbS5pbmNyZWFzZUluZGVudCgpOworICAgIFRl eHRTdHJlYW06Okdyb3VwU2NvcGUgZ3JvdXBTY29wZShzdHJlYW0pOworCisgICAgaWYgKG9wdGlv bnMgJiBBWFN0cmVhbU9wdGlvbnM6Ok9iamVjdElEKQorICAgICAgICBzdHJlYW0gPDwgIm9iamVj dElEICIgPDwgb2JqZWN0SUQ7CisKKyAgICBhdXRvIGlkcyA9IHRyZWUubV9ub2RlTWFwLmdldChv YmplY3RJRCk7CisgICAgaWYgKG9wdGlvbnMgJiBBWFN0cmVhbU9wdGlvbnM6OlBhcmVudElEKQor ICAgICAgICBzdHJlYW0uZHVtcFByb3BlcnR5KCJwYXJlbnRPYmplY3QiLCBpZHMucGFyZW50SUQp OworCisgICAgZm9yIChhdXRvJiBjaGlsZElEIDogaWRzLmNoaWxkcmVuSURzKQorICAgICAgICBz dHJlYW1Jc29sYXRlZFN1YnRyZWVPbk1haW5UaHJlYWQoc3RyZWFtLCB0cmVlLCBjaGlsZElELCBv cHRpb25zKTsKKworICAgIHN0cmVhbS5kZWNyZWFzZUluZGVudCgpOworfQogI2VuZGlmCiAKIFRl eHRTdHJlYW0mIG9wZXJhdG9yPDwoVGV4dFN0cmVhbSYgc3RyZWFtLCBBWE9iamVjdENhY2hlJiBh eE9iamVjdENhY2hlKQpAQCAtNTYzLDE0ICs1NTMsNjkgQEAgVGV4dFN0cmVhbSYgb3BlcmF0b3I8 PChUZXh0U3RyZWFtJiBzdHJlYW0sIEFYT2JqZWN0Q2FjaGUmIGF4T2JqZWN0Q2FjaGUpCiAgICAg VGV4dFN0cmVhbTo6R3JvdXBTY29wZSBncm91cFNjb3BlKHN0cmVhbSk7CiAgICAgc3RyZWFtIDw8 ICJBWE9iamVjdENhY2hlICIgPDwgJmF4T2JqZWN0Q2FjaGU7CiAKLSAgICBpZiAoYXV0byogcm9v dCA9IGF4T2JqZWN0Q2FjaGUuZ2V0KGF4T2JqZWN0Q2FjaGUuZG9jdW1lbnQoKS52aWV3KCkpKQot ICAgICAgICBBWExvZ2dlcjo6YWRkKHN0cmVhbSwgcm9vdCwgdHJ1ZSk7Ci0gICAgZWxzZQorICAg IGlmIChhdXRvKiByb290ID0gYXhPYmplY3RDYWNoZS5nZXQoYXhPYmplY3RDYWNoZS5kb2N1bWVu dCgpLnZpZXcoKSkpIHsKKyAgICAgICAgY29uc3RleHByIE9wdGlvblNldDxBWFN0cmVhbU9wdGlv bnM+IG9wdGlvbnMgPSB7IEFYU3RyZWFtT3B0aW9uczo6T2JqZWN0SUQsIEFYU3RyZWFtT3B0aW9u czo6Um9sZSwgQVhTdHJlYW1PcHRpb25zOjpQYXJlbnRJRCwgQVhTdHJlYW1PcHRpb25zOjpJZGVu dGlmaWVyQXR0cmlidXRlLCBBWFN0cmVhbU9wdGlvbnM6Ok91dGVySFRNTCwgQVhTdHJlYW1PcHRp b25zOjpEaXNwbGF5Q29udGVudHMsIEFYU3RyZWFtT3B0aW9uczo6QWRkcmVzcyB9OworICAgICAg ICBzdHJlYW1TdWJ0cmVlKHN0cmVhbSwgcm9vdCwgb3B0aW9ucyk7CisgICAgfSBlbHNlCiAgICAg ICAgIHN0cmVhbSA8PCAiTm8gcm9vdCEiOwogCiAgICAgcmV0dXJuIHN0cmVhbTsKIH0KIAotfSAv LyBuYW1lc3BhY2UgV2ViQ29yZQordm9pZCBzdHJlYW1BWENvcmVPYmplY3QoVGV4dFN0cmVhbSYg c3RyZWFtLCBjb25zdCBBWENvcmVPYmplY3QmIG9iamVjdCwgY29uc3QgT3B0aW9uU2V0PEFYU3Ry ZWFtT3B0aW9ucz4mIG9wdGlvbnMpCit7CisgICAgVGV4dFN0cmVhbTo6R3JvdXBTY29wZSBncm91 cFNjb3BlKHN0cmVhbSk7CiAKLSNlbmRpZiAvLyAhTE9HX0RJU0FCTEVECisgICAgaWYgKG9wdGlv bnMgJiBBWFN0cmVhbU9wdGlvbnM6Ok9iamVjdElEKQorICAgICAgICBzdHJlYW0gPDwgIm9iamVj dElEICIgPDwgb2JqZWN0Lm9iamVjdElEKCk7CisKKyAgICBpZiAob3B0aW9ucyAmIEFYU3RyZWFt T3B0aW9uczo6Um9sZSkKKyAgICAgICAgc3RyZWFtLmR1bXBQcm9wZXJ0eSgicm9sZSIsIG9iamVj dC5yb2xlVmFsdWUoKSk7CisKKyAgICBpZiAob3B0aW9ucyAmIEFYU3RyZWFtT3B0aW9uczo6UGFy ZW50SUQpIHsKKyAgICAgICAgYXV0byogcGFyZW50ID0gb2JqZWN0LnBhcmVudE9iamVjdFVuaWdu b3JlZCgpOworICAgICAgICBzdHJlYW0uZHVtcFByb3BlcnR5KCJwYXJlbnRPYmplY3QiLCBwYXJl bnQgPyBwYXJlbnQtPm9iamVjdElEKCkgOiBBWElEKCkpOworICAgIH0KKworICAgIGlmIChvcHRp b25zICYgQVhTdHJlYW1PcHRpb25zOjpJZGVudGlmaWVyQXR0cmlidXRlKQorICAgICAgICBzdHJl YW0uZHVtcFByb3BlcnR5KCJpZGVudGlmaWVyQXR0cmlidXRlIiwgb2JqZWN0LmlkZW50aWZpZXJB dHRyaWJ1dGUoKSk7CisKKyAgICBpZiAob3B0aW9ucyAmIEFYU3RyZWFtT3B0aW9uczo6T3V0ZXJI VE1MKSB7CisgICAgICAgIGF1dG8gcm9sZSA9IG9iamVjdC5yb2xlVmFsdWUoKTsKKyAgICAgICAg YXV0byogb2JqZWN0V2l0aEludGVyZXN0aW5nSFRNTCA9IHJvbGUgPT0gQWNjZXNzaWJpbGl0eVJv bGU6OkJ1dHRvbiA/IC8vIEFkZCBoZXJlIG90aGVyIHJvbGVzIG9mIGludGVyZXN0LgorICAgICAg ICAgICAgJm9iamVjdCA6IG51bGxwdHI7CisKKyAgICAgICAgYXV0byogcGFyZW50ID0gb2JqZWN0 LnBhcmVudE9iamVjdFVuaWdub3JlZCgpOworICAgICAgICBpZiAocm9sZSA9PSBBY2Nlc3NpYmls aXR5Um9sZTo6U3RhdGljVGV4dCAmJiBwYXJlbnQpCisgICAgICAgICAgICBvYmplY3RXaXRoSW50 ZXJlc3RpbmdIVE1MID0gcGFyZW50OworCisgICAgICAgIGlmIChvYmplY3RXaXRoSW50ZXJlc3Rp bmdIVE1MKQorICAgICAgICAgICAgc3RyZWFtLmR1bXBQcm9wZXJ0eSgib3V0ZXJIVE1MIiwgb2Jq ZWN0V2l0aEludGVyZXN0aW5nSFRNTC0+b3V0ZXJIVE1MKCkpOworICAgIH0KKworICAgIGlmIChv cHRpb25zICYgQVhTdHJlYW1PcHRpb25zOjpEaXNwbGF5Q29udGVudHMpIHsKKyAgICAgICAgaWYg KGF1dG8qIGF4T2JqZWN0ID0gZHluYW1pY0Rvd25jYXN0PEFjY2Vzc2liaWxpdHlPYmplY3Q+KCZv YmplY3QpOyBheE9iamVjdC0+aGFzRGlzcGxheUNvbnRlbnRzKCkpCisgICAgICAgICAgICBzdHJl YW0uZHVtcFByb3BlcnR5KCJoYXNEaXNwbGF5Q29udGVudHMiLCB0cnVlKTsKKyAgICB9CisKKyAg ICBpZiAob3B0aW9ucyAmIEFYU3RyZWFtT3B0aW9uczo6QWRkcmVzcykgeworICAgICAgICBzdHJl YW0uZHVtcFByb3BlcnR5KCJhZGRyZXNzIiwgJm9iamVjdCk7CisgICAgICAgIHN0cmVhbS5kdW1w UHJvcGVydHkoIndyYXBwZXIiLCBvYmplY3Qud3JhcHBlcigpKTsKKyAgICB9Cit9CisKK3ZvaWQg c3RyZWFtU3VidHJlZShUZXh0U3RyZWFtJiBzdHJlYW0sIGNvbnN0IFJlZlB0cjxBWENvcmVPYmpl Y3Q+JiBvYmplY3QsIGNvbnN0IE9wdGlvblNldDxBWFN0cmVhbU9wdGlvbnM+JiBvcHRpb25zKQor eworICAgIGlmICghb2JqZWN0IHx8ICFzaG91bGRMb2coKSkKKyAgICAgICAgcmV0dXJuOworCisg ICAgc3RyZWFtLmluY3JlYXNlSW5kZW50KCk7CisKKyAgICBzdHJlYW1BWENvcmVPYmplY3Qoc3Ry ZWFtLCAqb2JqZWN0LCBvcHRpb25zKTsKKyAgICBmb3IgKGF1dG8mIGNoaWxkIDogb2JqZWN0LT5j aGlsZHJlbihmYWxzZSkpCisgICAgICAgIHN0cmVhbVN1YnRyZWUoc3RyZWFtLCBjaGlsZCwgb3B0 aW9ucyk7CisKKyAgICBzdHJlYW0uZGVjcmVhc2VJbmRlbnQoKTsKK30KKworfSAvLyBuYW1lc3Bh Y2UgV2ViQ29yZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BWExv Z2dlci5oIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BWExvZ2dlci5oCmluZGV4IGQx ZmJhZmIxN2NiYmVjMzI0YWUyMGI5ZjE2Y2MwMmY3MGNhMDVmMDguLjkxM2QwMDkzYTUwN2IyZmZi N2UyZTVlNTQ4Y2E3N2ZiOTdhNzk1Y2IgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vz c2liaWxpdHkvQVhMb2dnZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FY TG9nZ2VyLmgKQEAgLTI1LDggKzI1LDYgQEAKIAogI3ByYWdtYSBvbmNlCiAKLSNpZiAhTE9HX0RJ U0FCTEVECi0KICNpbmNsdWRlICJBWE9iamVjdENhY2hlLmgiCiAjaW5jbHVkZSAiQWNjZXNzaWJp bGl0eU9iamVjdEludGVyZmFjZS5oIgogCkBAIC0zNyw2ICszNSwxOCBAQCBlbnVtIGNsYXNzIEFY TG9nZ2luZ09wdGlvbnMgOiB1aW50OF90IHsKICAgICBPZmZNYWluVGhyZWFkID0gMSA8PCAxLCAv LyBMb2dzIG1lc3NhZ2VzIG9mZiB0aGUgbWFpbiB0aHJlYWQuCiB9OwogCitlbnVtIGNsYXNzIEFY U3RyZWFtT3B0aW9ucyA6IHVpbnQ4X3QgeworICAgIE9iamVjdElEID0gMSA8PCAwLAorICAgIFJv bGUgPSAxIDw8IDEsCisgICAgUGFyZW50SUQgPSAxIDw8IDIsCisgICAgSWRlbnRpZmllckF0dHJp YnV0ZSA9IDEgPDwgMywKKyAgICBPdXRlckhUTUwgPSAxIDw8IDQsCisgICAgRGlzcGxheUNvbnRl bnRzID0gMSA8PCA1LAorICAgIEFkZHJlc3MgPSAxIDw8IDYsCit9OworCisjaWYgIUxPR19ESVNB QkxFRAorCiBjbGFzcyBBWExvZ2dlciB7CiBwdWJsaWM6CiAgICAgQVhMb2dnZXIoKSA9IGRlZmF1 bHQ7CkBAIC02MSwxMSArNzEsMTQgQEAgcHJpdmF0ZToKICNkZWZpbmUgQVhUUkFDRShtZXRob2RO YW1lKSBBWExvZ2dlciBheExvZ2dlcihtZXRob2ROYW1lKQogI2RlZmluZSBBWExPRyh4KSBBWExv Z2dlcjo6bG9nKHgpCiAKLX0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKLQogI2Vsc2UKIAogI2RlZmlu ZSBBWFRSQUNFKG1ldGhvZE5hbWUpICh2b2lkKTAKICNkZWZpbmUgQVhMT0coeCkgKHZvaWQpMAog CiAjZW5kaWYgLy8gIUxPR19ESVNBQkxFRAorCit2b2lkIHN0cmVhbUFYQ29yZU9iamVjdChUZXh0 U3RyZWFtJiwgY29uc3QgQVhDb3JlT2JqZWN0JiwgY29uc3QgT3B0aW9uU2V0PEFYU3RyZWFtT3B0 aW9ucz4mKTsKK3ZvaWQgc3RyZWFtU3VidHJlZShUZXh0U3RyZWFtJiwgY29uc3QgUmVmUHRyPEFY Q29yZU9iamVjdD4mLCBjb25zdCBPcHRpb25TZXQ8QVhTdHJlYW1PcHRpb25zPiYpOworCit9IC8v IG5hbWVzcGFjZSBXZWJDb3JlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmls aXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkVHJlZS5oIGIvU291cmNlL1dlYkNvcmUvYWNjZXNz aWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZFRyZWUuaAppbmRleCBmYmU3NzIyOGIxNmZm YTBlMGE4ZTA3ZjdmMTllNjlkODViYmFjMGM1Li44NDRhNzkzODg4Y2IzMDllNjdiYjJhNzI3MmFi NjczMjg1NWUyZTk4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lz b2xhdGVkdHJlZS9BWElzb2xhdGVkVHJlZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2li aWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRUcmVlLmgKQEAgLTQ0LDYgKzQ0LDcgQEAgbmFt ZXNwYWNlIFdlYkNvcmUgewogY2xhc3MgQVhJc29sYXRlZE9iamVjdDsKIGNsYXNzIEFYT2JqZWN0 Q2FjaGU7CiBjbGFzcyBQYWdlOworZW51bSBjbGFzcyBBWFN0cmVhbU9wdGlvbnMgOiB1aW50OF90 OwogCiB1c2luZyBBWElzb2xhdGVkVHJlZUlEID0gdW5zaWduZWQ7CiAKQEAgLTMyMyw2ICszMjQs NyBAQCBzdHJ1Y3QgQVhQcm9wZXJ0eUNoYW5nZSB7CiBjbGFzcyBBWElzb2xhdGVkVHJlZSA6IHB1 YmxpYyBUaHJlYWRTYWZlUmVmQ291bnRlZDxBWElzb2xhdGVkVHJlZT4gewogICAgIFdURl9NQUtF X05PTkNPUFlBQkxFKEFYSXNvbGF0ZWRUcmVlKTsgV1RGX01BS0VfRkFTVF9BTExPQ0FURUQ7CiAg ICAgZnJpZW5kIFdURjo6VGV4dFN0cmVhbSYgb3BlcmF0b3I8PChXVEY6OlRleHRTdHJlYW0mLCBB WElzb2xhdGVkVHJlZSYpOworICAgIGZyaWVuZCB2b2lkIHN0cmVhbUlzb2xhdGVkU3VidHJlZU9u TWFpblRocmVhZChUZXh0U3RyZWFtJiwgY29uc3QgQVhJc29sYXRlZFRyZWUmLCBBWElELCBjb25z dCBPcHRpb25TZXQ8QVhTdHJlYW1PcHRpb25zPiYpOwogcHVibGljOgogICAgIHN0YXRpYyBSZWY8 QVhJc29sYXRlZFRyZWU+IGNyZWF0ZShBWE9iamVjdENhY2hlKik7CiAgICAgdmlydHVhbCB+QVhJ c29sYXRlZFRyZWUoKTsK