236414 2022-02-09 16:26:30 -0800 AXIsolatedTree::updateChildren and AXIsolatedTree::nodeAncestryChanges results in adding incorrect nodes to the isolated tree 2022-02-10 08:37:57 -0800 1 1 1 Unclassified WebKit Accessibility WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 tyler_w tyler_w aboxhall andresg_22 apinheiro cfleizach dmazzoni ews-watchlist jcraig jdiggs samuel_white webkit-bug-importer oldest_to_newest 1839447 0 tyler_w 2022-02-09 16:26:30 -0800 Sometimes AXIsolatedTree::updateChildren is called with an object that is not in the isolated tree. When this happens, we currently call AXIsolatedTree::nodeAncestryChanges to build the ancestry chain up to the nearest in-isolated-tree node (starting with the original object called for updateChildren). However, this seems to result in adding nodes to the isolated tree that don't exist in the live tree. I believe this also causes isolated objects to often hold references to parent objects that don't exist in the isolated tree, breaking searches (and more). 1839448 1 webkit-bug-importer 2022-02-09 16:26:41 -0800 <rdar://problem/88721439> 1839460 2 451463 tyler_w 2022-02-09 16:52:26 -0800 Created attachment 451463 Patch 1839463 3 451465 tyler_w 2022-02-09 16:54:10 -0800 Created attachment 451465 Patch 1839484 4 451474 tyler_w 2022-02-09 17:54:43 -0800 Created attachment 451474 Patch 1839485 5 451475 tyler_w 2022-02-09 17:58:38 -0800 Created attachment 451475 Patch 1839493 6 451477 tyler_w 2022-02-09 18:30:48 -0800 Created attachment 451477 Patch 1839681 7 ews-feeder 2022-02-10 08:37:54 -0800 Committed r289537 (247068@main): <https://commits.webkit.org/247068@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 451477. 451463 2022-02-09 16:52:26 -0800 2022-02-09 16:54:08 -0800 Patch bug-236414-20220209185225.patch text/plain 9650 tyler_w U3VidmVyc2lvbiBSZXZpc2lvbjogMjg5Mzc1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTU5MjdjMjdhYmQ0MzI3 MDE0ZjU5YTdiNzUzNDk5NmM1ZTBlZTg1Ni4uZmVhNzZlOTcxY2RjMzVlOWJjMTRkYzllYTIwZTM0 MGExYWViYjliMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMzIEBACisyMDIyLTAyLTA5ICBUeWxl ciBXaWxjb2NrICA8dHlsZXJfd0BhcHBsZS5jb20+CisKKyAgICAgICAgQVhJc29sYXRlZFRyZWU6 OnVwZGF0ZUNoaWxkcmVuIGFuZCBBWElzb2xhdGVkVHJlZTo6bm9kZUFuY2VzdHJ5Q2hhbmdlcyBy ZXN1bHRzIGluIGFkZGluZyBpbmNvcnJlY3Qgbm9kZXMgdG8gdGhlIGlzb2xhdGVkIHRyZWUKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNjQxNAorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFNvbWV0aW1lcyBB WElzb2xhdGVkVHJlZTo6dXBkYXRlQ2hpbGRyZW4gaXMgY2FsbGVkIHdpdGggYW4gb2JqZWN0IHRo YXQgaXMKKyAgICAgICAgbm90IGluIHRoZSBpc29sYXRlZCB0cmVlLiBXaGVuIHRoaXMgaGFwcGVu cywgd2UgY3VycmVudGx5IGNhbGwgQVhJc29sYXRlZFRyZWU6Om5vZGVBbmNlc3RyeUNoYW5nZXMK KyAgICAgICAgdG8gYnVpbGQgdGhlIGFuY2VzdHJ5IGNoYWluIHVwIHRvIHRoZSBuZWFyZXN0IGlu LWlzb2xhdGVkLXRyZWUgbm9kZSAoc3RhcnRpbmcgd2l0aCB0aGUgb3JpZ2luYWwKKyAgICAgICAg b2JqZWN0IGNhbGxlZCBmb3IgdXBkYXRlQ2hpbGRyZW4pLgorCisgICAgICAgIEhvd2V2ZXIsIHRo aXMgc2VlbXMgdG8gcmVzdWx0IGluIGFkZGluZyBub2RlcyB0byB0aGUgaXNvbGF0ZWQgdHJlZSB0 aGF0IGRvbid0IGV4aXN0IGluIHRoZSBsaXZlIHRyZWUuCisgICAgICAgIEkgYmVsaWV2ZSB0aGlz IGFsc28gY2F1c2VzIGlzb2xhdGVkIG9iamVjdHMgdG8gb2Z0ZW4gaG9sZCByZWZlcmVuY2VzIHRv IHBhcmVudCBvYmplY3RzIHRoYXQgZG9uJ3QgZXhpc3QKKyAgICAgICAgaW4gdGhlIGlzb2xhdGVk IHRyZWUsIGJyZWFraW5nIG9iamVjdCBzZWFyY2hlcyAoYW5kIG1vcmUpLgorCisgICAgICAgIFdp dGggdGhpcyBwYXRjaCwgd2hlbiBBWElzb2xhdGVkVHJlZTo6dXBkYXRlQ2hpbGRyZW4gaXMgY2Fs bGVkIHdpdGggYW4gb2JqZWN0IHRoYXQgaGFzIG5vIGlzb2xhdGVkIHRyZWUKKyAgICAgICAgZXF1 aXZhbGVudCwgd2UgdHJhdmVyc2UgdXAgdGhlIG9iamVjdOKAmXMgYW5jZXN0cnkgdW50aWwgd2Ug ZmluZCBhbiBvYmplY3QgaW4gdGhlIGlzb2xhdGVkIHRyZWUgYW5kIHVwZGF0ZQorICAgICAgICB0 aGUgY2hpbGRyZW4gZm9yIHRoYXQuCisKKyAgICAgICAgVGhpcyB3YXMgdGhlIGJlaGF2aW9yIGJl Zm9yZSBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM1Mzg5LiBXZSBt YWRlIHRoYXQgY2hhbmdlIGJlY2F1c2UKKyAgICAgICAgd2UgYmVsaWV2ZWQgdGhpcyBiZWhhdmlv ciB3YXMgY2F1c2luZyBhIGxvdCBvZiBmdWxsLXRyZWUgcmUtcmVuZGVycy4gSG93ZXZlciwgaW4g bXkgdGVzdGluZyBvbiBsYXJnZSB3ZWJwYWdlcworICAgICAgICAoZS5nLiB5b3V0dWJlLmNvbSwg ZmFjZWJvb2suY29tKSwgdGhpcyBkb2VzbuKAmXQgc2VlbSB0byBiZSB0aGUgY2FzZSwgYW5kIHBl cmZvcm1hbmNlIGlzIGFjdHVhbGx5IHZlcnkgZ29vZC4KKworICAgICAgICAqIGFjY2Vzc2liaWxp dHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRUcmVlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkFY SXNvbGF0ZWRUcmVlOjp1cGRhdGVDaGlsZHJlbik6CisgICAgICAgIChXZWJDb3JlOjpBWElzb2xh dGVkVHJlZTo6bm9kZUFuY2VzdHJ5Q2hhbmdlcyk6IERlbGV0ZWQuCisgICAgICAgICogYWNjZXNz aWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZFRyZWUuaDoKKyAgICAgICAgKFdlYkNvcmU6 OkFYSXNvbGF0ZWRUcmVlOjpxdWV1ZUNoYW5nZXNBbmRSZW1vdmFscyk6CisKIDIwMjItMDItMDgg IEFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtMRkNdW0lGQ10gVGFr ZSB3cml0aW5nIGRpcmVjdGlvbiBpbnRvIGFjY291bnQgd2hlbiBhcHBseWluZyBSZW5kZXJCbG9j a0Zsb3cgZW5kIHBhZGRpbmcgcXVpcmsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vz c2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRUcmVlLmNwcCBiL1NvdXJjZS9XZWJDb3Jl L2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRUcmVlLmNwcAppbmRleCA1YjA4 ZTJiNzA5ZTE1MzY0MjQzNDdjZTcxYWU0NDlmOGYwZTI5MGI2Li4yOGZlNzM4ZDM2NGE0ODNiYjU5 MzBhNzcyODhkYTJmMDNiN2FiNTMzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3Np YmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkVHJlZS5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZFRyZWUuY3BwCkBAIC0zNDks NDAgKzM0OSw2IEBAIHZvaWQgQVhJc29sYXRlZFRyZWU6OnVwZGF0ZU5vZGVQcm9wZXJ0eShjb25z dCBBWENvcmVPYmplY3QmIGF4T2JqZWN0LCBBWFByb3BlcnR5CiAgICAgbV9wZW5kaW5nUHJvcGVy dHlDaGFuZ2VzLmFwcGVuZCh7IGF4T2JqZWN0Lm9iamVjdElEKCksIHByb3BlcnR5TWFwIH0pOwog fQogCi1WZWN0b3I8QVhJc29sYXRlZFRyZWU6Ok5vZGVDaGFuZ2U+IEFYSXNvbGF0ZWRUcmVlOjpu b2RlQW5jZXN0cnlDaGFuZ2VzKEFYQ29yZU9iamVjdCYgYXhDb3JlT2JqZWN0LCBIYXNoU2V0PEFY SUQ+JiBpZHNCZWluZ0NoYW5nZWQpCi17Ci0gICAgVmVjdG9yPE5vZGVDaGFuZ2U+IGNoYW5nZXM7 Ci0KLSAgICBhdXRvKiBheE9iamVjdCA9ICZheENvcmVPYmplY3Q7Ci0gICAgd2hpbGUgKGF4T2Jq ZWN0ICYmICFtX25vZGVNYXAuY29udGFpbnMoYXhPYmplY3QtPm9iamVjdElEKCkpKSB7Ci0gICAg ICAgIC8vIGF4T2JqZWN0IGhhcyBubyBub2RlIGluIHRoZSBpc29sYXRlZCB0cmVlLCB0aHVzIGFk ZCBpdC4KLSAgICAgICAgQVhMT0coImF4T2JqZWN0IG5vdCBpbiB0aGUgaXNvbGF0ZWQgdHJlZToi KTsKLSAgICAgICAgQVhMT0coYXhPYmplY3QpOwotICAgICAgICBhdXRvKiBheFBhcmVudCA9IGF4 T2JqZWN0LT5wYXJlbnRPYmplY3RVbmlnbm9yZWQoKTsKLSAgICAgICAgQVhMT0coImF4UGFyZW50 OiIpOwotICAgICAgICBBWExPRyhheFBhcmVudCk7Ci0gICAgICAgIEFYSUQgYXhQYXJlbnRJRCA9 IGF4UGFyZW50ID8gYXhQYXJlbnQtPm9iamVjdElEKCkgOiBBWElEKCk7Ci0KLSAgICAgICAgLy8g SWYgYXhPYmplY3QgaXMgdGhlIG9yaWdpbmFsIG9iamVjdCBmb3Igd2hpY2ggd2UgYXJlIGFkZGlu ZyBpdHMgYW5jZXN0cnksIGRvbid0IHVwZGF0ZSB0aGUgbm9kZU1hcCBzaW5jZSB1cGRhdGVDaGls ZHJlbiBuZWVkcyB0byBjb21wYXJlIGl0cyBwcmV2aW91cyBjaGlsZHJlbiB3aXRoIHRoZSBuZXcg b25lcy4KLSAgICAgICAgYm9vbCB1cGRhdGVOb2RlTWFwID0gYXhPYmplY3QgIT0gJmF4Q29yZU9i amVjdDsKLSAgICAgICAgYXV0byBjaGFuZ2UgPSBub2RlQ2hhbmdlRm9yT2JqZWN0KCpheE9iamVj dCwgYXhQYXJlbnRJRCwgdHJ1ZSwgdXBkYXRlTm9kZU1hcCk7Ci0gICAgICAgIGlkc0JlaW5nQ2hh bmdlZC5hZGQoY2hhbmdlLmlzb2xhdGVkT2JqZWN0LT5vYmplY3RJRCgpKTsKLSAgICAgICAgY2hh bmdlcy5hcHBlbmQoV1RGTW92ZShjaGFuZ2UpKTsKLQotICAgICAgICBpZiAoYXhQYXJlbnQgJiYg bV9ub2RlTWFwLmNvbnRhaW5zKGF4UGFyZW50LT5vYmplY3RJRCgpKSkgewotICAgICAgICAgICAg YXV0byBpZHMgPSBtX25vZGVNYXAuZ2V0KGF4UGFyZW50LT5vYmplY3RJRCgpKTsKLSAgICAgICAg ICAgIGlkcy5jaGlsZHJlbklEcyA9IGF4UGFyZW50LT5jaGlsZHJlbklEcygpOwotICAgICAgICAg ICAgbV9ub2RlTWFwLnNldChheFBhcmVudC0+b2JqZWN0SUQoKSwgV1RGTW92ZShpZHMpKTsKLSAg ICAgICAgfQotCi0gICAgICAgIGF4T2JqZWN0ID0gYXhQYXJlbnQ7Ci0gICAgfQotCi0gICAgLy8g U2luY2UgdGhlIE5vZGVDaGFuZ2VzIGFyZSBhZGRlZCB0byB0aGUgY2hhbmdlcyB2ZWN0b3IgaW4g YSBjaGlsZCAtPiBwYXJlbnQgdHJhdmVyc2FsIGluc3RlYWQgb2YgYSBwYXJlbnQgLT4gY2hpbGQg dHJhdmVyc2FsLCB3ZSBuZWVkIHRvIHJldmVyc2UgY2hhbmdlcy4KLSAgICBjaGFuZ2VzLnJldmVy c2UoKTsKLSAgICByZXR1cm4gY2hhbmdlczsKLX0KLQogdm9pZCBBWElzb2xhdGVkVHJlZTo6dXBk YXRlQ2hpbGRyZW4oQVhDb3JlT2JqZWN0JiBheE9iamVjdCkKIHsKICAgICBBWFRSQUNFKCJBWElz b2xhdGVkVHJlZTo6dXBkYXRlQ2hpbGRyZW4iKTsKQEAgLTM5OCwyMCArMzY0LDM3IEBAIHZvaWQg QVhJc29sYXRlZFRyZWU6OnVwZGF0ZUNoaWxkcmVuKEFYQ29yZU9iamVjdCYgYXhPYmplY3QpCiAg ICAgaWYgKCFheE9iamVjdC5kb2N1bWVudCgpIHx8ICFheE9iamVjdC5kb2N1bWVudCgpLT5oYXNM aXZpbmdSZW5kZXJUcmVlKCkpCiAgICAgICAgIHJldHVybjsKIAotICAgIEhhc2hTZXQ8QVhJRD4g aWRzQmVpbmdDaGFuZ2VkOwogICAgIC8vIHVwZGF0ZUNoaWxkcmVuIG1heSBiZSBjYWxsZWQgYXMg dGhlIHJlc3VsdCBvZiBhIGNoaWxkcmVuIGNoYW5nZWQKICAgICAvLyBub3RpZmljYXRpb24gZm9y IGFuIGF4T2JqZWN0IHRoYXQgaGFzIG5vIGFzc29jaWF0ZWQgaXNvbGF0ZWQgb2JqZWN0LgogICAg IC8vIEFuIGV4YW1wbGUgb2YgdGhpcyBpcyB3aGVuIGFuIGVtcHR5IGVsZW1lbnQgc3VjaCBhcyBh IDxjYW52YXM+IG9yIDxkaXY+Ci0gICAgLy8gaXMgYWRkZWQgYSBuZXcgY2hpbGQuIFRodXMgYWRk IHRoZSBhbmNlc3RyeSB0aGF0IGNvbm5lY3RzIHRoZSBhc3NvY2lhdGVkCi0gICAgLy8gaXNvbGF0 ZWQgb2JqZWN0IHRvIHRoZSBjbG9zZXN0IGV4aXN0aW5nIGFuY2VzdG9yLgotICAgIFZlY3RvcjxO b2RlQ2hhbmdlPiBjaGFuZ2VzID0gbm9kZUFuY2VzdHJ5Q2hhbmdlcyhheE9iamVjdCwgaWRzQmVp bmdDaGFuZ2VkKTsKKyAgICAvLyBoYXMgYWRkZWQgYSBuZXcgY2hpbGQuIFNvIGZpbmQgdGhlIGNs b3Nlc3QgYW5jZXN0b3Igb2YgYXhPYmplY3QgdGhhdCBoYXMKKyAgICAvLyBhbiBhc3NvY2lhdGVk IGlzb2xhdGVkIG9iamVjdCBhbmQgdXBkYXRlIGl0cyBjaGlsZHJlbi4KKyAgICBhdXRvKiBheEFu Y2VzdG9yID0gQWNjZXNzaWJpbGl0eTo6ZmluZEFuY2VzdG9yKGF4T2JqZWN0LCB0cnVlLCBbdGhp c10gKGF1dG8mIGFuY2VzdG9yKSB7CisgICAgICAgIHJldHVybiBtX25vZGVNYXAuZmluZChhbmNl c3Rvci5vYmplY3RJRCgpKSAhPSBtX25vZGVNYXAuZW5kKCk7CisgICAgfSk7CisKKyAgICBpZiAo IWF4QW5jZXN0b3IgfHwgIWF4QW5jZXN0b3ItPm9iamVjdElEKCkuaXNWYWxpZCgpKSB7CisgICAg ICAgIC8vIFRoaXMgdXBkYXRlIHdhcyB0cmlnZ2VyZWQgYmVmb3JlIHRoZSBpc29sYXRlZCB0cmVl IGhhcyBiZWVuIHJlcG9wdWxhdGVkLgorICAgICAgICAvLyBSZXR1cm4gaGVyZSBzaW5jZSB0aGVy ZSBpcyBub3RoaW5nIHRvIHVwZGF0ZS4KKyAgICAgICAgQVhMT0coIkJhaWxpbmcgYmVjYXVzZSBu byBhbmNlc3RvciBjb3VsZCBiZSBmb3VuZCwgb3IgYW5jZXN0b3IgaGFkIGFuIGludmFsaWQgb2Jq ZWN0SUQiKTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KIAotICAgIGF1dG8gb2xkSURzID0gbV9u b2RlTWFwLmdldChheE9iamVjdC5vYmplY3RJRCgpKTsKKyNpZm5kZWYgTkRFQlVHCisgICAgaWYg KGF4QW5jZXN0b3IgIT0gYXhPYmplY3QpIHsKKyAgICAgICAgQVhMT0cobWFrZVN0cmluZygiT3Jp Z2luYWwgb2JqZWN0IHdpdGggSUQgIiwgYXhPYmplY3Qub2JqZWN0SUQoKS5sb2dnaW5nU3RyaW5n KCksICIgd2Fzbid0IGluIHRoZSBpc29sYXRlZCB0cmVlLCBzbyBpbnN0ZWFkIHVwZGF0aW5nIHRo ZSBjbG9zZXN0IGluLWlzb2xhdGVkLXRyZWUgYW5jZXN0b3I6Iik7CisgICAgICAgIEFYTE9HKGF4 QW5jZXN0b3IpOworICAgIH0KKyNlbmRpZgorCisgICAgYXV0byBvbGRJRHMgPSBtX25vZGVNYXAu Z2V0KGF4QW5jZXN0b3ItPm9iamVjdElEKCkpOwogICAgIGF1dG8mIG9sZENoaWxkcmVuSURzID0g b2xkSURzLmNoaWxkcmVuSURzOwogCi0gICAgY29uc3QgYXV0byYgbmV3Q2hpbGRyZW4gPSBheE9i amVjdC5jaGlsZHJlbigpOwotICAgIGF1dG8gbmV3Q2hpbGRyZW5JRHMgPSBheE9iamVjdC5jaGls ZHJlbklEcyhmYWxzZSk7CisgICAgY29uc3QgYXV0byYgbmV3Q2hpbGRyZW4gPSBheEFuY2VzdG9y LT5jaGlsZHJlbigpOworICAgIGF1dG8gbmV3Q2hpbGRyZW5JRHMgPSBheEFuY2VzdG9yLT5jaGls ZHJlbklEcyhmYWxzZSk7CiAKKyAgICBWZWN0b3I8Tm9kZUNoYW5nZT4gY2hhbmdlczsKKyAgICBI YXNoU2V0PEFYSUQ+IGlkc0JlaW5nQ2hhbmdlZDsKICAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8 IG5ld0NoaWxkcmVuLnNpemUoKTsgKytpKSB7CiAgICAgICAgIEFTU0VSVChuZXdDaGlsZHJlbltp XS0+b2JqZWN0SUQoKSA9PSBuZXdDaGlsZHJlbklEc1tpXSk7CiAgICAgICAgIEFTU0VSVChuZXdD aGlsZHJlbklEc1tpXS5pc1ZhbGlkKCkpOwpAQCAtNDIwLDE0ICs0MDMsMTQgQEAgdm9pZCBBWElz b2xhdGVkVHJlZTo6dXBkYXRlQ2hpbGRyZW4oQVhDb3JlT2JqZWN0JiBheE9iamVjdCkKICAgICAg ICAgICAgIG9sZENoaWxkcmVuSURzLnJlbW92ZShpbmRleCk7CiAgICAgICAgIGVsc2UgewogICAg ICAgICAgICAgLy8gVGhpcyBpcyBhIG5ldyBjaGlsZCwgYWRkIGl0IHRvIHRoZSB0cmVlLgotICAg ICAgICAgICAgQVhMT0cobWFrZVN0cmluZygiQVhJRCAiLCBheE9iamVjdC5vYmplY3RJRCgpLmxv Z2dpbmdTdHJpbmcoKSwgIiBnYWluaW5nIG5ldyBzdWJ0cmVlLCBzdGFydGluZyBhdCBJRCAiLCBu ZXdDaGlsZHJlbltpXS0+b2JqZWN0SUQoKS5sb2dnaW5nU3RyaW5nKCksICI6IikpOworICAgICAg ICAgICAgQVhMT0cobWFrZVN0cmluZygiQVhJRCAiLCBheEFuY2VzdG9yLT5vYmplY3RJRCgpLmxv Z2dpbmdTdHJpbmcoKSwgIiBnYWluaW5nIG5ldyBzdWJ0cmVlLCBzdGFydGluZyBhdCBJRCAiLCBu ZXdDaGlsZHJlbltpXS0+b2JqZWN0SUQoKS5sb2dnaW5nU3RyaW5nKCksICI6IikpOwogICAgICAg ICAgICAgQVhMT0cobmV3Q2hpbGRyZW5baV0pOwotICAgICAgICAgICAgY29sbGVjdE5vZGVDaGFu Z2VzRm9yU3VidHJlZSgqbmV3Q2hpbGRyZW5baV0sIGF4T2JqZWN0Lm9iamVjdElEKCksIHRydWUs IGNoYW5nZXMsICZpZHNCZWluZ0NoYW5nZWQpOworICAgICAgICAgICAgY29sbGVjdE5vZGVDaGFu Z2VzRm9yU3VidHJlZSgqbmV3Q2hpbGRyZW5baV0sIGF4QW5jZXN0b3ItPm9iamVjdElEKCksIHRy dWUsIGNoYW5nZXMsICZpZHNCZWluZ0NoYW5nZWQpOwogICAgICAgICB9CiAgICAgfQotICAgIG1f bm9kZU1hcC5zZXQoYXhPYmplY3Qub2JqZWN0SUQoKSwgUGFyZW50Q2hpbGRyZW5JRHMgeyBvbGRJ RHMucGFyZW50SUQsIG5ld0NoaWxkcmVuSURzIH0pOworICAgIG1fbm9kZU1hcC5zZXQoYXhBbmNl c3Rvci0+b2JqZWN0SUQoKSwgUGFyZW50Q2hpbGRyZW5JRHMgeyBvbGRJRHMucGFyZW50SUQsIG5l d0NoaWxkcmVuSURzIH0pOwogCi0gICAgLy8gV2hhdCBpcyBsZWZ0IGluIG9sZENoaWxkcmVuSURz IGFyZSB0aGUgSURzIHRoYXQgYXJlIG5vIGxvbmdlciBjaGlsZHJlbiBvZiBheE9iamVjdC4KKyAg ICAvLyBXaGF0IGlzIGxlZnQgaW4gb2xkQ2hpbGRyZW5JRHMgYXJlIHRoZSBJRHMgdGhhdCBhcmUg bm8gbG9uZ2VyIGNoaWxkcmVuIG9mIGF4QW5jZXN0b3IuCiAgICAgLy8gVGh1cywgcmVtb3ZlIHRo ZW0gZnJvbSBtX25vZGVNYXAgYW5kIHF1ZXVlIHRoZW0gdG8gYmUgcmVtb3ZlZCBmcm9tIHRoZSB0 cmVlLgogICAgIGZvciAoQVhJRCYgYXhJRCA6IG9sZENoaWxkcmVuSURzKSB7CiAgICAgICAgIC8v IEhvd2V2ZXIsIHdlIGRvbid0IHdhbnQgdG8gcmVtb3ZlIHN1YnRyZWVzIGZyb20gdGhlIG5vZGVt YXAgdGhhdCBhcmUgcGFydCBvZiB0aGUgdG8tYmUtcXVldWVkIG5vZGUgY2hhbmdlcyAoaS5lIHRo b3NlIGluIGBpZHNCZWluZ0NoYW5nZWRgKS4KQEAgLTQzNSw3ICs0MTgsNyBAQCB2b2lkIEFYSXNv bGF0ZWRUcmVlOjp1cGRhdGVDaGlsZHJlbihBWENvcmVPYmplY3QmIGF4T2JqZWN0KQogICAgICAg ICAvLyAgIDEuIE9iamVjdCAxMjMgaXMgc2xhdGVkIHRvIGJlIGEgY2hpbGQgb2YgdGhpcyBvYmpl Y3QgKGkuZS4gaW4gbmV3Q2hpbGRyZW4pLCBhbmQgd2UgY29sbGVjdCBub2RlIGNoYW5nZXMgZm9y IGl0LgogICAgICAgICAvLyAgIDIuIE9iamVjdCAxMjMgaXMgY3VycmVudGx5IGEgbWVtYmVyIG9m IGEgc3VidHJlZSBvZiBzb21lIG90aGVyIG9iamVjdCBpbiBvbGRDaGlsZHJlbklEcy4KICAgICAg ICAgLy8gICAzLiBUaHVzLCB3ZSBkb24ndCB3YW50IHRvIGRlbGV0ZSBPYmplY3QgMTIzIGZyb20g dGhlIG5vZGVtYXAsIGluc3RlYWQgYWxsb3dpbmcgaXQgdG8gYmUgbW92ZWQuCi0gICAgICAgIHJl bW92ZVN1YnRyZWVGcm9tTm9kZU1hcChheElELCAmYXhPYmplY3QsIGlkc0JlaW5nQ2hhbmdlZCk7 CisgICAgICAgIHJlbW92ZVN1YnRyZWVGcm9tTm9kZU1hcChheElELCBheEFuY2VzdG9yLCBpZHNC ZWluZ0NoYW5nZWQpOwogICAgIH0KICAgICBxdWV1ZUNoYW5nZXNBbmRSZW1vdmFscyhjaGFuZ2Vz LCBvbGRDaGlsZHJlbklEcyk7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3Np YmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkVHJlZS5oIGIvU291cmNlL1dlYkNvcmUvYWNj ZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZFRyZWUuaAppbmRleCA3Nzc1NmM1Nzcy Mjc4MjU0ZDk3YzYxMzNkZTI0ZjVlM2M0ZDI0Njg4Li5kZmMwMWM4NDg0ZTllZGM3ZjAyY2QzMDFj YjQ0MGI2ZGRmNThhNWU3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5 L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkVHJlZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vz c2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRUcmVlLmgKQEAgLTM5MSw3ICszOTEsNiBA QCBwcml2YXRlOgogICAgIHZvaWQgY29sbGVjdE5vZGVDaGFuZ2VzRm9yU3VidHJlZShBWENvcmVP YmplY3QmLCBBWElEIHBhcmVudElELCBib29sIGF0dGFjaFdyYXBwZXIsIFZlY3RvcjxOb2RlQ2hh bmdlPiYsIEhhc2hTZXQ8QVhJRD4qID0gbnVsbHB0cik7CiAgICAgdm9pZCBxdWV1ZUNoYW5nZShj b25zdCBOb2RlQ2hhbmdlJikgV1RGX1JFUVVJUkVTX0xPQ0sobV9jaGFuZ2VMb2dMb2NrKTsKICAg ICB2b2lkIHF1ZXVlQ2hhbmdlc0FuZFJlbW92YWxzKGNvbnN0IFZlY3RvcjxOb2RlQ2hhbmdlPiYs IGNvbnN0IFZlY3RvcjxBWElEPiYgPSB7IH0pOwotICAgIFZlY3RvcjxOb2RlQ2hhbmdlPiBub2Rl QW5jZXN0cnlDaGFuZ2VzKEFYQ29yZU9iamVjdCYsIEhhc2hTZXQ8QVhJRD4mKTsKIAogICAgIEFY SXNvbGF0ZWRUcmVlSUQgbV90cmVlSUQ7CiAgICAgQVhPYmplY3RDYWNoZSogbV9heE9iamVjdENh Y2hlIHsgbnVsbHB0ciB9Owo= 451465 2022-02-09 16:54:10 -0800 2022-02-09 17:54:40 -0800 Patch bug-236414-20220209185409.patch text/plain 9646 tyler_w U3VidmVyc2lvbiBSZXZpc2lvbjogMjg5Mzc1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTU5MjdjMjdhYmQ0MzI3 MDE0ZjU5YTdiNzUzNDk5NmM1ZTBlZTg1Ni4uZDZhZWE3ODZmYzUwMmQ0ODdkNWE2Yzg5ODc4ODhk ZDZmNDNhMWNjOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMzIEBACisyMDIyLTAyLTA5ICBUeWxl ciBXaWxjb2NrICA8dHlsZXJfd0BhcHBsZS5jb20+CisKKyAgICAgICAgQVhJc29sYXRlZFRyZWU6 OnVwZGF0ZUNoaWxkcmVuIGFuZCBBWElzb2xhdGVkVHJlZTo6bm9kZUFuY2VzdHJ5Q2hhbmdlcyBy ZXN1bHRzIGluIGFkZGluZyBpbmNvcnJlY3Qgbm9kZXMgdG8gdGhlIGlzb2xhdGVkIHRyZWUKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNjQxNAorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFNvbWV0aW1lcyBB WElzb2xhdGVkVHJlZTo6dXBkYXRlQ2hpbGRyZW4gaXMgY2FsbGVkIHdpdGggYW4gb2JqZWN0IHRo YXQgaXMKKyAgICAgICAgbm90IGluIHRoZSBpc29sYXRlZCB0cmVlLiBXaGVuIHRoaXMgaGFwcGVu cywgd2UgY3VycmVudGx5IGNhbGwgQVhJc29sYXRlZFRyZWU6Om5vZGVBbmNlc3RyeUNoYW5nZXMK KyAgICAgICAgdG8gYnVpbGQgdGhlIGFuY2VzdHJ5IGNoYWluIHVwIHRvIHRoZSBuZWFyZXN0IGlu LWlzb2xhdGVkLXRyZWUgbm9kZSAoc3RhcnRpbmcgd2l0aCB0aGUgb3JpZ2luYWwKKyAgICAgICAg b2JqZWN0IGNhbGxlZCBmb3IgdXBkYXRlQ2hpbGRyZW4pLgorCisgICAgICAgIEhvd2V2ZXIsIHRo aXMgc2VlbXMgdG8gcmVzdWx0IGluIGFkZGluZyBub2RlcyB0byB0aGUgaXNvbGF0ZWQgdHJlZSB0 aGF0IGRvbid0IGV4aXN0IGluIHRoZSBsaXZlIHRyZWUuCisgICAgICAgIEkgYmVsaWV2ZSB0aGlz IGFsc28gY2F1c2VzIGlzb2xhdGVkIG9iamVjdHMgdG8gb2Z0ZW4gaG9sZCByZWZlcmVuY2VzIHRv IHBhcmVudCBvYmplY3RzIHRoYXQgZG9uJ3QgZXhpc3QKKyAgICAgICAgaW4gdGhlIGlzb2xhdGVk IHRyZWUsIGJyZWFraW5nIG9iamVjdCBzZWFyY2hlcyAoYW5kIG1vcmUpLgorCisgICAgICAgIFdp dGggdGhpcyBwYXRjaCwgd2hlbiBBWElzb2xhdGVkVHJlZTo6dXBkYXRlQ2hpbGRyZW4gaXMgY2Fs bGVkIHdpdGggYW4gb2JqZWN0IHRoYXQgaGFzIG5vIGlzb2xhdGVkIHRyZWUKKyAgICAgICAgZXF1 aXZhbGVudCwgd2UgdHJhdmVyc2UgdXAgdGhlIG9iamVjdCdzIGFuY2VzdHJ5IHVudGlsIHdlIGZp bmQgYW4gb2JqZWN0IGluIHRoZSBpc29sYXRlZCB0cmVlIGFuZCB1cGRhdGUKKyAgICAgICAgdGhl IGNoaWxkcmVuIGZvciB0aGF0LgorCisgICAgICAgIFRoaXMgd2FzIHRoZSBiZWhhdmlvciBiZWZv cmUgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNTM4OS4gV2UgbWFk ZSB0aGF0IGNoYW5nZSBiZWNhdXNlCisgICAgICAgIHdlIGJlbGlldmVkIHRoaXMgYmVoYXZpb3Ig d2FzIGNhdXNpbmcgYSBsb3Qgb2YgZnVsbC10cmVlIHJlLXJlbmRlcnMuIEhvd2V2ZXIsIGluIG15 IHRlc3Rpbmcgb24gbGFyZ2Ugd2VicGFnZXMKKyAgICAgICAgKGUuZy4geW91dHViZS5jb20sIGZh Y2Vib29rLmNvbSksIHRoaXMgZG9lc24ndCBzZWVtIHRvIGJlIHRoZSBjYXNlLCBhbmQgcGVyZm9y bWFuY2UgaXMgYWN0dWFsbHkgdmVyeSBnb29kLgorCisgICAgICAgICogYWNjZXNzaWJpbGl0eS9p c29sYXRlZHRyZWUvQVhJc29sYXRlZFRyZWUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6QVhJc29s YXRlZFRyZWU6OnVwZGF0ZUNoaWxkcmVuKToKKyAgICAgICAgKFdlYkNvcmU6OkFYSXNvbGF0ZWRU cmVlOjpub2RlQW5jZXN0cnlDaGFuZ2VzKTogRGVsZXRlZC4KKyAgICAgICAgKiBhY2Nlc3NpYmls aXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkVHJlZS5oOgorICAgICAgICAoV2ViQ29yZTo6QVhJ c29sYXRlZFRyZWU6OnF1ZXVlQ2hhbmdlc0FuZFJlbW92YWxzKToKKwogMjAyMi0wMi0wOCAgQWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgW0xGQ11bSUZDXSBUYWtlIHdy aXRpbmcgZGlyZWN0aW9uIGludG8gYWNjb3VudCB3aGVuIGFwcGx5aW5nIFJlbmRlckJsb2NrRmxv dyBlbmQgcGFkZGluZyBxdWlyawpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJp bGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZFRyZWUuY3BwIGIvU291cmNlL1dlYkNvcmUvYWNj ZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZFRyZWUuY3BwCmluZGV4IDViMDhlMmI3 MDllMTUzNjQyNDM0N2NlNzFhZTQ0OWY4ZjBlMjkwYjYuLjI4ZmU3MzhkMzY0YTQ4M2JiNTkzMGE3 NzI4OGRhMmYwM2I3YWI1MzMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxp dHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRUcmVlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9h Y2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkVHJlZS5jcHAKQEAgLTM0OSw0MCAr MzQ5LDYgQEAgdm9pZCBBWElzb2xhdGVkVHJlZTo6dXBkYXRlTm9kZVByb3BlcnR5KGNvbnN0IEFY Q29yZU9iamVjdCYgYXhPYmplY3QsIEFYUHJvcGVydHkKICAgICBtX3BlbmRpbmdQcm9wZXJ0eUNo YW5nZXMuYXBwZW5kKHsgYXhPYmplY3Qub2JqZWN0SUQoKSwgcHJvcGVydHlNYXAgfSk7CiB9CiAK LVZlY3RvcjxBWElzb2xhdGVkVHJlZTo6Tm9kZUNoYW5nZT4gQVhJc29sYXRlZFRyZWU6Om5vZGVB bmNlc3RyeUNoYW5nZXMoQVhDb3JlT2JqZWN0JiBheENvcmVPYmplY3QsIEhhc2hTZXQ8QVhJRD4m IGlkc0JlaW5nQ2hhbmdlZCkKLXsKLSAgICBWZWN0b3I8Tm9kZUNoYW5nZT4gY2hhbmdlczsKLQot ICAgIGF1dG8qIGF4T2JqZWN0ID0gJmF4Q29yZU9iamVjdDsKLSAgICB3aGlsZSAoYXhPYmplY3Qg JiYgIW1fbm9kZU1hcC5jb250YWlucyhheE9iamVjdC0+b2JqZWN0SUQoKSkpIHsKLSAgICAgICAg Ly8gYXhPYmplY3QgaGFzIG5vIG5vZGUgaW4gdGhlIGlzb2xhdGVkIHRyZWUsIHRodXMgYWRkIGl0 LgotICAgICAgICBBWExPRygiYXhPYmplY3Qgbm90IGluIHRoZSBpc29sYXRlZCB0cmVlOiIpOwot ICAgICAgICBBWExPRyhheE9iamVjdCk7Ci0gICAgICAgIGF1dG8qIGF4UGFyZW50ID0gYXhPYmpl Y3QtPnBhcmVudE9iamVjdFVuaWdub3JlZCgpOwotICAgICAgICBBWExPRygiYXhQYXJlbnQ6Iik7 Ci0gICAgICAgIEFYTE9HKGF4UGFyZW50KTsKLSAgICAgICAgQVhJRCBheFBhcmVudElEID0gYXhQ YXJlbnQgPyBheFBhcmVudC0+b2JqZWN0SUQoKSA6IEFYSUQoKTsKLQotICAgICAgICAvLyBJZiBh eE9iamVjdCBpcyB0aGUgb3JpZ2luYWwgb2JqZWN0IGZvciB3aGljaCB3ZSBhcmUgYWRkaW5nIGl0 cyBhbmNlc3RyeSwgZG9uJ3QgdXBkYXRlIHRoZSBub2RlTWFwIHNpbmNlIHVwZGF0ZUNoaWxkcmVu IG5lZWRzIHRvIGNvbXBhcmUgaXRzIHByZXZpb3VzIGNoaWxkcmVuIHdpdGggdGhlIG5ldyBvbmVz LgotICAgICAgICBib29sIHVwZGF0ZU5vZGVNYXAgPSBheE9iamVjdCAhPSAmYXhDb3JlT2JqZWN0 OwotICAgICAgICBhdXRvIGNoYW5nZSA9IG5vZGVDaGFuZ2VGb3JPYmplY3QoKmF4T2JqZWN0LCBh eFBhcmVudElELCB0cnVlLCB1cGRhdGVOb2RlTWFwKTsKLSAgICAgICAgaWRzQmVpbmdDaGFuZ2Vk LmFkZChjaGFuZ2UuaXNvbGF0ZWRPYmplY3QtPm9iamVjdElEKCkpOwotICAgICAgICBjaGFuZ2Vz LmFwcGVuZChXVEZNb3ZlKGNoYW5nZSkpOwotCi0gICAgICAgIGlmIChheFBhcmVudCAmJiBtX25v ZGVNYXAuY29udGFpbnMoYXhQYXJlbnQtPm9iamVjdElEKCkpKSB7Ci0gICAgICAgICAgICBhdXRv IGlkcyA9IG1fbm9kZU1hcC5nZXQoYXhQYXJlbnQtPm9iamVjdElEKCkpOwotICAgICAgICAgICAg aWRzLmNoaWxkcmVuSURzID0gYXhQYXJlbnQtPmNoaWxkcmVuSURzKCk7Ci0gICAgICAgICAgICBt X25vZGVNYXAuc2V0KGF4UGFyZW50LT5vYmplY3RJRCgpLCBXVEZNb3ZlKGlkcykpOwotICAgICAg ICB9Ci0KLSAgICAgICAgYXhPYmplY3QgPSBheFBhcmVudDsKLSAgICB9Ci0KLSAgICAvLyBTaW5j ZSB0aGUgTm9kZUNoYW5nZXMgYXJlIGFkZGVkIHRvIHRoZSBjaGFuZ2VzIHZlY3RvciBpbiBhIGNo aWxkIC0+IHBhcmVudCB0cmF2ZXJzYWwgaW5zdGVhZCBvZiBhIHBhcmVudCAtPiBjaGlsZCB0cmF2 ZXJzYWwsIHdlIG5lZWQgdG8gcmV2ZXJzZSBjaGFuZ2VzLgotICAgIGNoYW5nZXMucmV2ZXJzZSgp OwotICAgIHJldHVybiBjaGFuZ2VzOwotfQotCiB2b2lkIEFYSXNvbGF0ZWRUcmVlOjp1cGRhdGVD aGlsZHJlbihBWENvcmVPYmplY3QmIGF4T2JqZWN0KQogewogICAgIEFYVFJBQ0UoIkFYSXNvbGF0 ZWRUcmVlOjp1cGRhdGVDaGlsZHJlbiIpOwpAQCAtMzk4LDIwICszNjQsMzcgQEAgdm9pZCBBWElz b2xhdGVkVHJlZTo6dXBkYXRlQ2hpbGRyZW4oQVhDb3JlT2JqZWN0JiBheE9iamVjdCkKICAgICBp ZiAoIWF4T2JqZWN0LmRvY3VtZW50KCkgfHwgIWF4T2JqZWN0LmRvY3VtZW50KCktPmhhc0xpdmlu Z1JlbmRlclRyZWUoKSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgSGFzaFNldDxBWElEPiBpZHNC ZWluZ0NoYW5nZWQ7CiAgICAgLy8gdXBkYXRlQ2hpbGRyZW4gbWF5IGJlIGNhbGxlZCBhcyB0aGUg cmVzdWx0IG9mIGEgY2hpbGRyZW4gY2hhbmdlZAogICAgIC8vIG5vdGlmaWNhdGlvbiBmb3IgYW4g YXhPYmplY3QgdGhhdCBoYXMgbm8gYXNzb2NpYXRlZCBpc29sYXRlZCBvYmplY3QuCiAgICAgLy8g QW4gZXhhbXBsZSBvZiB0aGlzIGlzIHdoZW4gYW4gZW1wdHkgZWxlbWVudCBzdWNoIGFzIGEgPGNh bnZhcz4gb3IgPGRpdj4KLSAgICAvLyBpcyBhZGRlZCBhIG5ldyBjaGlsZC4gVGh1cyBhZGQgdGhl IGFuY2VzdHJ5IHRoYXQgY29ubmVjdHMgdGhlIGFzc29jaWF0ZWQKLSAgICAvLyBpc29sYXRlZCBv YmplY3QgdG8gdGhlIGNsb3Nlc3QgZXhpc3RpbmcgYW5jZXN0b3IuCi0gICAgVmVjdG9yPE5vZGVD aGFuZ2U+IGNoYW5nZXMgPSBub2RlQW5jZXN0cnlDaGFuZ2VzKGF4T2JqZWN0LCBpZHNCZWluZ0No YW5nZWQpOworICAgIC8vIGhhcyBhZGRlZCBhIG5ldyBjaGlsZC4gU28gZmluZCB0aGUgY2xvc2Vz dCBhbmNlc3RvciBvZiBheE9iamVjdCB0aGF0IGhhcworICAgIC8vIGFuIGFzc29jaWF0ZWQgaXNv bGF0ZWQgb2JqZWN0IGFuZCB1cGRhdGUgaXRzIGNoaWxkcmVuLgorICAgIGF1dG8qIGF4QW5jZXN0 b3IgPSBBY2Nlc3NpYmlsaXR5OjpmaW5kQW5jZXN0b3IoYXhPYmplY3QsIHRydWUsIFt0aGlzXSAo YXV0byYgYW5jZXN0b3IpIHsKKyAgICAgICAgcmV0dXJuIG1fbm9kZU1hcC5maW5kKGFuY2VzdG9y Lm9iamVjdElEKCkpICE9IG1fbm9kZU1hcC5lbmQoKTsKKyAgICB9KTsKKworICAgIGlmICghYXhB bmNlc3RvciB8fCAhYXhBbmNlc3Rvci0+b2JqZWN0SUQoKS5pc1ZhbGlkKCkpIHsKKyAgICAgICAg Ly8gVGhpcyB1cGRhdGUgd2FzIHRyaWdnZXJlZCBiZWZvcmUgdGhlIGlzb2xhdGVkIHRyZWUgaGFz IGJlZW4gcmVwb3B1bGF0ZWQuCisgICAgICAgIC8vIFJldHVybiBoZXJlIHNpbmNlIHRoZXJlIGlz IG5vdGhpbmcgdG8gdXBkYXRlLgorICAgICAgICBBWExPRygiQmFpbGluZyBiZWNhdXNlIG5vIGFu Y2VzdG9yIGNvdWxkIGJlIGZvdW5kLCBvciBhbmNlc3RvciBoYWQgYW4gaW52YWxpZCBvYmplY3RJ RCIpOworICAgICAgICByZXR1cm47CisgICAgfQogCi0gICAgYXV0byBvbGRJRHMgPSBtX25vZGVN YXAuZ2V0KGF4T2JqZWN0Lm9iamVjdElEKCkpOworI2lmbmRlZiBOREVCVUcKKyAgICBpZiAoYXhB bmNlc3RvciAhPSBheE9iamVjdCkgeworICAgICAgICBBWExPRyhtYWtlU3RyaW5nKCJPcmlnaW5h bCBvYmplY3Qgd2l0aCBJRCAiLCBheE9iamVjdC5vYmplY3RJRCgpLmxvZ2dpbmdTdHJpbmcoKSwg IiB3YXNuJ3QgaW4gdGhlIGlzb2xhdGVkIHRyZWUsIHNvIGluc3RlYWQgdXBkYXRpbmcgdGhlIGNs b3Nlc3QgaW4taXNvbGF0ZWQtdHJlZSBhbmNlc3RvcjoiKTsKKyAgICAgICAgQVhMT0coYXhBbmNl c3Rvcik7CisgICAgfQorI2VuZGlmCisKKyAgICBhdXRvIG9sZElEcyA9IG1fbm9kZU1hcC5nZXQo YXhBbmNlc3Rvci0+b2JqZWN0SUQoKSk7CiAgICAgYXV0byYgb2xkQ2hpbGRyZW5JRHMgPSBvbGRJ RHMuY2hpbGRyZW5JRHM7CiAKLSAgICBjb25zdCBhdXRvJiBuZXdDaGlsZHJlbiA9IGF4T2JqZWN0 LmNoaWxkcmVuKCk7Ci0gICAgYXV0byBuZXdDaGlsZHJlbklEcyA9IGF4T2JqZWN0LmNoaWxkcmVu SURzKGZhbHNlKTsKKyAgICBjb25zdCBhdXRvJiBuZXdDaGlsZHJlbiA9IGF4QW5jZXN0b3ItPmNo aWxkcmVuKCk7CisgICAgYXV0byBuZXdDaGlsZHJlbklEcyA9IGF4QW5jZXN0b3ItPmNoaWxkcmVu SURzKGZhbHNlKTsKIAorICAgIFZlY3RvcjxOb2RlQ2hhbmdlPiBjaGFuZ2VzOworICAgIEhhc2hT ZXQ8QVhJRD4gaWRzQmVpbmdDaGFuZ2VkOwogICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgbmV3 Q2hpbGRyZW4uc2l6ZSgpOyArK2kpIHsKICAgICAgICAgQVNTRVJUKG5ld0NoaWxkcmVuW2ldLT5v YmplY3RJRCgpID09IG5ld0NoaWxkcmVuSURzW2ldKTsKICAgICAgICAgQVNTRVJUKG5ld0NoaWxk cmVuSURzW2ldLmlzVmFsaWQoKSk7CkBAIC00MjAsMTQgKzQwMywxNCBAQCB2b2lkIEFYSXNvbGF0 ZWRUcmVlOjp1cGRhdGVDaGlsZHJlbihBWENvcmVPYmplY3QmIGF4T2JqZWN0KQogICAgICAgICAg ICAgb2xkQ2hpbGRyZW5JRHMucmVtb3ZlKGluZGV4KTsKICAgICAgICAgZWxzZSB7CiAgICAgICAg ICAgICAvLyBUaGlzIGlzIGEgbmV3IGNoaWxkLCBhZGQgaXQgdG8gdGhlIHRyZWUuCi0gICAgICAg ICAgICBBWExPRyhtYWtlU3RyaW5nKCJBWElEICIsIGF4T2JqZWN0Lm9iamVjdElEKCkubG9nZ2lu Z1N0cmluZygpLCAiIGdhaW5pbmcgbmV3IHN1YnRyZWUsIHN0YXJ0aW5nIGF0IElEICIsIG5ld0No aWxkcmVuW2ldLT5vYmplY3RJRCgpLmxvZ2dpbmdTdHJpbmcoKSwgIjoiKSk7CisgICAgICAgICAg ICBBWExPRyhtYWtlU3RyaW5nKCJBWElEICIsIGF4QW5jZXN0b3ItPm9iamVjdElEKCkubG9nZ2lu Z1N0cmluZygpLCAiIGdhaW5pbmcgbmV3IHN1YnRyZWUsIHN0YXJ0aW5nIGF0IElEICIsIG5ld0No aWxkcmVuW2ldLT5vYmplY3RJRCgpLmxvZ2dpbmdTdHJpbmcoKSwgIjoiKSk7CiAgICAgICAgICAg ICBBWExPRyhuZXdDaGlsZHJlbltpXSk7Ci0gICAgICAgICAgICBjb2xsZWN0Tm9kZUNoYW5nZXNG b3JTdWJ0cmVlKCpuZXdDaGlsZHJlbltpXSwgYXhPYmplY3Qub2JqZWN0SUQoKSwgdHJ1ZSwgY2hh bmdlcywgJmlkc0JlaW5nQ2hhbmdlZCk7CisgICAgICAgICAgICBjb2xsZWN0Tm9kZUNoYW5nZXNG b3JTdWJ0cmVlKCpuZXdDaGlsZHJlbltpXSwgYXhBbmNlc3Rvci0+b2JqZWN0SUQoKSwgdHJ1ZSwg Y2hhbmdlcywgJmlkc0JlaW5nQ2hhbmdlZCk7CiAgICAgICAgIH0KICAgICB9Ci0gICAgbV9ub2Rl TWFwLnNldChheE9iamVjdC5vYmplY3RJRCgpLCBQYXJlbnRDaGlsZHJlbklEcyB7IG9sZElEcy5w YXJlbnRJRCwgbmV3Q2hpbGRyZW5JRHMgfSk7CisgICAgbV9ub2RlTWFwLnNldChheEFuY2VzdG9y LT5vYmplY3RJRCgpLCBQYXJlbnRDaGlsZHJlbklEcyB7IG9sZElEcy5wYXJlbnRJRCwgbmV3Q2hp bGRyZW5JRHMgfSk7CiAKLSAgICAvLyBXaGF0IGlzIGxlZnQgaW4gb2xkQ2hpbGRyZW5JRHMgYXJl IHRoZSBJRHMgdGhhdCBhcmUgbm8gbG9uZ2VyIGNoaWxkcmVuIG9mIGF4T2JqZWN0LgorICAgIC8v IFdoYXQgaXMgbGVmdCBpbiBvbGRDaGlsZHJlbklEcyBhcmUgdGhlIElEcyB0aGF0IGFyZSBubyBs b25nZXIgY2hpbGRyZW4gb2YgYXhBbmNlc3Rvci4KICAgICAvLyBUaHVzLCByZW1vdmUgdGhlbSBm cm9tIG1fbm9kZU1hcCBhbmQgcXVldWUgdGhlbSB0byBiZSByZW1vdmVkIGZyb20gdGhlIHRyZWUu CiAgICAgZm9yIChBWElEJiBheElEIDogb2xkQ2hpbGRyZW5JRHMpIHsKICAgICAgICAgLy8gSG93 ZXZlciwgd2UgZG9uJ3Qgd2FudCB0byByZW1vdmUgc3VidHJlZXMgZnJvbSB0aGUgbm9kZW1hcCB0 aGF0IGFyZSBwYXJ0IG9mIHRoZSB0by1iZS1xdWV1ZWQgbm9kZSBjaGFuZ2VzIChpLmUgdGhvc2Ug aW4gYGlkc0JlaW5nQ2hhbmdlZGApLgpAQCAtNDM1LDcgKzQxOCw3IEBAIHZvaWQgQVhJc29sYXRl ZFRyZWU6OnVwZGF0ZUNoaWxkcmVuKEFYQ29yZU9iamVjdCYgYXhPYmplY3QpCiAgICAgICAgIC8v ICAgMS4gT2JqZWN0IDEyMyBpcyBzbGF0ZWQgdG8gYmUgYSBjaGlsZCBvZiB0aGlzIG9iamVjdCAo aS5lLiBpbiBuZXdDaGlsZHJlbiksIGFuZCB3ZSBjb2xsZWN0IG5vZGUgY2hhbmdlcyBmb3IgaXQu CiAgICAgICAgIC8vICAgMi4gT2JqZWN0IDEyMyBpcyBjdXJyZW50bHkgYSBtZW1iZXIgb2YgYSBz dWJ0cmVlIG9mIHNvbWUgb3RoZXIgb2JqZWN0IGluIG9sZENoaWxkcmVuSURzLgogICAgICAgICAv LyAgIDMuIFRodXMsIHdlIGRvbid0IHdhbnQgdG8gZGVsZXRlIE9iamVjdCAxMjMgZnJvbSB0aGUg bm9kZW1hcCwgaW5zdGVhZCBhbGxvd2luZyBpdCB0byBiZSBtb3ZlZC4KLSAgICAgICAgcmVtb3Zl U3VidHJlZUZyb21Ob2RlTWFwKGF4SUQsICZheE9iamVjdCwgaWRzQmVpbmdDaGFuZ2VkKTsKKyAg ICAgICAgcmVtb3ZlU3VidHJlZUZyb21Ob2RlTWFwKGF4SUQsIGF4QW5jZXN0b3IsIGlkc0JlaW5n Q2hhbmdlZCk7CiAgICAgfQogICAgIHF1ZXVlQ2hhbmdlc0FuZFJlbW92YWxzKGNoYW5nZXMsIG9s ZENoaWxkcmVuSURzKTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxp dHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRUcmVlLmggYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3Np YmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkVHJlZS5oCmluZGV4IDc3NzU2YzU3NzIyNzgy NTRkOTdjNjEzM2RlMjRmNWUzYzRkMjQ2ODguLmRmYzAxYzg0ODRlOWVkYzdmMDJjZDMwMWNiNDQw YjZkZGY1OGE1ZTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNv bGF0ZWR0cmVlL0FYSXNvbGF0ZWRUcmVlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJp bGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZFRyZWUuaApAQCAtMzkxLDcgKzM5MSw2IEBAIHBy aXZhdGU6CiAgICAgdm9pZCBjb2xsZWN0Tm9kZUNoYW5nZXNGb3JTdWJ0cmVlKEFYQ29yZU9iamVj dCYsIEFYSUQgcGFyZW50SUQsIGJvb2wgYXR0YWNoV3JhcHBlciwgVmVjdG9yPE5vZGVDaGFuZ2U+ JiwgSGFzaFNldDxBWElEPiogPSBudWxscHRyKTsKICAgICB2b2lkIHF1ZXVlQ2hhbmdlKGNvbnN0 IE5vZGVDaGFuZ2UmKSBXVEZfUkVRVUlSRVNfTE9DSyhtX2NoYW5nZUxvZ0xvY2spOwogICAgIHZv aWQgcXVldWVDaGFuZ2VzQW5kUmVtb3ZhbHMoY29uc3QgVmVjdG9yPE5vZGVDaGFuZ2U+JiwgY29u c3QgVmVjdG9yPEFYSUQ+JiA9IHsgfSk7Ci0gICAgVmVjdG9yPE5vZGVDaGFuZ2U+IG5vZGVBbmNl c3RyeUNoYW5nZXMoQVhDb3JlT2JqZWN0JiwgSGFzaFNldDxBWElEPiYpOwogCiAgICAgQVhJc29s YXRlZFRyZWVJRCBtX3RyZWVJRDsKICAgICBBWE9iamVjdENhY2hlKiBtX2F4T2JqZWN0Q2FjaGUg eyBudWxscHRyIH07Cg== 451474 2022-02-09 17:54:43 -0800 2022-02-09 17:58:35 -0800 Patch bug-236414-20220209195442.patch text/plain 11026 tyler_w U3VidmVyc2lvbiBSZXZpc2lvbjogMjg5Mzc1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTU5MjdjMjdhYmQ0MzI3 MDE0ZjU5YTdiNzUzNDk5NmM1ZTBlZTg1Ni4uZDZhZWE3ODZmYzUwMmQ0ODdkNWE2Yzg5ODc4ODhk ZDZmNDNhMWNjOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMzIEBACisyMDIyLTAyLTA5ICBUeWxl ciBXaWxjb2NrICA8dHlsZXJfd0BhcHBsZS5jb20+CisKKyAgICAgICAgQVhJc29sYXRlZFRyZWU6 OnVwZGF0ZUNoaWxkcmVuIGFuZCBBWElzb2xhdGVkVHJlZTo6bm9kZUFuY2VzdHJ5Q2hhbmdlcyBy ZXN1bHRzIGluIGFkZGluZyBpbmNvcnJlY3Qgbm9kZXMgdG8gdGhlIGlzb2xhdGVkIHRyZWUKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNjQxNAorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFNvbWV0aW1lcyBB WElzb2xhdGVkVHJlZTo6dXBkYXRlQ2hpbGRyZW4gaXMgY2FsbGVkIHdpdGggYW4gb2JqZWN0IHRo YXQgaXMKKyAgICAgICAgbm90IGluIHRoZSBpc29sYXRlZCB0cmVlLiBXaGVuIHRoaXMgaGFwcGVu cywgd2UgY3VycmVudGx5IGNhbGwgQVhJc29sYXRlZFRyZWU6Om5vZGVBbmNlc3RyeUNoYW5nZXMK KyAgICAgICAgdG8gYnVpbGQgdGhlIGFuY2VzdHJ5IGNoYWluIHVwIHRvIHRoZSBuZWFyZXN0IGlu LWlzb2xhdGVkLXRyZWUgbm9kZSAoc3RhcnRpbmcgd2l0aCB0aGUgb3JpZ2luYWwKKyAgICAgICAg b2JqZWN0IGNhbGxlZCBmb3IgdXBkYXRlQ2hpbGRyZW4pLgorCisgICAgICAgIEhvd2V2ZXIsIHRo aXMgc2VlbXMgdG8gcmVzdWx0IGluIGFkZGluZyBub2RlcyB0byB0aGUgaXNvbGF0ZWQgdHJlZSB0 aGF0IGRvbid0IGV4aXN0IGluIHRoZSBsaXZlIHRyZWUuCisgICAgICAgIEkgYmVsaWV2ZSB0aGlz IGFsc28gY2F1c2VzIGlzb2xhdGVkIG9iamVjdHMgdG8gb2Z0ZW4gaG9sZCByZWZlcmVuY2VzIHRv IHBhcmVudCBvYmplY3RzIHRoYXQgZG9uJ3QgZXhpc3QKKyAgICAgICAgaW4gdGhlIGlzb2xhdGVk IHRyZWUsIGJyZWFraW5nIG9iamVjdCBzZWFyY2hlcyAoYW5kIG1vcmUpLgorCisgICAgICAgIFdp dGggdGhpcyBwYXRjaCwgd2hlbiBBWElzb2xhdGVkVHJlZTo6dXBkYXRlQ2hpbGRyZW4gaXMgY2Fs bGVkIHdpdGggYW4gb2JqZWN0IHRoYXQgaGFzIG5vIGlzb2xhdGVkIHRyZWUKKyAgICAgICAgZXF1 aXZhbGVudCwgd2UgdHJhdmVyc2UgdXAgdGhlIG9iamVjdCdzIGFuY2VzdHJ5IHVudGlsIHdlIGZp bmQgYW4gb2JqZWN0IGluIHRoZSBpc29sYXRlZCB0cmVlIGFuZCB1cGRhdGUKKyAgICAgICAgdGhl IGNoaWxkcmVuIGZvciB0aGF0LgorCisgICAgICAgIFRoaXMgd2FzIHRoZSBiZWhhdmlvciBiZWZv cmUgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNTM4OS4gV2UgbWFk ZSB0aGF0IGNoYW5nZSBiZWNhdXNlCisgICAgICAgIHdlIGJlbGlldmVkIHRoaXMgYmVoYXZpb3Ig d2FzIGNhdXNpbmcgYSBsb3Qgb2YgZnVsbC10cmVlIHJlLXJlbmRlcnMuIEhvd2V2ZXIsIGluIG15 IHRlc3Rpbmcgb24gbGFyZ2Ugd2VicGFnZXMKKyAgICAgICAgKGUuZy4geW91dHViZS5jb20sIGZh Y2Vib29rLmNvbSksIHRoaXMgZG9lc24ndCBzZWVtIHRvIGJlIHRoZSBjYXNlLCBhbmQgcGVyZm9y bWFuY2UgaXMgYWN0dWFsbHkgdmVyeSBnb29kLgorCisgICAgICAgICogYWNjZXNzaWJpbGl0eS9p c29sYXRlZHRyZWUvQVhJc29sYXRlZFRyZWUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6QVhJc29s YXRlZFRyZWU6OnVwZGF0ZUNoaWxkcmVuKToKKyAgICAgICAgKFdlYkNvcmU6OkFYSXNvbGF0ZWRU cmVlOjpub2RlQW5jZXN0cnlDaGFuZ2VzKTogRGVsZXRlZC4KKyAgICAgICAgKiBhY2Nlc3NpYmls aXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkVHJlZS5oOgorICAgICAgICAoV2ViQ29yZTo6QVhJ c29sYXRlZFRyZWU6OnF1ZXVlQ2hhbmdlc0FuZFJlbW92YWxzKToKKwogMjAyMi0wMi0wOCAgQWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgW0xGQ11bSUZDXSBUYWtlIHdy aXRpbmcgZGlyZWN0aW9uIGludG8gYWNjb3VudCB3aGVuIGFwcGx5aW5nIFJlbmRlckJsb2NrRmxv dyBlbmQgcGFkZGluZyBxdWlyawpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJp bGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZFRyZWUuY3BwIGIvU291cmNlL1dlYkNvcmUvYWNj ZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZFRyZWUuY3BwCmluZGV4IDViMDhlMmI3 MDllMTUzNjQyNDM0N2NlNzFhZTQ0OWY4ZjBlMjkwYjYuLmRlYzdmNzUzMjE3NzY2MTllMGQxNWQ2 M2Q1MjVkMjI1ODUxNGNhMzMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxp dHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRUcmVlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9h Y2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkVHJlZS5jcHAKQEAgLTIxMCw3ICsy MTAsNyBAQCBBWElEIEFYSXNvbGF0ZWRUcmVlOjpwYXJlbnRJREZvck9iamVjdChBWENvcmVPYmpl Y3QmIGF4T2JqZWN0LCBBWElEIGFzc3VtZWRQYXJlbgogICAgIHJldHVybiBhc3N1bWVkUGFyZW50 SUQ7CiB9CiAKLUFYSXNvbGF0ZWRUcmVlOjpOb2RlQ2hhbmdlIEFYSXNvbGF0ZWRUcmVlOjpub2Rl Q2hhbmdlRm9yT2JqZWN0KEFYQ29yZU9iamVjdCYgYXhPYmplY3QsIEFYSUQgcGFyZW50SUQsIGJv b2wgYXR0YWNoV3JhcHBlciwgYm9vbCB1cGRhdGVOb2RlTWFwKQorQVhJc29sYXRlZFRyZWU6Ok5v ZGVDaGFuZ2UgQVhJc29sYXRlZFRyZWU6Om5vZGVDaGFuZ2VGb3JPYmplY3QoQVhDb3JlT2JqZWN0 JiBheE9iamVjdCwgQVhJRCBwYXJlbnRJRCwgYm9vbCBhdHRhY2hXcmFwcGVyKQogewogICAgIEFT U0VSVChpc01haW5UaHJlYWQoKSk7CiAKQEAgLTIzMSw4ICsyMzEsNyBAQCBBWElzb2xhdGVkVHJl ZTo6Tm9kZUNoYW5nZSBBWElzb2xhdGVkVHJlZTo6bm9kZUNoYW5nZUZvck9iamVjdChBWENvcmVP YmplY3QmIGF4TwogICAgICAgICBub2RlQ2hhbmdlLndyYXBwZXIgPSBheE9iamVjdC53cmFwcGVy KCk7CiAgICAgfQogCi0gICAgaWYgKHVwZGF0ZU5vZGVNYXApCi0gICAgICAgIG1fbm9kZU1hcC5z ZXQoYXhPYmplY3Qub2JqZWN0SUQoKSwgUGFyZW50Q2hpbGRyZW5JRHMgeyBwYXJlbnRJRCwgYXhP YmplY3QuY2hpbGRyZW5JRHMoKSB9KTsKKyAgICBtX25vZGVNYXAuc2V0KGF4T2JqZWN0Lm9iamVj dElEKCksIFBhcmVudENoaWxkcmVuSURzIHsgcGFyZW50SUQsIGF4T2JqZWN0LmNoaWxkcmVuSURz KCkgfSk7CiAKICAgICBpZiAoIXBhcmVudElELmlzVmFsaWQoKSkgewogICAgICAgICBMb2NrZXIg bG9ja2VyIHsgbV9jaGFuZ2VMb2dMb2NrIH07CkBAIC0zNDksNDAgKzM0OCw2IEBAIHZvaWQgQVhJ c29sYXRlZFRyZWU6OnVwZGF0ZU5vZGVQcm9wZXJ0eShjb25zdCBBWENvcmVPYmplY3QmIGF4T2Jq ZWN0LCBBWFByb3BlcnR5CiAgICAgbV9wZW5kaW5nUHJvcGVydHlDaGFuZ2VzLmFwcGVuZCh7IGF4 T2JqZWN0Lm9iamVjdElEKCksIHByb3BlcnR5TWFwIH0pOwogfQogCi1WZWN0b3I8QVhJc29sYXRl ZFRyZWU6Ok5vZGVDaGFuZ2U+IEFYSXNvbGF0ZWRUcmVlOjpub2RlQW5jZXN0cnlDaGFuZ2VzKEFY Q29yZU9iamVjdCYgYXhDb3JlT2JqZWN0LCBIYXNoU2V0PEFYSUQ+JiBpZHNCZWluZ0NoYW5nZWQp Ci17Ci0gICAgVmVjdG9yPE5vZGVDaGFuZ2U+IGNoYW5nZXM7Ci0KLSAgICBhdXRvKiBheE9iamVj dCA9ICZheENvcmVPYmplY3Q7Ci0gICAgd2hpbGUgKGF4T2JqZWN0ICYmICFtX25vZGVNYXAuY29u dGFpbnMoYXhPYmplY3QtPm9iamVjdElEKCkpKSB7Ci0gICAgICAgIC8vIGF4T2JqZWN0IGhhcyBu byBub2RlIGluIHRoZSBpc29sYXRlZCB0cmVlLCB0aHVzIGFkZCBpdC4KLSAgICAgICAgQVhMT0co ImF4T2JqZWN0IG5vdCBpbiB0aGUgaXNvbGF0ZWQgdHJlZToiKTsKLSAgICAgICAgQVhMT0coYXhP YmplY3QpOwotICAgICAgICBhdXRvKiBheFBhcmVudCA9IGF4T2JqZWN0LT5wYXJlbnRPYmplY3RV bmlnbm9yZWQoKTsKLSAgICAgICAgQVhMT0coImF4UGFyZW50OiIpOwotICAgICAgICBBWExPRyhh eFBhcmVudCk7Ci0gICAgICAgIEFYSUQgYXhQYXJlbnRJRCA9IGF4UGFyZW50ID8gYXhQYXJlbnQt Pm9iamVjdElEKCkgOiBBWElEKCk7Ci0KLSAgICAgICAgLy8gSWYgYXhPYmplY3QgaXMgdGhlIG9y aWdpbmFsIG9iamVjdCBmb3Igd2hpY2ggd2UgYXJlIGFkZGluZyBpdHMgYW5jZXN0cnksIGRvbid0 IHVwZGF0ZSB0aGUgbm9kZU1hcCBzaW5jZSB1cGRhdGVDaGlsZHJlbiBuZWVkcyB0byBjb21wYXJl IGl0cyBwcmV2aW91cyBjaGlsZHJlbiB3aXRoIHRoZSBuZXcgb25lcy4KLSAgICAgICAgYm9vbCB1 cGRhdGVOb2RlTWFwID0gYXhPYmplY3QgIT0gJmF4Q29yZU9iamVjdDsKLSAgICAgICAgYXV0byBj aGFuZ2UgPSBub2RlQ2hhbmdlRm9yT2JqZWN0KCpheE9iamVjdCwgYXhQYXJlbnRJRCwgdHJ1ZSwg dXBkYXRlTm9kZU1hcCk7Ci0gICAgICAgIGlkc0JlaW5nQ2hhbmdlZC5hZGQoY2hhbmdlLmlzb2xh dGVkT2JqZWN0LT5vYmplY3RJRCgpKTsKLSAgICAgICAgY2hhbmdlcy5hcHBlbmQoV1RGTW92ZShj aGFuZ2UpKTsKLQotICAgICAgICBpZiAoYXhQYXJlbnQgJiYgbV9ub2RlTWFwLmNvbnRhaW5zKGF4 UGFyZW50LT5vYmplY3RJRCgpKSkgewotICAgICAgICAgICAgYXV0byBpZHMgPSBtX25vZGVNYXAu Z2V0KGF4UGFyZW50LT5vYmplY3RJRCgpKTsKLSAgICAgICAgICAgIGlkcy5jaGlsZHJlbklEcyA9 IGF4UGFyZW50LT5jaGlsZHJlbklEcygpOwotICAgICAgICAgICAgbV9ub2RlTWFwLnNldChheFBh cmVudC0+b2JqZWN0SUQoKSwgV1RGTW92ZShpZHMpKTsKLSAgICAgICAgfQotCi0gICAgICAgIGF4 T2JqZWN0ID0gYXhQYXJlbnQ7Ci0gICAgfQotCi0gICAgLy8gU2luY2UgdGhlIE5vZGVDaGFuZ2Vz IGFyZSBhZGRlZCB0byB0aGUgY2hhbmdlcyB2ZWN0b3IgaW4gYSBjaGlsZCAtPiBwYXJlbnQgdHJh dmVyc2FsIGluc3RlYWQgb2YgYSBwYXJlbnQgLT4gY2hpbGQgdHJhdmVyc2FsLCB3ZSBuZWVkIHRv IHJldmVyc2UgY2hhbmdlcy4KLSAgICBjaGFuZ2VzLnJldmVyc2UoKTsKLSAgICByZXR1cm4gY2hh bmdlczsKLX0KLQogdm9pZCBBWElzb2xhdGVkVHJlZTo6dXBkYXRlQ2hpbGRyZW4oQVhDb3JlT2Jq ZWN0JiBheE9iamVjdCkKIHsKICAgICBBWFRSQUNFKCJBWElzb2xhdGVkVHJlZTo6dXBkYXRlQ2hp bGRyZW4iKTsKQEAgLTM5OCwyMCArMzYzLDM3IEBAIHZvaWQgQVhJc29sYXRlZFRyZWU6OnVwZGF0 ZUNoaWxkcmVuKEFYQ29yZU9iamVjdCYgYXhPYmplY3QpCiAgICAgaWYgKCFheE9iamVjdC5kb2N1 bWVudCgpIHx8ICFheE9iamVjdC5kb2N1bWVudCgpLT5oYXNMaXZpbmdSZW5kZXJUcmVlKCkpCiAg ICAgICAgIHJldHVybjsKIAotICAgIEhhc2hTZXQ8QVhJRD4gaWRzQmVpbmdDaGFuZ2VkOwogICAg IC8vIHVwZGF0ZUNoaWxkcmVuIG1heSBiZSBjYWxsZWQgYXMgdGhlIHJlc3VsdCBvZiBhIGNoaWxk cmVuIGNoYW5nZWQKICAgICAvLyBub3RpZmljYXRpb24gZm9yIGFuIGF4T2JqZWN0IHRoYXQgaGFz IG5vIGFzc29jaWF0ZWQgaXNvbGF0ZWQgb2JqZWN0LgogICAgIC8vIEFuIGV4YW1wbGUgb2YgdGhp cyBpcyB3aGVuIGFuIGVtcHR5IGVsZW1lbnQgc3VjaCBhcyBhIDxjYW52YXM+IG9yIDxkaXY+Ci0g ICAgLy8gaXMgYWRkZWQgYSBuZXcgY2hpbGQuIFRodXMgYWRkIHRoZSBhbmNlc3RyeSB0aGF0IGNv bm5lY3RzIHRoZSBhc3NvY2lhdGVkCi0gICAgLy8gaXNvbGF0ZWQgb2JqZWN0IHRvIHRoZSBjbG9z ZXN0IGV4aXN0aW5nIGFuY2VzdG9yLgotICAgIFZlY3RvcjxOb2RlQ2hhbmdlPiBjaGFuZ2VzID0g bm9kZUFuY2VzdHJ5Q2hhbmdlcyhheE9iamVjdCwgaWRzQmVpbmdDaGFuZ2VkKTsKKyAgICAvLyBo YXMgYWRkZWQgYSBuZXcgY2hpbGQuIFNvIGZpbmQgdGhlIGNsb3Nlc3QgYW5jZXN0b3Igb2YgYXhP YmplY3QgdGhhdCBoYXMKKyAgICAvLyBhbiBhc3NvY2lhdGVkIGlzb2xhdGVkIG9iamVjdCBhbmQg dXBkYXRlIGl0cyBjaGlsZHJlbi4KKyAgICBhdXRvKiBheEFuY2VzdG9yID0gQWNjZXNzaWJpbGl0 eTo6ZmluZEFuY2VzdG9yKGF4T2JqZWN0LCB0cnVlLCBbdGhpc10gKGF1dG8mIGFuY2VzdG9yKSB7 CisgICAgICAgIHJldHVybiBtX25vZGVNYXAuZmluZChhbmNlc3Rvci5vYmplY3RJRCgpKSAhPSBt X25vZGVNYXAuZW5kKCk7CisgICAgfSk7CisKKyAgICBpZiAoIWF4QW5jZXN0b3IgfHwgIWF4QW5j ZXN0b3ItPm9iamVjdElEKCkuaXNWYWxpZCgpKSB7CisgICAgICAgIC8vIFRoaXMgdXBkYXRlIHdh cyB0cmlnZ2VyZWQgYmVmb3JlIHRoZSBpc29sYXRlZCB0cmVlIGhhcyBiZWVuIHJlcG9wdWxhdGVk LgorICAgICAgICAvLyBSZXR1cm4gaGVyZSBzaW5jZSB0aGVyZSBpcyBub3RoaW5nIHRvIHVwZGF0 ZS4KKyAgICAgICAgQVhMT0coIkJhaWxpbmcgYmVjYXVzZSBubyBhbmNlc3RvciBjb3VsZCBiZSBm b3VuZCwgb3IgYW5jZXN0b3IgaGFkIGFuIGludmFsaWQgb2JqZWN0SUQiKTsKKyAgICAgICAgcmV0 dXJuOworICAgIH0KIAotICAgIGF1dG8gb2xkSURzID0gbV9ub2RlTWFwLmdldChheE9iamVjdC5v YmplY3RJRCgpKTsKKyNpZm5kZWYgTkRFQlVHCisgICAgaWYgKGF4QW5jZXN0b3IgIT0gYXhPYmpl Y3QpIHsKKyAgICAgICAgQVhMT0cobWFrZVN0cmluZygiT3JpZ2luYWwgb2JqZWN0IHdpdGggSUQg IiwgYXhPYmplY3Qub2JqZWN0SUQoKS5sb2dnaW5nU3RyaW5nKCksICIgd2Fzbid0IGluIHRoZSBp c29sYXRlZCB0cmVlLCBzbyBpbnN0ZWFkIHVwZGF0aW5nIHRoZSBjbG9zZXN0IGluLWlzb2xhdGVk LXRyZWUgYW5jZXN0b3I6Iik7CisgICAgICAgIEFYTE9HKGF4QW5jZXN0b3IpOworICAgIH0KKyNl bmRpZgorCisgICAgYXV0byBvbGRJRHMgPSBtX25vZGVNYXAuZ2V0KGF4QW5jZXN0b3ItPm9iamVj dElEKCkpOwogICAgIGF1dG8mIG9sZENoaWxkcmVuSURzID0gb2xkSURzLmNoaWxkcmVuSURzOwog Ci0gICAgY29uc3QgYXV0byYgbmV3Q2hpbGRyZW4gPSBheE9iamVjdC5jaGlsZHJlbigpOwotICAg IGF1dG8gbmV3Q2hpbGRyZW5JRHMgPSBheE9iamVjdC5jaGlsZHJlbklEcyhmYWxzZSk7CisgICAg Y29uc3QgYXV0byYgbmV3Q2hpbGRyZW4gPSBheEFuY2VzdG9yLT5jaGlsZHJlbigpOworICAgIGF1 dG8gbmV3Q2hpbGRyZW5JRHMgPSBheEFuY2VzdG9yLT5jaGlsZHJlbklEcyhmYWxzZSk7CiAKKyAg ICBWZWN0b3I8Tm9kZUNoYW5nZT4gY2hhbmdlczsKKyAgICBIYXNoU2V0PEFYSUQ+IGlkc0JlaW5n Q2hhbmdlZDsKICAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IG5ld0NoaWxkcmVuLnNpemUoKTsg KytpKSB7CiAgICAgICAgIEFTU0VSVChuZXdDaGlsZHJlbltpXS0+b2JqZWN0SUQoKSA9PSBuZXdD aGlsZHJlbklEc1tpXSk7CiAgICAgICAgIEFTU0VSVChuZXdDaGlsZHJlbklEc1tpXS5pc1ZhbGlk KCkpOwpAQCAtNDIwLDE0ICs0MDIsMTQgQEAgdm9pZCBBWElzb2xhdGVkVHJlZTo6dXBkYXRlQ2hp bGRyZW4oQVhDb3JlT2JqZWN0JiBheE9iamVjdCkKICAgICAgICAgICAgIG9sZENoaWxkcmVuSURz LnJlbW92ZShpbmRleCk7CiAgICAgICAgIGVsc2UgewogICAgICAgICAgICAgLy8gVGhpcyBpcyBh IG5ldyBjaGlsZCwgYWRkIGl0IHRvIHRoZSB0cmVlLgotICAgICAgICAgICAgQVhMT0cobWFrZVN0 cmluZygiQVhJRCAiLCBheE9iamVjdC5vYmplY3RJRCgpLmxvZ2dpbmdTdHJpbmcoKSwgIiBnYWlu aW5nIG5ldyBzdWJ0cmVlLCBzdGFydGluZyBhdCBJRCAiLCBuZXdDaGlsZHJlbltpXS0+b2JqZWN0 SUQoKS5sb2dnaW5nU3RyaW5nKCksICI6IikpOworICAgICAgICAgICAgQVhMT0cobWFrZVN0cmlu ZygiQVhJRCAiLCBheEFuY2VzdG9yLT5vYmplY3RJRCgpLmxvZ2dpbmdTdHJpbmcoKSwgIiBnYWlu aW5nIG5ldyBzdWJ0cmVlLCBzdGFydGluZyBhdCBJRCAiLCBuZXdDaGlsZHJlbltpXS0+b2JqZWN0 SUQoKS5sb2dnaW5nU3RyaW5nKCksICI6IikpOwogICAgICAgICAgICAgQVhMT0cobmV3Q2hpbGRy ZW5baV0pOwotICAgICAgICAgICAgY29sbGVjdE5vZGVDaGFuZ2VzRm9yU3VidHJlZSgqbmV3Q2hp bGRyZW5baV0sIGF4T2JqZWN0Lm9iamVjdElEKCksIHRydWUsIGNoYW5nZXMsICZpZHNCZWluZ0No YW5nZWQpOworICAgICAgICAgICAgY29sbGVjdE5vZGVDaGFuZ2VzRm9yU3VidHJlZSgqbmV3Q2hp bGRyZW5baV0sIGF4QW5jZXN0b3ItPm9iamVjdElEKCksIHRydWUsIGNoYW5nZXMsICZpZHNCZWlu Z0NoYW5nZWQpOwogICAgICAgICB9CiAgICAgfQotICAgIG1fbm9kZU1hcC5zZXQoYXhPYmplY3Qu b2JqZWN0SUQoKSwgUGFyZW50Q2hpbGRyZW5JRHMgeyBvbGRJRHMucGFyZW50SUQsIG5ld0NoaWxk cmVuSURzIH0pOworICAgIG1fbm9kZU1hcC5zZXQoYXhBbmNlc3Rvci0+b2JqZWN0SUQoKSwgUGFy ZW50Q2hpbGRyZW5JRHMgeyBvbGRJRHMucGFyZW50SUQsIG5ld0NoaWxkcmVuSURzIH0pOwogCi0g ICAgLy8gV2hhdCBpcyBsZWZ0IGluIG9sZENoaWxkcmVuSURzIGFyZSB0aGUgSURzIHRoYXQgYXJl IG5vIGxvbmdlciBjaGlsZHJlbiBvZiBheE9iamVjdC4KKyAgICAvLyBXaGF0IGlzIGxlZnQgaW4g b2xkQ2hpbGRyZW5JRHMgYXJlIHRoZSBJRHMgdGhhdCBhcmUgbm8gbG9uZ2VyIGNoaWxkcmVuIG9m IGF4QW5jZXN0b3IuCiAgICAgLy8gVGh1cywgcmVtb3ZlIHRoZW0gZnJvbSBtX25vZGVNYXAgYW5k IHF1ZXVlIHRoZW0gdG8gYmUgcmVtb3ZlZCBmcm9tIHRoZSB0cmVlLgogICAgIGZvciAoQVhJRCYg YXhJRCA6IG9sZENoaWxkcmVuSURzKSB7CiAgICAgICAgIC8vIEhvd2V2ZXIsIHdlIGRvbid0IHdh bnQgdG8gcmVtb3ZlIHN1YnRyZWVzIGZyb20gdGhlIG5vZGVtYXAgdGhhdCBhcmUgcGFydCBvZiB0 aGUgdG8tYmUtcXVldWVkIG5vZGUgY2hhbmdlcyAoaS5lIHRob3NlIGluIGBpZHNCZWluZ0NoYW5n ZWRgKS4KQEAgLTQzNSw3ICs0MTcsNyBAQCB2b2lkIEFYSXNvbGF0ZWRUcmVlOjp1cGRhdGVDaGls ZHJlbihBWENvcmVPYmplY3QmIGF4T2JqZWN0KQogICAgICAgICAvLyAgIDEuIE9iamVjdCAxMjMg aXMgc2xhdGVkIHRvIGJlIGEgY2hpbGQgb2YgdGhpcyBvYmplY3QgKGkuZS4gaW4gbmV3Q2hpbGRy ZW4pLCBhbmQgd2UgY29sbGVjdCBub2RlIGNoYW5nZXMgZm9yIGl0LgogICAgICAgICAvLyAgIDIu IE9iamVjdCAxMjMgaXMgY3VycmVudGx5IGEgbWVtYmVyIG9mIGEgc3VidHJlZSBvZiBzb21lIG90 aGVyIG9iamVjdCBpbiBvbGRDaGlsZHJlbklEcy4KICAgICAgICAgLy8gICAzLiBUaHVzLCB3ZSBk b24ndCB3YW50IHRvIGRlbGV0ZSBPYmplY3QgMTIzIGZyb20gdGhlIG5vZGVtYXAsIGluc3RlYWQg YWxsb3dpbmcgaXQgdG8gYmUgbW92ZWQuCi0gICAgICAgIHJlbW92ZVN1YnRyZWVGcm9tTm9kZU1h cChheElELCAmYXhPYmplY3QsIGlkc0JlaW5nQ2hhbmdlZCk7CisgICAgICAgIHJlbW92ZVN1YnRy ZWVGcm9tTm9kZU1hcChheElELCBheEFuY2VzdG9yLCBpZHNCZWluZ0NoYW5nZWQpOwogICAgIH0K ICAgICBxdWV1ZUNoYW5nZXNBbmRSZW1vdmFscyhjaGFuZ2VzLCBvbGRDaGlsZHJlbklEcyk7CiB9 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9B WElzb2xhdGVkVHJlZS5oIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRy ZWUvQVhJc29sYXRlZFRyZWUuaAppbmRleCA3Nzc1NmM1NzcyMjc4MjU0ZDk3YzYxMzNkZTI0ZjVl M2M0ZDI0Njg4Li5iZDJjYTcyYTY0OWFmN2U1YzY3MmQ0MmUzNmQzM2FkNzhkYzFmNTVkIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xh dGVkVHJlZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVl L0FYSXNvbGF0ZWRUcmVlLmgKQEAgLTM4NywxMSArMzg3LDEwIEBAIHByaXZhdGU6CiAgICAgLy8g TWV0aG9kcyBpbiB0aGlzIGJsb2NrIGFyZSBjYWxsZWQgb24gdGhlIG1haW4gdGhyZWFkLgogICAg IC8vIENvbXB1dGVzIHRoZSBwYXJlbnQgSUQgb2YgdGhlIGdpdmVuIG9iamVjdCwgd2hpY2ggaXMg Z2VuZXJhbGx5IHRoZSAiYXNzdW1lZCIgcGFyZW50IElEIChidXQgbm90IGFsd2F5cywgbGlrZSBp biB0aGUgY2FzZSBvZiB0YWJsZXMpLgogICAgIEFYSUQgcGFyZW50SURGb3JPYmplY3QoQVhDb3Jl T2JqZWN0JiwgQVhJRCBhc3N1bWVkUGFyZW50SUQpOwotICAgIE5vZGVDaGFuZ2Ugbm9kZUNoYW5n ZUZvck9iamVjdChBWENvcmVPYmplY3QmLCBBWElEIHBhcmVudElELCBib29sIGF0dGFjaFdyYXBw ZXIgPSB0cnVlLCBib29sIHVwZGF0ZU5vZGVNYXAgPSB0cnVlKTsKKyAgICBOb2RlQ2hhbmdlIG5v ZGVDaGFuZ2VGb3JPYmplY3QoQVhDb3JlT2JqZWN0JiwgQVhJRCBwYXJlbnRJRCwgYm9vbCBhdHRh Y2hXcmFwcGVyID0gdHJ1ZSk7CiAgICAgdm9pZCBjb2xsZWN0Tm9kZUNoYW5nZXNGb3JTdWJ0cmVl KEFYQ29yZU9iamVjdCYsIEFYSUQgcGFyZW50SUQsIGJvb2wgYXR0YWNoV3JhcHBlciwgVmVjdG9y PE5vZGVDaGFuZ2U+JiwgSGFzaFNldDxBWElEPiogPSBudWxscHRyKTsKICAgICB2b2lkIHF1ZXVl Q2hhbmdlKGNvbnN0IE5vZGVDaGFuZ2UmKSBXVEZfUkVRVUlSRVNfTE9DSyhtX2NoYW5nZUxvZ0xv Y2spOwogICAgIHZvaWQgcXVldWVDaGFuZ2VzQW5kUmVtb3ZhbHMoY29uc3QgVmVjdG9yPE5vZGVD aGFuZ2U+JiwgY29uc3QgVmVjdG9yPEFYSUQ+JiA9IHsgfSk7Ci0gICAgVmVjdG9yPE5vZGVDaGFu Z2U+IG5vZGVBbmNlc3RyeUNoYW5nZXMoQVhDb3JlT2JqZWN0JiwgSGFzaFNldDxBWElEPiYpOwog CiAgICAgQVhJc29sYXRlZFRyZWVJRCBtX3RyZWVJRDsKICAgICBBWE9iamVjdENhY2hlKiBtX2F4 T2JqZWN0Q2FjaGUgeyBudWxscHRyIH07Cg== 451475 2022-02-09 17:58:38 -0800 2022-02-09 18:31:38 -0800 Patch bug-236414-20220209195837.patch text/plain 11251 tyler_w U3VidmVyc2lvbiBSZXZpc2lvbjogMjg5Mzc1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTU5MjdjMjdhYmQ0MzI3 MDE0ZjU5YTdiNzUzNDk5NmM1ZTBlZTg1Ni4uMWFhNThmMWM3N2ZhODJjNDEzNTA2YWVhYzBhOWQy YzFjYzkwOTE1ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM3IEBACisyMDIyLTAyLTA5ICBUeWxl ciBXaWxjb2NrICA8dHlsZXJfd0BhcHBsZS5jb20+CisKKyAgICAgICAgQVhJc29sYXRlZFRyZWU6 OnVwZGF0ZUNoaWxkcmVuIGFuZCBBWElzb2xhdGVkVHJlZTo6bm9kZUFuY2VzdHJ5Q2hhbmdlcyBy ZXN1bHRzIGluIGFkZGluZyBpbmNvcnJlY3Qgbm9kZXMgdG8gdGhlIGlzb2xhdGVkIHRyZWUKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNjQxNAorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFNvbWV0aW1lcyBB WElzb2xhdGVkVHJlZTo6dXBkYXRlQ2hpbGRyZW4gaXMgY2FsbGVkIHdpdGggYW4gb2JqZWN0IHRo YXQgaXMKKyAgICAgICAgbm90IGluIHRoZSBpc29sYXRlZCB0cmVlLiBXaGVuIHRoaXMgaGFwcGVu cywgd2UgY3VycmVudGx5IGNhbGwgQVhJc29sYXRlZFRyZWU6Om5vZGVBbmNlc3RyeUNoYW5nZXMK KyAgICAgICAgdG8gYnVpbGQgdGhlIGFuY2VzdHJ5IGNoYWluIHVwIHRvIHRoZSBuZWFyZXN0IGlu LWlzb2xhdGVkLXRyZWUgbm9kZSAoc3RhcnRpbmcgd2l0aCB0aGUgb3JpZ2luYWwKKyAgICAgICAg b2JqZWN0IGNhbGxlZCBmb3IgdXBkYXRlQ2hpbGRyZW4pLgorCisgICAgICAgIEhvd2V2ZXIsIHRo aXMgc2VlbXMgdG8gcmVzdWx0IGluIGFkZGluZyBub2RlcyB0byB0aGUgaXNvbGF0ZWQgdHJlZSB0 aGF0IGRvbid0IGV4aXN0IGluIHRoZSBsaXZlIHRyZWUuCisgICAgICAgIEkgYmVsaWV2ZSB0aGlz IGFsc28gY2F1c2VzIGlzb2xhdGVkIG9iamVjdHMgdG8gb2Z0ZW4gaG9sZCByZWZlcmVuY2VzIHRv IHBhcmVudCBvYmplY3RzIHRoYXQgZG9uJ3QgZXhpc3QKKyAgICAgICAgaW4gdGhlIGlzb2xhdGVk IHRyZWUsIGJyZWFraW5nIG9iamVjdCBzZWFyY2hlcyAoYW5kIG1vcmUpLgorCisgICAgICAgIFdp dGggdGhpcyBwYXRjaCwgd2hlbiBBWElzb2xhdGVkVHJlZTo6dXBkYXRlQ2hpbGRyZW4gaXMgY2Fs bGVkIHdpdGggYW4gb2JqZWN0IHRoYXQgaGFzIG5vIGlzb2xhdGVkIHRyZWUKKyAgICAgICAgZXF1 aXZhbGVudCwgd2UgdHJhdmVyc2UgdXAgdGhlIG9iamVjdCdzIGFuY2VzdHJ5IHVudGlsIHdlIGZp bmQgYW4gb2JqZWN0IGluIHRoZSBpc29sYXRlZCB0cmVlIGFuZCB1cGRhdGUKKyAgICAgICAgdGhl IGNoaWxkcmVuIGZvciB0aGF0LgorCisgICAgICAgIFRoaXMgd2FzIHRoZSBiZWhhdmlvciBiZWZv cmUgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNTM4OS4gV2UgbWFk ZSB0aGF0IGNoYW5nZSBiZWNhdXNlCisgICAgICAgIHdlIGJlbGlldmVkIHRoaXMgYmVoYXZpb3Ig d2FzIGNhdXNpbmcgYSBsb3Qgb2YgZnVsbC10cmVlIHJlLXJlbmRlcnMuIEhvd2V2ZXIsIGluIG15 IHRlc3Rpbmcgb24gbGFyZ2Ugd2VicGFnZXMKKyAgICAgICAgKGUuZy4geW91dHViZS5jb20sIGZh Y2Vib29rLmNvbSksIHRoaXMgZG9lc24ndCBzZWVtIHRvIGJlIHRoZSBjYXNlLCBhbmQgcGVyZm9y bWFuY2UgaXMgYWN0dWFsbHkgdmVyeSBnb29kLgorCisgICAgICAgICogYWNjZXNzaWJpbGl0eS9p c29sYXRlZHRyZWUvQVhJc29sYXRlZFRyZWUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6QVhJc29s YXRlZFRyZWU6OnVwZGF0ZUNoaWxkcmVuKToKKyAgICAgICAgKFdlYkNvcmU6OkFYSXNvbGF0ZWRU cmVlOjpub2RlQW5jZXN0cnlDaGFuZ2VzKToKKyAgICAgICAgRGVsZXRlZC4KKyAgICAgICAgKFdl YkNvcmU6OkFYSXNvbGF0ZWRUcmVlOjpub2RlQ2hhbmdlRm9yT2JqZWN0KToKKyAgICAgICAgUmVt b3ZlIHVwZGF0ZU5vZGVNYXAgcGFyYW1ldGVyLCBhcyB0aGUgbm93LWRlbGV0ZWQgbm9kZUFuY2Vz dHJ5Q2hhbmdlcworICAgICAgICB3YXMgdGhlIG9ubHkgdGhpbmcgdGhhdCBjYWxsZWQgaXQgd2l0 aCB0aGUgbm9uLWRlZmF1bHQgdmFsdWUgb2YgdHJ1ZS4KKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5 L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkVHJlZS5oOgorICAgICAgICAoV2ViQ29yZTo6QVhJc29s YXRlZFRyZWU6OnF1ZXVlQ2hhbmdlc0FuZFJlbW92YWxzKToKKwogMjAyMi0wMi0wOCAgQWxhbiBC dWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgW0xGQ11bSUZDXSBUYWtlIHdyaXRp bmcgZGlyZWN0aW9uIGludG8gYWNjb3VudCB3aGVuIGFwcGx5aW5nIFJlbmRlckJsb2NrRmxvdyBl bmQgcGFkZGluZyBxdWlyawpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0 eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZFRyZWUuY3BwIGIvU291cmNlL1dlYkNvcmUvYWNjZXNz aWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZFRyZWUuY3BwCmluZGV4IDViMDhlMmI3MDll MTUzNjQyNDM0N2NlNzFhZTQ0OWY4ZjBlMjkwYjYuLmRlYzdmNzUzMjE3NzY2MTllMGQxNWQ2M2Q1 MjVkMjI1ODUxNGNhMzMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkv aXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRUcmVlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nl c3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkVHJlZS5jcHAKQEAgLTIxMCw3ICsyMTAs NyBAQCBBWElEIEFYSXNvbGF0ZWRUcmVlOjpwYXJlbnRJREZvck9iamVjdChBWENvcmVPYmplY3Qm IGF4T2JqZWN0LCBBWElEIGFzc3VtZWRQYXJlbgogICAgIHJldHVybiBhc3N1bWVkUGFyZW50SUQ7 CiB9CiAKLUFYSXNvbGF0ZWRUcmVlOjpOb2RlQ2hhbmdlIEFYSXNvbGF0ZWRUcmVlOjpub2RlQ2hh bmdlRm9yT2JqZWN0KEFYQ29yZU9iamVjdCYgYXhPYmplY3QsIEFYSUQgcGFyZW50SUQsIGJvb2wg YXR0YWNoV3JhcHBlciwgYm9vbCB1cGRhdGVOb2RlTWFwKQorQVhJc29sYXRlZFRyZWU6Ok5vZGVD aGFuZ2UgQVhJc29sYXRlZFRyZWU6Om5vZGVDaGFuZ2VGb3JPYmplY3QoQVhDb3JlT2JqZWN0JiBh eE9iamVjdCwgQVhJRCBwYXJlbnRJRCwgYm9vbCBhdHRhY2hXcmFwcGVyKQogewogICAgIEFTU0VS VChpc01haW5UaHJlYWQoKSk7CiAKQEAgLTIzMSw4ICsyMzEsNyBAQCBBWElzb2xhdGVkVHJlZTo6 Tm9kZUNoYW5nZSBBWElzb2xhdGVkVHJlZTo6bm9kZUNoYW5nZUZvck9iamVjdChBWENvcmVPYmpl Y3QmIGF4TwogICAgICAgICBub2RlQ2hhbmdlLndyYXBwZXIgPSBheE9iamVjdC53cmFwcGVyKCk7 CiAgICAgfQogCi0gICAgaWYgKHVwZGF0ZU5vZGVNYXApCi0gICAgICAgIG1fbm9kZU1hcC5zZXQo YXhPYmplY3Qub2JqZWN0SUQoKSwgUGFyZW50Q2hpbGRyZW5JRHMgeyBwYXJlbnRJRCwgYXhPYmpl Y3QuY2hpbGRyZW5JRHMoKSB9KTsKKyAgICBtX25vZGVNYXAuc2V0KGF4T2JqZWN0Lm9iamVjdElE KCksIFBhcmVudENoaWxkcmVuSURzIHsgcGFyZW50SUQsIGF4T2JqZWN0LmNoaWxkcmVuSURzKCkg fSk7CiAKICAgICBpZiAoIXBhcmVudElELmlzVmFsaWQoKSkgewogICAgICAgICBMb2NrZXIgbG9j a2VyIHsgbV9jaGFuZ2VMb2dMb2NrIH07CkBAIC0zNDksNDAgKzM0OCw2IEBAIHZvaWQgQVhJc29s YXRlZFRyZWU6OnVwZGF0ZU5vZGVQcm9wZXJ0eShjb25zdCBBWENvcmVPYmplY3QmIGF4T2JqZWN0 LCBBWFByb3BlcnR5CiAgICAgbV9wZW5kaW5nUHJvcGVydHlDaGFuZ2VzLmFwcGVuZCh7IGF4T2Jq ZWN0Lm9iamVjdElEKCksIHByb3BlcnR5TWFwIH0pOwogfQogCi1WZWN0b3I8QVhJc29sYXRlZFRy ZWU6Ok5vZGVDaGFuZ2U+IEFYSXNvbGF0ZWRUcmVlOjpub2RlQW5jZXN0cnlDaGFuZ2VzKEFYQ29y ZU9iamVjdCYgYXhDb3JlT2JqZWN0LCBIYXNoU2V0PEFYSUQ+JiBpZHNCZWluZ0NoYW5nZWQpCi17 Ci0gICAgVmVjdG9yPE5vZGVDaGFuZ2U+IGNoYW5nZXM7Ci0KLSAgICBhdXRvKiBheE9iamVjdCA9 ICZheENvcmVPYmplY3Q7Ci0gICAgd2hpbGUgKGF4T2JqZWN0ICYmICFtX25vZGVNYXAuY29udGFp bnMoYXhPYmplY3QtPm9iamVjdElEKCkpKSB7Ci0gICAgICAgIC8vIGF4T2JqZWN0IGhhcyBubyBu b2RlIGluIHRoZSBpc29sYXRlZCB0cmVlLCB0aHVzIGFkZCBpdC4KLSAgICAgICAgQVhMT0coImF4 T2JqZWN0IG5vdCBpbiB0aGUgaXNvbGF0ZWQgdHJlZToiKTsKLSAgICAgICAgQVhMT0coYXhPYmpl Y3QpOwotICAgICAgICBhdXRvKiBheFBhcmVudCA9IGF4T2JqZWN0LT5wYXJlbnRPYmplY3RVbmln bm9yZWQoKTsKLSAgICAgICAgQVhMT0coImF4UGFyZW50OiIpOwotICAgICAgICBBWExPRyhheFBh cmVudCk7Ci0gICAgICAgIEFYSUQgYXhQYXJlbnRJRCA9IGF4UGFyZW50ID8gYXhQYXJlbnQtPm9i amVjdElEKCkgOiBBWElEKCk7Ci0KLSAgICAgICAgLy8gSWYgYXhPYmplY3QgaXMgdGhlIG9yaWdp bmFsIG9iamVjdCBmb3Igd2hpY2ggd2UgYXJlIGFkZGluZyBpdHMgYW5jZXN0cnksIGRvbid0IHVw ZGF0ZSB0aGUgbm9kZU1hcCBzaW5jZSB1cGRhdGVDaGlsZHJlbiBuZWVkcyB0byBjb21wYXJlIGl0 cyBwcmV2aW91cyBjaGlsZHJlbiB3aXRoIHRoZSBuZXcgb25lcy4KLSAgICAgICAgYm9vbCB1cGRh dGVOb2RlTWFwID0gYXhPYmplY3QgIT0gJmF4Q29yZU9iamVjdDsKLSAgICAgICAgYXV0byBjaGFu Z2UgPSBub2RlQ2hhbmdlRm9yT2JqZWN0KCpheE9iamVjdCwgYXhQYXJlbnRJRCwgdHJ1ZSwgdXBk YXRlTm9kZU1hcCk7Ci0gICAgICAgIGlkc0JlaW5nQ2hhbmdlZC5hZGQoY2hhbmdlLmlzb2xhdGVk T2JqZWN0LT5vYmplY3RJRCgpKTsKLSAgICAgICAgY2hhbmdlcy5hcHBlbmQoV1RGTW92ZShjaGFu Z2UpKTsKLQotICAgICAgICBpZiAoYXhQYXJlbnQgJiYgbV9ub2RlTWFwLmNvbnRhaW5zKGF4UGFy ZW50LT5vYmplY3RJRCgpKSkgewotICAgICAgICAgICAgYXV0byBpZHMgPSBtX25vZGVNYXAuZ2V0 KGF4UGFyZW50LT5vYmplY3RJRCgpKTsKLSAgICAgICAgICAgIGlkcy5jaGlsZHJlbklEcyA9IGF4 UGFyZW50LT5jaGlsZHJlbklEcygpOwotICAgICAgICAgICAgbV9ub2RlTWFwLnNldChheFBhcmVu dC0+b2JqZWN0SUQoKSwgV1RGTW92ZShpZHMpKTsKLSAgICAgICAgfQotCi0gICAgICAgIGF4T2Jq ZWN0ID0gYXhQYXJlbnQ7Ci0gICAgfQotCi0gICAgLy8gU2luY2UgdGhlIE5vZGVDaGFuZ2VzIGFy ZSBhZGRlZCB0byB0aGUgY2hhbmdlcyB2ZWN0b3IgaW4gYSBjaGlsZCAtPiBwYXJlbnQgdHJhdmVy c2FsIGluc3RlYWQgb2YgYSBwYXJlbnQgLT4gY2hpbGQgdHJhdmVyc2FsLCB3ZSBuZWVkIHRvIHJl dmVyc2UgY2hhbmdlcy4KLSAgICBjaGFuZ2VzLnJldmVyc2UoKTsKLSAgICByZXR1cm4gY2hhbmdl czsKLX0KLQogdm9pZCBBWElzb2xhdGVkVHJlZTo6dXBkYXRlQ2hpbGRyZW4oQVhDb3JlT2JqZWN0 JiBheE9iamVjdCkKIHsKICAgICBBWFRSQUNFKCJBWElzb2xhdGVkVHJlZTo6dXBkYXRlQ2hpbGRy ZW4iKTsKQEAgLTM5OCwyMCArMzYzLDM3IEBAIHZvaWQgQVhJc29sYXRlZFRyZWU6OnVwZGF0ZUNo aWxkcmVuKEFYQ29yZU9iamVjdCYgYXhPYmplY3QpCiAgICAgaWYgKCFheE9iamVjdC5kb2N1bWVu dCgpIHx8ICFheE9iamVjdC5kb2N1bWVudCgpLT5oYXNMaXZpbmdSZW5kZXJUcmVlKCkpCiAgICAg ICAgIHJldHVybjsKIAotICAgIEhhc2hTZXQ8QVhJRD4gaWRzQmVpbmdDaGFuZ2VkOwogICAgIC8v IHVwZGF0ZUNoaWxkcmVuIG1heSBiZSBjYWxsZWQgYXMgdGhlIHJlc3VsdCBvZiBhIGNoaWxkcmVu IGNoYW5nZWQKICAgICAvLyBub3RpZmljYXRpb24gZm9yIGFuIGF4T2JqZWN0IHRoYXQgaGFzIG5v IGFzc29jaWF0ZWQgaXNvbGF0ZWQgb2JqZWN0LgogICAgIC8vIEFuIGV4YW1wbGUgb2YgdGhpcyBp cyB3aGVuIGFuIGVtcHR5IGVsZW1lbnQgc3VjaCBhcyBhIDxjYW52YXM+IG9yIDxkaXY+Ci0gICAg Ly8gaXMgYWRkZWQgYSBuZXcgY2hpbGQuIFRodXMgYWRkIHRoZSBhbmNlc3RyeSB0aGF0IGNvbm5l Y3RzIHRoZSBhc3NvY2lhdGVkCi0gICAgLy8gaXNvbGF0ZWQgb2JqZWN0IHRvIHRoZSBjbG9zZXN0 IGV4aXN0aW5nIGFuY2VzdG9yLgotICAgIFZlY3RvcjxOb2RlQ2hhbmdlPiBjaGFuZ2VzID0gbm9k ZUFuY2VzdHJ5Q2hhbmdlcyhheE9iamVjdCwgaWRzQmVpbmdDaGFuZ2VkKTsKKyAgICAvLyBoYXMg YWRkZWQgYSBuZXcgY2hpbGQuIFNvIGZpbmQgdGhlIGNsb3Nlc3QgYW5jZXN0b3Igb2YgYXhPYmpl Y3QgdGhhdCBoYXMKKyAgICAvLyBhbiBhc3NvY2lhdGVkIGlzb2xhdGVkIG9iamVjdCBhbmQgdXBk YXRlIGl0cyBjaGlsZHJlbi4KKyAgICBhdXRvKiBheEFuY2VzdG9yID0gQWNjZXNzaWJpbGl0eTo6 ZmluZEFuY2VzdG9yKGF4T2JqZWN0LCB0cnVlLCBbdGhpc10gKGF1dG8mIGFuY2VzdG9yKSB7Cisg ICAgICAgIHJldHVybiBtX25vZGVNYXAuZmluZChhbmNlc3Rvci5vYmplY3RJRCgpKSAhPSBtX25v ZGVNYXAuZW5kKCk7CisgICAgfSk7CisKKyAgICBpZiAoIWF4QW5jZXN0b3IgfHwgIWF4QW5jZXN0 b3ItPm9iamVjdElEKCkuaXNWYWxpZCgpKSB7CisgICAgICAgIC8vIFRoaXMgdXBkYXRlIHdhcyB0 cmlnZ2VyZWQgYmVmb3JlIHRoZSBpc29sYXRlZCB0cmVlIGhhcyBiZWVuIHJlcG9wdWxhdGVkLgor ICAgICAgICAvLyBSZXR1cm4gaGVyZSBzaW5jZSB0aGVyZSBpcyBub3RoaW5nIHRvIHVwZGF0ZS4K KyAgICAgICAgQVhMT0coIkJhaWxpbmcgYmVjYXVzZSBubyBhbmNlc3RvciBjb3VsZCBiZSBmb3Vu ZCwgb3IgYW5jZXN0b3IgaGFkIGFuIGludmFsaWQgb2JqZWN0SUQiKTsKKyAgICAgICAgcmV0dXJu OworICAgIH0KIAotICAgIGF1dG8gb2xkSURzID0gbV9ub2RlTWFwLmdldChheE9iamVjdC5vYmpl Y3RJRCgpKTsKKyNpZm5kZWYgTkRFQlVHCisgICAgaWYgKGF4QW5jZXN0b3IgIT0gYXhPYmplY3Qp IHsKKyAgICAgICAgQVhMT0cobWFrZVN0cmluZygiT3JpZ2luYWwgb2JqZWN0IHdpdGggSUQgIiwg YXhPYmplY3Qub2JqZWN0SUQoKS5sb2dnaW5nU3RyaW5nKCksICIgd2Fzbid0IGluIHRoZSBpc29s YXRlZCB0cmVlLCBzbyBpbnN0ZWFkIHVwZGF0aW5nIHRoZSBjbG9zZXN0IGluLWlzb2xhdGVkLXRy ZWUgYW5jZXN0b3I6Iik7CisgICAgICAgIEFYTE9HKGF4QW5jZXN0b3IpOworICAgIH0KKyNlbmRp ZgorCisgICAgYXV0byBvbGRJRHMgPSBtX25vZGVNYXAuZ2V0KGF4QW5jZXN0b3ItPm9iamVjdElE KCkpOwogICAgIGF1dG8mIG9sZENoaWxkcmVuSURzID0gb2xkSURzLmNoaWxkcmVuSURzOwogCi0g ICAgY29uc3QgYXV0byYgbmV3Q2hpbGRyZW4gPSBheE9iamVjdC5jaGlsZHJlbigpOwotICAgIGF1 dG8gbmV3Q2hpbGRyZW5JRHMgPSBheE9iamVjdC5jaGlsZHJlbklEcyhmYWxzZSk7CisgICAgY29u c3QgYXV0byYgbmV3Q2hpbGRyZW4gPSBheEFuY2VzdG9yLT5jaGlsZHJlbigpOworICAgIGF1dG8g bmV3Q2hpbGRyZW5JRHMgPSBheEFuY2VzdG9yLT5jaGlsZHJlbklEcyhmYWxzZSk7CiAKKyAgICBW ZWN0b3I8Tm9kZUNoYW5nZT4gY2hhbmdlczsKKyAgICBIYXNoU2V0PEFYSUQ+IGlkc0JlaW5nQ2hh bmdlZDsKICAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IG5ld0NoaWxkcmVuLnNpemUoKTsgKytp KSB7CiAgICAgICAgIEFTU0VSVChuZXdDaGlsZHJlbltpXS0+b2JqZWN0SUQoKSA9PSBuZXdDaGls ZHJlbklEc1tpXSk7CiAgICAgICAgIEFTU0VSVChuZXdDaGlsZHJlbklEc1tpXS5pc1ZhbGlkKCkp OwpAQCAtNDIwLDE0ICs0MDIsMTQgQEAgdm9pZCBBWElzb2xhdGVkVHJlZTo6dXBkYXRlQ2hpbGRy ZW4oQVhDb3JlT2JqZWN0JiBheE9iamVjdCkKICAgICAgICAgICAgIG9sZENoaWxkcmVuSURzLnJl bW92ZShpbmRleCk7CiAgICAgICAgIGVsc2UgewogICAgICAgICAgICAgLy8gVGhpcyBpcyBhIG5l dyBjaGlsZCwgYWRkIGl0IHRvIHRoZSB0cmVlLgotICAgICAgICAgICAgQVhMT0cobWFrZVN0cmlu ZygiQVhJRCAiLCBheE9iamVjdC5vYmplY3RJRCgpLmxvZ2dpbmdTdHJpbmcoKSwgIiBnYWluaW5n IG5ldyBzdWJ0cmVlLCBzdGFydGluZyBhdCBJRCAiLCBuZXdDaGlsZHJlbltpXS0+b2JqZWN0SUQo KS5sb2dnaW5nU3RyaW5nKCksICI6IikpOworICAgICAgICAgICAgQVhMT0cobWFrZVN0cmluZygi QVhJRCAiLCBheEFuY2VzdG9yLT5vYmplY3RJRCgpLmxvZ2dpbmdTdHJpbmcoKSwgIiBnYWluaW5n IG5ldyBzdWJ0cmVlLCBzdGFydGluZyBhdCBJRCAiLCBuZXdDaGlsZHJlbltpXS0+b2JqZWN0SUQo KS5sb2dnaW5nU3RyaW5nKCksICI6IikpOwogICAgICAgICAgICAgQVhMT0cobmV3Q2hpbGRyZW5b aV0pOwotICAgICAgICAgICAgY29sbGVjdE5vZGVDaGFuZ2VzRm9yU3VidHJlZSgqbmV3Q2hpbGRy ZW5baV0sIGF4T2JqZWN0Lm9iamVjdElEKCksIHRydWUsIGNoYW5nZXMsICZpZHNCZWluZ0NoYW5n ZWQpOworICAgICAgICAgICAgY29sbGVjdE5vZGVDaGFuZ2VzRm9yU3VidHJlZSgqbmV3Q2hpbGRy ZW5baV0sIGF4QW5jZXN0b3ItPm9iamVjdElEKCksIHRydWUsIGNoYW5nZXMsICZpZHNCZWluZ0No YW5nZWQpOwogICAgICAgICB9CiAgICAgfQotICAgIG1fbm9kZU1hcC5zZXQoYXhPYmplY3Qub2Jq ZWN0SUQoKSwgUGFyZW50Q2hpbGRyZW5JRHMgeyBvbGRJRHMucGFyZW50SUQsIG5ld0NoaWxkcmVu SURzIH0pOworICAgIG1fbm9kZU1hcC5zZXQoYXhBbmNlc3Rvci0+b2JqZWN0SUQoKSwgUGFyZW50 Q2hpbGRyZW5JRHMgeyBvbGRJRHMucGFyZW50SUQsIG5ld0NoaWxkcmVuSURzIH0pOwogCi0gICAg Ly8gV2hhdCBpcyBsZWZ0IGluIG9sZENoaWxkcmVuSURzIGFyZSB0aGUgSURzIHRoYXQgYXJlIG5v IGxvbmdlciBjaGlsZHJlbiBvZiBheE9iamVjdC4KKyAgICAvLyBXaGF0IGlzIGxlZnQgaW4gb2xk Q2hpbGRyZW5JRHMgYXJlIHRoZSBJRHMgdGhhdCBhcmUgbm8gbG9uZ2VyIGNoaWxkcmVuIG9mIGF4 QW5jZXN0b3IuCiAgICAgLy8gVGh1cywgcmVtb3ZlIHRoZW0gZnJvbSBtX25vZGVNYXAgYW5kIHF1 ZXVlIHRoZW0gdG8gYmUgcmVtb3ZlZCBmcm9tIHRoZSB0cmVlLgogICAgIGZvciAoQVhJRCYgYXhJ RCA6IG9sZENoaWxkcmVuSURzKSB7CiAgICAgICAgIC8vIEhvd2V2ZXIsIHdlIGRvbid0IHdhbnQg dG8gcmVtb3ZlIHN1YnRyZWVzIGZyb20gdGhlIG5vZGVtYXAgdGhhdCBhcmUgcGFydCBvZiB0aGUg dG8tYmUtcXVldWVkIG5vZGUgY2hhbmdlcyAoaS5lIHRob3NlIGluIGBpZHNCZWluZ0NoYW5nZWRg KS4KQEAgLTQzNSw3ICs0MTcsNyBAQCB2b2lkIEFYSXNvbGF0ZWRUcmVlOjp1cGRhdGVDaGlsZHJl bihBWENvcmVPYmplY3QmIGF4T2JqZWN0KQogICAgICAgICAvLyAgIDEuIE9iamVjdCAxMjMgaXMg c2xhdGVkIHRvIGJlIGEgY2hpbGQgb2YgdGhpcyBvYmplY3QgKGkuZS4gaW4gbmV3Q2hpbGRyZW4p LCBhbmQgd2UgY29sbGVjdCBub2RlIGNoYW5nZXMgZm9yIGl0LgogICAgICAgICAvLyAgIDIuIE9i amVjdCAxMjMgaXMgY3VycmVudGx5IGEgbWVtYmVyIG9mIGEgc3VidHJlZSBvZiBzb21lIG90aGVy IG9iamVjdCBpbiBvbGRDaGlsZHJlbklEcy4KICAgICAgICAgLy8gICAzLiBUaHVzLCB3ZSBkb24n dCB3YW50IHRvIGRlbGV0ZSBPYmplY3QgMTIzIGZyb20gdGhlIG5vZGVtYXAsIGluc3RlYWQgYWxs b3dpbmcgaXQgdG8gYmUgbW92ZWQuCi0gICAgICAgIHJlbW92ZVN1YnRyZWVGcm9tTm9kZU1hcChh eElELCAmYXhPYmplY3QsIGlkc0JlaW5nQ2hhbmdlZCk7CisgICAgICAgIHJlbW92ZVN1YnRyZWVG cm9tTm9kZU1hcChheElELCBheEFuY2VzdG9yLCBpZHNCZWluZ0NoYW5nZWQpOwogICAgIH0KICAg ICBxdWV1ZUNoYW5nZXNBbmRSZW1vdmFscyhjaGFuZ2VzLCBvbGRDaGlsZHJlbklEcyk7CiB9CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElz b2xhdGVkVHJlZS5oIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUv QVhJc29sYXRlZFRyZWUuaAppbmRleCA3Nzc1NmM1NzcyMjc4MjU0ZDk3YzYxMzNkZTI0ZjVlM2M0 ZDI0Njg4Li5iZDJjYTcyYTY0OWFmN2U1YzY3MmQ0MmUzNmQzM2FkNzhkYzFmNTVkIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVk VHJlZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FY SXNvbGF0ZWRUcmVlLmgKQEAgLTM4NywxMSArMzg3LDEwIEBAIHByaXZhdGU6CiAgICAgLy8gTWV0 aG9kcyBpbiB0aGlzIGJsb2NrIGFyZSBjYWxsZWQgb24gdGhlIG1haW4gdGhyZWFkLgogICAgIC8v IENvbXB1dGVzIHRoZSBwYXJlbnQgSUQgb2YgdGhlIGdpdmVuIG9iamVjdCwgd2hpY2ggaXMgZ2Vu ZXJhbGx5IHRoZSAiYXNzdW1lZCIgcGFyZW50IElEIChidXQgbm90IGFsd2F5cywgbGlrZSBpbiB0 aGUgY2FzZSBvZiB0YWJsZXMpLgogICAgIEFYSUQgcGFyZW50SURGb3JPYmplY3QoQVhDb3JlT2Jq ZWN0JiwgQVhJRCBhc3N1bWVkUGFyZW50SUQpOwotICAgIE5vZGVDaGFuZ2Ugbm9kZUNoYW5nZUZv ck9iamVjdChBWENvcmVPYmplY3QmLCBBWElEIHBhcmVudElELCBib29sIGF0dGFjaFdyYXBwZXIg PSB0cnVlLCBib29sIHVwZGF0ZU5vZGVNYXAgPSB0cnVlKTsKKyAgICBOb2RlQ2hhbmdlIG5vZGVD aGFuZ2VGb3JPYmplY3QoQVhDb3JlT2JqZWN0JiwgQVhJRCBwYXJlbnRJRCwgYm9vbCBhdHRhY2hX cmFwcGVyID0gdHJ1ZSk7CiAgICAgdm9pZCBjb2xsZWN0Tm9kZUNoYW5nZXNGb3JTdWJ0cmVlKEFY Q29yZU9iamVjdCYsIEFYSUQgcGFyZW50SUQsIGJvb2wgYXR0YWNoV3JhcHBlciwgVmVjdG9yPE5v ZGVDaGFuZ2U+JiwgSGFzaFNldDxBWElEPiogPSBudWxscHRyKTsKICAgICB2b2lkIHF1ZXVlQ2hh bmdlKGNvbnN0IE5vZGVDaGFuZ2UmKSBXVEZfUkVRVUlSRVNfTE9DSyhtX2NoYW5nZUxvZ0xvY2sp OwogICAgIHZvaWQgcXVldWVDaGFuZ2VzQW5kUmVtb3ZhbHMoY29uc3QgVmVjdG9yPE5vZGVDaGFu Z2U+JiwgY29uc3QgVmVjdG9yPEFYSUQ+JiA9IHsgfSk7Ci0gICAgVmVjdG9yPE5vZGVDaGFuZ2U+ IG5vZGVBbmNlc3RyeUNoYW5nZXMoQVhDb3JlT2JqZWN0JiwgSGFzaFNldDxBWElEPiYpOwogCiAg ICAgQVhJc29sYXRlZFRyZWVJRCBtX3RyZWVJRDsKICAgICBBWE9iamVjdENhY2hlKiBtX2F4T2Jq ZWN0Q2FjaGUgeyBudWxscHRyIH07Cg== 451477 2022-02-09 18:30:48 -0800 2022-02-10 08:37:56 -0800 Patch bug-236414-20220209203047.patch text/plain 11254 tyler_w U3VidmVyc2lvbiBSZXZpc2lvbjogMjg5Mzc1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTU5MjdjMjdhYmQ0MzI3 MDE0ZjU5YTdiNzUzNDk5NmM1ZTBlZTg1Ni4uMmE1ZTBkNjFjMDVmMDgxZWM4YTIzYTZkMTVjMDJj NGUzMzlmNTI2YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM3IEBACisyMDIyLTAyLTA5ICBUeWxl ciBXaWxjb2NrICA8dHlsZXJfd0BhcHBsZS5jb20+CisKKyAgICAgICAgQVhJc29sYXRlZFRyZWU6 OnVwZGF0ZUNoaWxkcmVuIGFuZCBBWElzb2xhdGVkVHJlZTo6bm9kZUFuY2VzdHJ5Q2hhbmdlcyBy ZXN1bHRzIGluIGFkZGluZyBpbmNvcnJlY3Qgbm9kZXMgdG8gdGhlIGlzb2xhdGVkIHRyZWUKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNjQxNAorCisg ICAgICAgIFJldmlld2VkIGJ5IEFuZHJlcyBHb256YWxlei4KKworICAgICAgICBTb21ldGltZXMg QVhJc29sYXRlZFRyZWU6OnVwZGF0ZUNoaWxkcmVuIGlzIGNhbGxlZCB3aXRoIGFuIG9iamVjdCB0 aGF0IGlzCisgICAgICAgIG5vdCBpbiB0aGUgaXNvbGF0ZWQgdHJlZS4gV2hlbiB0aGlzIGhhcHBl bnMsIHdlIGN1cnJlbnRseSBjYWxsIEFYSXNvbGF0ZWRUcmVlOjpub2RlQW5jZXN0cnlDaGFuZ2Vz CisgICAgICAgIHRvIGJ1aWxkIHRoZSBhbmNlc3RyeSBjaGFpbiB1cCB0byB0aGUgbmVhcmVzdCBp bi1pc29sYXRlZC10cmVlIG5vZGUgKHN0YXJ0aW5nIHdpdGggdGhlIG9yaWdpbmFsCisgICAgICAg IG9iamVjdCBjYWxsZWQgZm9yIHVwZGF0ZUNoaWxkcmVuKS4KKworICAgICAgICBIb3dldmVyLCB0 aGlzIHNlZW1zIHRvIHJlc3VsdCBpbiBhZGRpbmcgbm9kZXMgdG8gdGhlIGlzb2xhdGVkIHRyZWUg dGhhdCBkb24ndCBleGlzdCBpbiB0aGUgbGl2ZSB0cmVlLgorICAgICAgICBJIGJlbGlldmUgdGhp cyBhbHNvIGNhdXNlcyBpc29sYXRlZCBvYmplY3RzIHRvIG9mdGVuIGhvbGQgcmVmZXJlbmNlcyB0 byBwYXJlbnQgb2JqZWN0cyB0aGF0IGRvbid0IGV4aXN0CisgICAgICAgIGluIHRoZSBpc29sYXRl ZCB0cmVlLCBicmVha2luZyBvYmplY3Qgc2VhcmNoZXMgKGFuZCBtb3JlKS4KKworICAgICAgICBX aXRoIHRoaXMgcGF0Y2gsIHdoZW4gQVhJc29sYXRlZFRyZWU6OnVwZGF0ZUNoaWxkcmVuIGlzIGNh bGxlZCB3aXRoIGFuIG9iamVjdCB0aGF0IGhhcyBubyBpc29sYXRlZCB0cmVlCisgICAgICAgIGVx dWl2YWxlbnQsIHdlIHRyYXZlcnNlIHVwIHRoZSBvYmplY3QncyBhbmNlc3RyeSB1bnRpbCB3ZSBm aW5kIGFuIG9iamVjdCBpbiB0aGUgaXNvbGF0ZWQgdHJlZSBhbmQgdXBkYXRlCisgICAgICAgIHRo ZSBjaGlsZHJlbiBmb3IgdGhhdC4KKworICAgICAgICBUaGlzIHdhcyB0aGUgYmVoYXZpb3IgYmVm b3JlIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzUzODkuIFdlIG1h ZGUgdGhhdCBjaGFuZ2UgYmVjYXVzZQorICAgICAgICB3ZSBiZWxpZXZlZCB0aGlzIGJlaGF2aW9y IHdhcyBjYXVzaW5nIGEgbG90IG9mIGZ1bGwtdHJlZSByZS1yZW5kZXJzLiBIb3dldmVyLCBpbiBt eSB0ZXN0aW5nIG9uIGxhcmdlIHdlYnBhZ2VzCisgICAgICAgIChlLmcuIHlvdXR1YmUuY29tLCBm YWNlYm9vay5jb20pLCB0aGlzIGRvZXNuJ3Qgc2VlbSB0byBiZSB0aGUgY2FzZSwgYW5kIHBlcmZv cm1hbmNlIGlzIGFjdHVhbGx5IHZlcnkgZ29vZC4KKworICAgICAgICAqIGFjY2Vzc2liaWxpdHkv aXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRUcmVlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkFYSXNv bGF0ZWRUcmVlOjp1cGRhdGVDaGlsZHJlbik6CisgICAgICAgIChXZWJDb3JlOjpBWElzb2xhdGVk VHJlZTo6bm9kZUFuY2VzdHJ5Q2hhbmdlcyk6CisgICAgICAgIERlbGV0ZWQuCisgICAgICAgIChX ZWJDb3JlOjpBWElzb2xhdGVkVHJlZTo6bm9kZUNoYW5nZUZvck9iamVjdCk6CisgICAgICAgIFJl bW92ZSB1cGRhdGVOb2RlTWFwIHBhcmFtZXRlciwgYXMgdGhlIG5vdy1kZWxldGVkIG5vZGVBbmNl c3RyeUNoYW5nZXMKKyAgICAgICAgd2FzIHRoZSBvbmx5IHRoaW5nIHRoYXQgY2FsbGVkIGl0IHdp dGggdGhlIG5vbi1kZWZhdWx0IHZhbHVlIG9mIHRydWUuCisgICAgICAgICogYWNjZXNzaWJpbGl0 eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZFRyZWUuaDoKKyAgICAgICAgKFdlYkNvcmU6OkFYSXNv bGF0ZWRUcmVlOjpxdWV1ZUNoYW5nZXNBbmRSZW1vdmFscyk6CisKIDIwMjItMDItMDggIEFsYW4g QnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtMRkNdW0lGQ10gVGFrZSB3cml0 aW5nIGRpcmVjdGlvbiBpbnRvIGFjY291bnQgd2hlbiBhcHBseWluZyBSZW5kZXJCbG9ja0Zsb3cg ZW5kIHBhZGRpbmcgcXVpcmsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxp dHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRUcmVlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vz c2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRUcmVlLmNwcAppbmRleCA1YjA4ZTJiNzA5 ZTE1MzY0MjQzNDdjZTcxYWU0NDlmOGYwZTI5MGI2Li43ZmMxNzlhNjEzNjQxMjhhMzJiMzNkMjVi YTk1M2FjNDliNWQ2MzM0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5 L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkVHJlZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYWNj ZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZFRyZWUuY3BwCkBAIC0yMTAsNyArMjEw LDcgQEAgQVhJRCBBWElzb2xhdGVkVHJlZTo6cGFyZW50SURGb3JPYmplY3QoQVhDb3JlT2JqZWN0 JiBheE9iamVjdCwgQVhJRCBhc3N1bWVkUGFyZW4KICAgICByZXR1cm4gYXNzdW1lZFBhcmVudElE OwogfQogCi1BWElzb2xhdGVkVHJlZTo6Tm9kZUNoYW5nZSBBWElzb2xhdGVkVHJlZTo6bm9kZUNo YW5nZUZvck9iamVjdChBWENvcmVPYmplY3QmIGF4T2JqZWN0LCBBWElEIHBhcmVudElELCBib29s IGF0dGFjaFdyYXBwZXIsIGJvb2wgdXBkYXRlTm9kZU1hcCkKK0FYSXNvbGF0ZWRUcmVlOjpOb2Rl Q2hhbmdlIEFYSXNvbGF0ZWRUcmVlOjpub2RlQ2hhbmdlRm9yT2JqZWN0KEFYQ29yZU9iamVjdCYg YXhPYmplY3QsIEFYSUQgcGFyZW50SUQsIGJvb2wgYXR0YWNoV3JhcHBlcikKIHsKICAgICBBU1NF UlQoaXNNYWluVGhyZWFkKCkpOwogCkBAIC0yMzEsOCArMjMxLDcgQEAgQVhJc29sYXRlZFRyZWU6 Ok5vZGVDaGFuZ2UgQVhJc29sYXRlZFRyZWU6Om5vZGVDaGFuZ2VGb3JPYmplY3QoQVhDb3JlT2Jq ZWN0JiBheE8KICAgICAgICAgbm9kZUNoYW5nZS53cmFwcGVyID0gYXhPYmplY3Qud3JhcHBlcigp OwogICAgIH0KIAotICAgIGlmICh1cGRhdGVOb2RlTWFwKQotICAgICAgICBtX25vZGVNYXAuc2V0 KGF4T2JqZWN0Lm9iamVjdElEKCksIFBhcmVudENoaWxkcmVuSURzIHsgcGFyZW50SUQsIGF4T2Jq ZWN0LmNoaWxkcmVuSURzKCkgfSk7CisgICAgbV9ub2RlTWFwLnNldChheE9iamVjdC5vYmplY3RJ RCgpLCBQYXJlbnRDaGlsZHJlbklEcyB7IHBhcmVudElELCBheE9iamVjdC5jaGlsZHJlbklEcygp IH0pOwogCiAgICAgaWYgKCFwYXJlbnRJRC5pc1ZhbGlkKCkpIHsKICAgICAgICAgTG9ja2VyIGxv Y2tlciB7IG1fY2hhbmdlTG9nTG9jayB9OwpAQCAtMzQ5LDQwICszNDgsNiBAQCB2b2lkIEFYSXNv bGF0ZWRUcmVlOjp1cGRhdGVOb2RlUHJvcGVydHkoY29uc3QgQVhDb3JlT2JqZWN0JiBheE9iamVj dCwgQVhQcm9wZXJ0eQogICAgIG1fcGVuZGluZ1Byb3BlcnR5Q2hhbmdlcy5hcHBlbmQoeyBheE9i amVjdC5vYmplY3RJRCgpLCBwcm9wZXJ0eU1hcCB9KTsKIH0KIAotVmVjdG9yPEFYSXNvbGF0ZWRU cmVlOjpOb2RlQ2hhbmdlPiBBWElzb2xhdGVkVHJlZTo6bm9kZUFuY2VzdHJ5Q2hhbmdlcyhBWENv cmVPYmplY3QmIGF4Q29yZU9iamVjdCwgSGFzaFNldDxBWElEPiYgaWRzQmVpbmdDaGFuZ2VkKQot ewotICAgIFZlY3RvcjxOb2RlQ2hhbmdlPiBjaGFuZ2VzOwotCi0gICAgYXV0byogYXhPYmplY3Qg PSAmYXhDb3JlT2JqZWN0OwotICAgIHdoaWxlIChheE9iamVjdCAmJiAhbV9ub2RlTWFwLmNvbnRh aW5zKGF4T2JqZWN0LT5vYmplY3RJRCgpKSkgewotICAgICAgICAvLyBheE9iamVjdCBoYXMgbm8g bm9kZSBpbiB0aGUgaXNvbGF0ZWQgdHJlZSwgdGh1cyBhZGQgaXQuCi0gICAgICAgIEFYTE9HKCJh eE9iamVjdCBub3QgaW4gdGhlIGlzb2xhdGVkIHRyZWU6Iik7Ci0gICAgICAgIEFYTE9HKGF4T2Jq ZWN0KTsKLSAgICAgICAgYXV0byogYXhQYXJlbnQgPSBheE9iamVjdC0+cGFyZW50T2JqZWN0VW5p Z25vcmVkKCk7Ci0gICAgICAgIEFYTE9HKCJheFBhcmVudDoiKTsKLSAgICAgICAgQVhMT0coYXhQ YXJlbnQpOwotICAgICAgICBBWElEIGF4UGFyZW50SUQgPSBheFBhcmVudCA/IGF4UGFyZW50LT5v YmplY3RJRCgpIDogQVhJRCgpOwotCi0gICAgICAgIC8vIElmIGF4T2JqZWN0IGlzIHRoZSBvcmln aW5hbCBvYmplY3QgZm9yIHdoaWNoIHdlIGFyZSBhZGRpbmcgaXRzIGFuY2VzdHJ5LCBkb24ndCB1 cGRhdGUgdGhlIG5vZGVNYXAgc2luY2UgdXBkYXRlQ2hpbGRyZW4gbmVlZHMgdG8gY29tcGFyZSBp dHMgcHJldmlvdXMgY2hpbGRyZW4gd2l0aCB0aGUgbmV3IG9uZXMuCi0gICAgICAgIGJvb2wgdXBk YXRlTm9kZU1hcCA9IGF4T2JqZWN0ICE9ICZheENvcmVPYmplY3Q7Ci0gICAgICAgIGF1dG8gY2hh bmdlID0gbm9kZUNoYW5nZUZvck9iamVjdCgqYXhPYmplY3QsIGF4UGFyZW50SUQsIHRydWUsIHVw ZGF0ZU5vZGVNYXApOwotICAgICAgICBpZHNCZWluZ0NoYW5nZWQuYWRkKGNoYW5nZS5pc29sYXRl ZE9iamVjdC0+b2JqZWN0SUQoKSk7Ci0gICAgICAgIGNoYW5nZXMuYXBwZW5kKFdURk1vdmUoY2hh bmdlKSk7Ci0KLSAgICAgICAgaWYgKGF4UGFyZW50ICYmIG1fbm9kZU1hcC5jb250YWlucyhheFBh cmVudC0+b2JqZWN0SUQoKSkpIHsKLSAgICAgICAgICAgIGF1dG8gaWRzID0gbV9ub2RlTWFwLmdl dChheFBhcmVudC0+b2JqZWN0SUQoKSk7Ci0gICAgICAgICAgICBpZHMuY2hpbGRyZW5JRHMgPSBh eFBhcmVudC0+Y2hpbGRyZW5JRHMoKTsKLSAgICAgICAgICAgIG1fbm9kZU1hcC5zZXQoYXhQYXJl bnQtPm9iamVjdElEKCksIFdURk1vdmUoaWRzKSk7Ci0gICAgICAgIH0KLQotICAgICAgICBheE9i amVjdCA9IGF4UGFyZW50OwotICAgIH0KLQotICAgIC8vIFNpbmNlIHRoZSBOb2RlQ2hhbmdlcyBh cmUgYWRkZWQgdG8gdGhlIGNoYW5nZXMgdmVjdG9yIGluIGEgY2hpbGQgLT4gcGFyZW50IHRyYXZl cnNhbCBpbnN0ZWFkIG9mIGEgcGFyZW50IC0+IGNoaWxkIHRyYXZlcnNhbCwgd2UgbmVlZCB0byBy ZXZlcnNlIGNoYW5nZXMuCi0gICAgY2hhbmdlcy5yZXZlcnNlKCk7Ci0gICAgcmV0dXJuIGNoYW5n ZXM7Ci19Ci0KIHZvaWQgQVhJc29sYXRlZFRyZWU6OnVwZGF0ZUNoaWxkcmVuKEFYQ29yZU9iamVj dCYgYXhPYmplY3QpCiB7CiAgICAgQVhUUkFDRSgiQVhJc29sYXRlZFRyZWU6OnVwZGF0ZUNoaWxk cmVuIik7CkBAIC0zOTgsMjAgKzM2MywzNyBAQCB2b2lkIEFYSXNvbGF0ZWRUcmVlOjp1cGRhdGVD aGlsZHJlbihBWENvcmVPYmplY3QmIGF4T2JqZWN0KQogICAgIGlmICghYXhPYmplY3QuZG9jdW1l bnQoKSB8fCAhYXhPYmplY3QuZG9jdW1lbnQoKS0+aGFzTGl2aW5nUmVuZGVyVHJlZSgpKQogICAg ICAgICByZXR1cm47CiAKLSAgICBIYXNoU2V0PEFYSUQ+IGlkc0JlaW5nQ2hhbmdlZDsKICAgICAv LyB1cGRhdGVDaGlsZHJlbiBtYXkgYmUgY2FsbGVkIGFzIHRoZSByZXN1bHQgb2YgYSBjaGlsZHJl biBjaGFuZ2VkCiAgICAgLy8gbm90aWZpY2F0aW9uIGZvciBhbiBheE9iamVjdCB0aGF0IGhhcyBu byBhc3NvY2lhdGVkIGlzb2xhdGVkIG9iamVjdC4KICAgICAvLyBBbiBleGFtcGxlIG9mIHRoaXMg aXMgd2hlbiBhbiBlbXB0eSBlbGVtZW50IHN1Y2ggYXMgYSA8Y2FudmFzPiBvciA8ZGl2PgotICAg IC8vIGlzIGFkZGVkIGEgbmV3IGNoaWxkLiBUaHVzIGFkZCB0aGUgYW5jZXN0cnkgdGhhdCBjb25u ZWN0cyB0aGUgYXNzb2NpYXRlZAotICAgIC8vIGlzb2xhdGVkIG9iamVjdCB0byB0aGUgY2xvc2Vz dCBleGlzdGluZyBhbmNlc3Rvci4KLSAgICBWZWN0b3I8Tm9kZUNoYW5nZT4gY2hhbmdlcyA9IG5v ZGVBbmNlc3RyeUNoYW5nZXMoYXhPYmplY3QsIGlkc0JlaW5nQ2hhbmdlZCk7CisgICAgLy8gaGFz IGFkZGVkIGEgbmV3IGNoaWxkLiBTbyBmaW5kIHRoZSBjbG9zZXN0IGFuY2VzdG9yIG9mIGF4T2Jq ZWN0IHRoYXQgaGFzCisgICAgLy8gYW4gYXNzb2NpYXRlZCBpc29sYXRlZCBvYmplY3QgYW5kIHVw ZGF0ZSBpdHMgY2hpbGRyZW4uCisgICAgYXV0byogYXhBbmNlc3RvciA9IEFjY2Vzc2liaWxpdHk6 OmZpbmRBbmNlc3RvcihheE9iamVjdCwgdHJ1ZSwgW3RoaXNdIChhdXRvJiBhbmNlc3Rvcikgewor ICAgICAgICByZXR1cm4gbV9ub2RlTWFwLmZpbmQoYW5jZXN0b3Iub2JqZWN0SUQoKSkgIT0gbV9u b2RlTWFwLmVuZCgpOworICAgIH0pOworCisgICAgaWYgKCFheEFuY2VzdG9yIHx8ICFheEFuY2Vz dG9yLT5vYmplY3RJRCgpLmlzVmFsaWQoKSkgeworICAgICAgICAvLyBUaGlzIHVwZGF0ZSB3YXMg dHJpZ2dlcmVkIGJlZm9yZSB0aGUgaXNvbGF0ZWQgdHJlZSBoYXMgYmVlbiByZXBvcHVsYXRlZC4K KyAgICAgICAgLy8gUmV0dXJuIGhlcmUgc2luY2UgdGhlcmUgaXMgbm90aGluZyB0byB1cGRhdGUu CisgICAgICAgIEFYTE9HKCJCYWlsaW5nIGJlY2F1c2Ugbm8gYW5jZXN0b3IgY291bGQgYmUgZm91 bmQsIG9yIGFuY2VzdG9yIGhhZCBhbiBpbnZhbGlkIG9iamVjdElEIik7CisgICAgICAgIHJldHVy bjsKKyAgICB9CiAKLSAgICBhdXRvIG9sZElEcyA9IG1fbm9kZU1hcC5nZXQoYXhPYmplY3Qub2Jq ZWN0SUQoKSk7CisjaWZuZGVmIE5ERUJVRworICAgIGlmIChheEFuY2VzdG9yICE9ICZheE9iamVj dCkgeworICAgICAgICBBWExPRyhtYWtlU3RyaW5nKCJPcmlnaW5hbCBvYmplY3Qgd2l0aCBJRCAi LCBheE9iamVjdC5vYmplY3RJRCgpLmxvZ2dpbmdTdHJpbmcoKSwgIiB3YXNuJ3QgaW4gdGhlIGlz b2xhdGVkIHRyZWUsIHNvIGluc3RlYWQgdXBkYXRpbmcgdGhlIGNsb3Nlc3QgaW4taXNvbGF0ZWQt dHJlZSBhbmNlc3RvcjoiKSk7CisgICAgICAgIEFYTE9HKGF4QW5jZXN0b3IpOworICAgIH0KKyNl bmRpZgorCisgICAgYXV0byBvbGRJRHMgPSBtX25vZGVNYXAuZ2V0KGF4QW5jZXN0b3ItPm9iamVj dElEKCkpOwogICAgIGF1dG8mIG9sZENoaWxkcmVuSURzID0gb2xkSURzLmNoaWxkcmVuSURzOwog Ci0gICAgY29uc3QgYXV0byYgbmV3Q2hpbGRyZW4gPSBheE9iamVjdC5jaGlsZHJlbigpOwotICAg IGF1dG8gbmV3Q2hpbGRyZW5JRHMgPSBheE9iamVjdC5jaGlsZHJlbklEcyhmYWxzZSk7CisgICAg Y29uc3QgYXV0byYgbmV3Q2hpbGRyZW4gPSBheEFuY2VzdG9yLT5jaGlsZHJlbigpOworICAgIGF1 dG8gbmV3Q2hpbGRyZW5JRHMgPSBheEFuY2VzdG9yLT5jaGlsZHJlbklEcyhmYWxzZSk7CiAKKyAg ICBWZWN0b3I8Tm9kZUNoYW5nZT4gY2hhbmdlczsKKyAgICBIYXNoU2V0PEFYSUQ+IGlkc0JlaW5n Q2hhbmdlZDsKICAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IG5ld0NoaWxkcmVuLnNpemUoKTsg KytpKSB7CiAgICAgICAgIEFTU0VSVChuZXdDaGlsZHJlbltpXS0+b2JqZWN0SUQoKSA9PSBuZXdD aGlsZHJlbklEc1tpXSk7CiAgICAgICAgIEFTU0VSVChuZXdDaGlsZHJlbklEc1tpXS5pc1ZhbGlk KCkpOwpAQCAtNDIwLDE0ICs0MDIsMTQgQEAgdm9pZCBBWElzb2xhdGVkVHJlZTo6dXBkYXRlQ2hp bGRyZW4oQVhDb3JlT2JqZWN0JiBheE9iamVjdCkKICAgICAgICAgICAgIG9sZENoaWxkcmVuSURz LnJlbW92ZShpbmRleCk7CiAgICAgICAgIGVsc2UgewogICAgICAgICAgICAgLy8gVGhpcyBpcyBh IG5ldyBjaGlsZCwgYWRkIGl0IHRvIHRoZSB0cmVlLgotICAgICAgICAgICAgQVhMT0cobWFrZVN0 cmluZygiQVhJRCAiLCBheE9iamVjdC5vYmplY3RJRCgpLmxvZ2dpbmdTdHJpbmcoKSwgIiBnYWlu aW5nIG5ldyBzdWJ0cmVlLCBzdGFydGluZyBhdCBJRCAiLCBuZXdDaGlsZHJlbltpXS0+b2JqZWN0 SUQoKS5sb2dnaW5nU3RyaW5nKCksICI6IikpOworICAgICAgICAgICAgQVhMT0cobWFrZVN0cmlu ZygiQVhJRCAiLCBheEFuY2VzdG9yLT5vYmplY3RJRCgpLmxvZ2dpbmdTdHJpbmcoKSwgIiBnYWlu aW5nIG5ldyBzdWJ0cmVlLCBzdGFydGluZyBhdCBJRCAiLCBuZXdDaGlsZHJlbltpXS0+b2JqZWN0 SUQoKS5sb2dnaW5nU3RyaW5nKCksICI6IikpOwogICAgICAgICAgICAgQVhMT0cobmV3Q2hpbGRy ZW5baV0pOwotICAgICAgICAgICAgY29sbGVjdE5vZGVDaGFuZ2VzRm9yU3VidHJlZSgqbmV3Q2hp bGRyZW5baV0sIGF4T2JqZWN0Lm9iamVjdElEKCksIHRydWUsIGNoYW5nZXMsICZpZHNCZWluZ0No YW5nZWQpOworICAgICAgICAgICAgY29sbGVjdE5vZGVDaGFuZ2VzRm9yU3VidHJlZSgqbmV3Q2hp bGRyZW5baV0sIGF4QW5jZXN0b3ItPm9iamVjdElEKCksIHRydWUsIGNoYW5nZXMsICZpZHNCZWlu Z0NoYW5nZWQpOwogICAgICAgICB9CiAgICAgfQotICAgIG1fbm9kZU1hcC5zZXQoYXhPYmplY3Qu b2JqZWN0SUQoKSwgUGFyZW50Q2hpbGRyZW5JRHMgeyBvbGRJRHMucGFyZW50SUQsIG5ld0NoaWxk cmVuSURzIH0pOworICAgIG1fbm9kZU1hcC5zZXQoYXhBbmNlc3Rvci0+b2JqZWN0SUQoKSwgUGFy ZW50Q2hpbGRyZW5JRHMgeyBvbGRJRHMucGFyZW50SUQsIG5ld0NoaWxkcmVuSURzIH0pOwogCi0g ICAgLy8gV2hhdCBpcyBsZWZ0IGluIG9sZENoaWxkcmVuSURzIGFyZSB0aGUgSURzIHRoYXQgYXJl IG5vIGxvbmdlciBjaGlsZHJlbiBvZiBheE9iamVjdC4KKyAgICAvLyBXaGF0IGlzIGxlZnQgaW4g b2xkQ2hpbGRyZW5JRHMgYXJlIHRoZSBJRHMgdGhhdCBhcmUgbm8gbG9uZ2VyIGNoaWxkcmVuIG9m IGF4QW5jZXN0b3IuCiAgICAgLy8gVGh1cywgcmVtb3ZlIHRoZW0gZnJvbSBtX25vZGVNYXAgYW5k IHF1ZXVlIHRoZW0gdG8gYmUgcmVtb3ZlZCBmcm9tIHRoZSB0cmVlLgogICAgIGZvciAoQVhJRCYg YXhJRCA6IG9sZENoaWxkcmVuSURzKSB7CiAgICAgICAgIC8vIEhvd2V2ZXIsIHdlIGRvbid0IHdh bnQgdG8gcmVtb3ZlIHN1YnRyZWVzIGZyb20gdGhlIG5vZGVtYXAgdGhhdCBhcmUgcGFydCBvZiB0 aGUgdG8tYmUtcXVldWVkIG5vZGUgY2hhbmdlcyAoaS5lIHRob3NlIGluIGBpZHNCZWluZ0NoYW5n ZWRgKS4KQEAgLTQzNSw3ICs0MTcsNyBAQCB2b2lkIEFYSXNvbGF0ZWRUcmVlOjp1cGRhdGVDaGls ZHJlbihBWENvcmVPYmplY3QmIGF4T2JqZWN0KQogICAgICAgICAvLyAgIDEuIE9iamVjdCAxMjMg aXMgc2xhdGVkIHRvIGJlIGEgY2hpbGQgb2YgdGhpcyBvYmplY3QgKGkuZS4gaW4gbmV3Q2hpbGRy ZW4pLCBhbmQgd2UgY29sbGVjdCBub2RlIGNoYW5nZXMgZm9yIGl0LgogICAgICAgICAvLyAgIDIu IE9iamVjdCAxMjMgaXMgY3VycmVudGx5IGEgbWVtYmVyIG9mIGEgc3VidHJlZSBvZiBzb21lIG90 aGVyIG9iamVjdCBpbiBvbGRDaGlsZHJlbklEcy4KICAgICAgICAgLy8gICAzLiBUaHVzLCB3ZSBk b24ndCB3YW50IHRvIGRlbGV0ZSBPYmplY3QgMTIzIGZyb20gdGhlIG5vZGVtYXAsIGluc3RlYWQg YWxsb3dpbmcgaXQgdG8gYmUgbW92ZWQuCi0gICAgICAgIHJlbW92ZVN1YnRyZWVGcm9tTm9kZU1h cChheElELCAmYXhPYmplY3QsIGlkc0JlaW5nQ2hhbmdlZCk7CisgICAgICAgIHJlbW92ZVN1YnRy ZWVGcm9tTm9kZU1hcChheElELCBheEFuY2VzdG9yLCBpZHNCZWluZ0NoYW5nZWQpOwogICAgIH0K ICAgICBxdWV1ZUNoYW5nZXNBbmRSZW1vdmFscyhjaGFuZ2VzLCBvbGRDaGlsZHJlbklEcyk7CiB9 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9B WElzb2xhdGVkVHJlZS5oIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRy ZWUvQVhJc29sYXRlZFRyZWUuaAppbmRleCA3Nzc1NmM1NzcyMjc4MjU0ZDk3YzYxMzNkZTI0ZjVl M2M0ZDI0Njg4Li5iZDJjYTcyYTY0OWFmN2U1YzY3MmQ0MmUzNmQzM2FkNzhkYzFmNTVkIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xh dGVkVHJlZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVl L0FYSXNvbGF0ZWRUcmVlLmgKQEAgLTM4NywxMSArMzg3LDEwIEBAIHByaXZhdGU6CiAgICAgLy8g TWV0aG9kcyBpbiB0aGlzIGJsb2NrIGFyZSBjYWxsZWQgb24gdGhlIG1haW4gdGhyZWFkLgogICAg IC8vIENvbXB1dGVzIHRoZSBwYXJlbnQgSUQgb2YgdGhlIGdpdmVuIG9iamVjdCwgd2hpY2ggaXMg Z2VuZXJhbGx5IHRoZSAiYXNzdW1lZCIgcGFyZW50IElEIChidXQgbm90IGFsd2F5cywgbGlrZSBp biB0aGUgY2FzZSBvZiB0YWJsZXMpLgogICAgIEFYSUQgcGFyZW50SURGb3JPYmplY3QoQVhDb3Jl T2JqZWN0JiwgQVhJRCBhc3N1bWVkUGFyZW50SUQpOwotICAgIE5vZGVDaGFuZ2Ugbm9kZUNoYW5n ZUZvck9iamVjdChBWENvcmVPYmplY3QmLCBBWElEIHBhcmVudElELCBib29sIGF0dGFjaFdyYXBw ZXIgPSB0cnVlLCBib29sIHVwZGF0ZU5vZGVNYXAgPSB0cnVlKTsKKyAgICBOb2RlQ2hhbmdlIG5v ZGVDaGFuZ2VGb3JPYmplY3QoQVhDb3JlT2JqZWN0JiwgQVhJRCBwYXJlbnRJRCwgYm9vbCBhdHRh Y2hXcmFwcGVyID0gdHJ1ZSk7CiAgICAgdm9pZCBjb2xsZWN0Tm9kZUNoYW5nZXNGb3JTdWJ0cmVl KEFYQ29yZU9iamVjdCYsIEFYSUQgcGFyZW50SUQsIGJvb2wgYXR0YWNoV3JhcHBlciwgVmVjdG9y PE5vZGVDaGFuZ2U+JiwgSGFzaFNldDxBWElEPiogPSBudWxscHRyKTsKICAgICB2b2lkIHF1ZXVl Q2hhbmdlKGNvbnN0IE5vZGVDaGFuZ2UmKSBXVEZfUkVRVUlSRVNfTE9DSyhtX2NoYW5nZUxvZ0xv Y2spOwogICAgIHZvaWQgcXVldWVDaGFuZ2VzQW5kUmVtb3ZhbHMoY29uc3QgVmVjdG9yPE5vZGVD aGFuZ2U+JiwgY29uc3QgVmVjdG9yPEFYSUQ+JiA9IHsgfSk7Ci0gICAgVmVjdG9yPE5vZGVDaGFu Z2U+IG5vZGVBbmNlc3RyeUNoYW5nZXMoQVhDb3JlT2JqZWN0JiwgSGFzaFNldDxBWElEPiYpOwog CiAgICAgQVhJc29sYXRlZFRyZWVJRCBtX3RyZWVJRDsKICAgICBBWE9iamVjdENhY2hlKiBtX2F4 T2JqZWN0Q2FjaGUgeyBudWxscHRyIH07Cg==