230565 2021-09-21 10:35:26 -0700 Pending preconnect key should include User-Agent 2021-09-25 09:12:36 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 nham nham achristensen cdumez nham webkit-bug-importer oldest_to_newest 1795643 0 nham 2021-09-21 10:35:26 -0700 Pending preconnect key should include User-Agent 1795659 1 438836 nham 2021-09-21 11:06:16 -0700 Created attachment 438836 Patch 1795667 2 nham 2021-09-21 11:08:39 -0700 <rdar://83259078> 1795958 3 438922 nham 2021-09-21 22:33:24 -0700 Created attachment 438922 Patch 1797007 4 438922 cdumez 2021-09-24 13:14:09 -0700 Comment on attachment 438922 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=438922&action=review r=me with changes. > Source/WebKit/NetworkProcess/NetworkLoadScheduler.cpp:156 > +static std::tuple<String, String> mainResourceLoadKey(String protocolHostAndPort, String userAgent) `const String&` for both parameters to avoid ref-counting churn. > Source/WebKit/NetworkProcess/NetworkLoadScheduler.h:54 > + void startedPreconnectForMainResource(const URL&, const String&); Please do not omit the second parameter name as it is not obvious what it is. > Source/WebKit/NetworkProcess/NetworkLoadScheduler.h:55 > + void finishedPreconnectForMainResource(const URL&, const String&, const WebCore::ResourceError&); ditto. > Source/WebKit/NetworkProcess/NetworkLoadScheduler.h:81 > + using PendingPreconnectMap = HashMap<std::tuple<String, String>, PendingMainResourcePreconnectInfo>; We probably want inline comments to indicate what those Strings are. 1797026 5 439195 nham 2021-09-24 14:00:25 -0700 Created attachment 439195 Patch 1797212 6 ews-feeder 2021-09-25 09:12:33 -0700 Committed r283081 (242139@main): <https://commits.webkit.org/242139@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 439195. 438836 2021-09-21 11:06:16 -0700 2021-09-21 22:33:23 -0700 Patch bug-230565-20210921110615.patch text/plain 7845 nham U3VidmVyc2lvbiBSZXZpc2lvbjogMjgyNzk4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGNlZmQyOGU2MTJjNjNjNjg2 NWNjMDIwN2E3ODUwZDRkYTU1MjM1OGQuLmVlNTNlODRiMGE0NDMzNjEyNDM5M2ViOTBmZDMwNmYw OWE1MmM2N2QgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjcgQEAKKzIwMjEtMDktMjEgIEJlbiBOaGFt ICA8bmhhbUBhcHBsZS5jb20+CisKKyAgICAgICAgUGVuZGluZyBwcmVjb25uZWN0IGtleSBzaG91 bGQgaW5jbHVkZSBVc2VyLUFnZW50CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0yMzA1NjUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBXaGVuIHVzaW5nIGFuIEhUVFBTIHByb3h5LCB0aGUgSFRUUCBjb25uZWN0 aW9uIGNhY2hlIGtleSB1c2VkIGZvciBjb25uZWN0aW9uIGNvYWxlc2NpbmcgaW4KKyAgICAgICAg Q0ZOZXR3b3JrIGluY2x1ZGVzIHRoZSBVc2VyLUFnZW50ICg8cmRhcjovL3Byb2JsZW0vNTk0MzQx NjY+KS4gVGhpcyBtZWFucyB3ZSBzaG91bGQgYWxzbworICAgICAgICBpbmNsdWRlIGl0IGluIHRo ZSBwcmVjb25uZWN0IGNhY2hlIGtleS4gT3RoZXJ3aXNlLCB3ZSBtaWdodCBkZWxheSB0aGUgbWFp biByZXNvdXJjZSBsb2FkIG9uCisgICAgICAgIHByZWNvbm5lY3QgdW5uZWNlc3NhcmlseSBpbiBj YXNlcyB3aGVyZSB0aGUgVXNlci1BZ2VudCBtaXNtYXRjaGVzIGFuZCB0aGUgcHJlY29ubmVjdCBn ZXRzCisgICAgICAgIHRocm93biBhd2F5LiBUaGlzIGNhbiBoYXBwZW4gaWYgKGZvciBpbnN0YW5j ZSkgYSBwYWdlIGlzIGZvcmNlLWxvYWRlZCBpbnRvIGRlc2t0b3Agb3IgbW9iaWxlCisgICAgICAg IG1vZGUgb24gaU9TLCB3aGljaCBjYXVzZXMgYSBVQSBjaGFuZ2UgYWZ0ZXIgdGhlIGNhbGwgdG8g ZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbi4KKworICAgICAgICAqIE5ldHdvcmtQcm9j ZXNzL05ldHdvcmtMb2FkU2NoZWR1bGVyLmNwcDoKKyAgICAgICAgKFdlYktpdDo6bWFpblJlc291 cmNlTG9hZEtleSk6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtMb2FkU2NoZWR1bGVyOjpzY2hl ZHVsZU1haW5SZXNvdXJjZUxvYWQpOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrTG9hZFNjaGVk dWxlcjo6dW5zY2hlZHVsZU1haW5SZXNvdXJjZUxvYWQpOgorICAgICAgICAoV2ViS2l0OjpOZXR3 b3JrTG9hZFNjaGVkdWxlcjo6c3RhcnRlZFByZWNvbm5lY3RGb3JNYWluUmVzb3VyY2UpOgorICAg ICAgICAoV2ViS2l0OjpOZXR3b3JrTG9hZFNjaGVkdWxlcjo6ZmluaXNoZWRQcmVjb25uZWN0Rm9y TWFpblJlc291cmNlKToKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9OZXR3b3JrTG9hZFNjaGVk dWxlci5oOgorICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL05ldHdvcmtQcm9jZXNzLmNwcDoKKyAg ICAgICAgKFdlYktpdDo6TmV0d29ya1Byb2Nlc3M6OnByZWNvbm5lY3RUbyk6CisKIDIwMjEtMDkt MjAgIENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KIAogICAgICAgICBBdm9pZCBkb2lu ZyBhIHNlY29uZCBzZXJ2ZXIgcHJlLWNvbm5lY3QgYWZ0ZXIgYSBwcm9jZXNzLXN3YXAKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya0xvYWRTY2hlZHVsZXIu Y3BwIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrTG9hZFNjaGVkdWxlci5j cHAKaW5kZXggNzg4NGNkNzRjM2YwNzMzZWJkMjVkM2VkNmI5NmQ3MzVjODEwMGFjNC4uMjMwNDNk NTBjMDE2OGM4NjdmMmQ1ODkzMTE2NmY1Y2MzZTNlNzcwZSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrTG9hZFNjaGVkdWxlci5jcHAKKysrIGIvU291cmNl L1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrTG9hZFNjaGVkdWxlci5jcHAKQEAgLTE1Myw2 ICsxNTMsMTEgQEAgdm9pZCBOZXR3b3JrTG9hZFNjaGVkdWxlcjo6dW5zY2hlZHVsZUxvYWQoTmV0 d29ya0xvYWQmIGxvYWQpCiAgICAgICAgIGNvbnRleHQtPnVuc2NoZWR1bGUobG9hZCk7CiB9CiAK K3N0YXRpYyBzdGQ6OnR1cGxlPFN0cmluZywgU3RyaW5nPiBtYWluUmVzb3VyY2VMb2FkS2V5KFN0 cmluZyBwcm90b2NvbEhvc3RBbmRQb3J0LCBTdHJpbmcgdXNlckFnZW50KQoreworICAgIHJldHVy biBzdGQ6Om1ha2VfdHVwbGUocHJvdG9jb2xIb3N0QW5kUG9ydCwgdXNlckFnZW50KTsKK30KKwog dm9pZCBOZXR3b3JrTG9hZFNjaGVkdWxlcjo6c2NoZWR1bGVNYWluUmVzb3VyY2VMb2FkKE5ldHdv cmtMb2FkJiBsb2FkKQogewogICAgIFN0cmluZyBwcm90b2NvbEhvc3RBbmRQb3J0ID0gbG9hZC51 cmwoKS5wcm90b2NvbEhvc3RBbmRQb3J0KCk7CkBAIC0xNjEsNyArMTY2LDcgQEAgdm9pZCBOZXR3 b3JrTG9hZFNjaGVkdWxlcjo6c2NoZWR1bGVNYWluUmVzb3VyY2VMb2FkKE5ldHdvcmtMb2FkJiBs b2FkKQogICAgICAgICByZXR1cm47CiAgICAgfQogCi0gICAgYXV0byBpdGVyID0gbV9wZW5kaW5n TWFpblJlc291cmNlUHJlY29ubmVjdHMuZmluZChwcm90b2NvbEhvc3RBbmRQb3J0KTsKKyAgICBh dXRvIGl0ZXIgPSBtX3BlbmRpbmdNYWluUmVzb3VyY2VQcmVjb25uZWN0cy5maW5kKG1haW5SZXNv dXJjZUxvYWRLZXkocHJvdG9jb2xIb3N0QW5kUG9ydCwgbG9hZC5wYXJhbWV0ZXJzKCkucmVxdWVz dC5odHRwVXNlckFnZW50KCkpKTsKICAgICBpZiAoaXRlciA9PSBtX3BlbmRpbmdNYWluUmVzb3Vy Y2VQcmVjb25uZWN0cy5lbmQoKSkgewogICAgICAgICBsb2FkLnN0YXJ0KCk7CiAgICAgICAgIHJl dHVybjsKQEAgLTE4NSw3ICsxOTAsNyBAQCB2b2lkIE5ldHdvcmtMb2FkU2NoZWR1bGVyOjp1bnNj aGVkdWxlTWFpblJlc291cmNlTG9hZChOZXR3b3JrTG9hZCYgbG9hZCwgY29uc3QgVwogICAgIGlm IChtZXRyaWNzKQogICAgICAgICB1cGRhdGVPcmlnaW5Qcm90b2NvbEluZm8ocHJvdG9jb2xIb3N0 QW5kUG9ydCwgbWV0cmljcy0+cHJvdG9jb2wpOwogCi0gICAgYXV0byBpdGVyID0gbV9wZW5kaW5n TWFpblJlc291cmNlUHJlY29ubmVjdHMuZmluZChwcm90b2NvbEhvc3RBbmRQb3J0KTsKKyAgICBh dXRvIGl0ZXIgPSBtX3BlbmRpbmdNYWluUmVzb3VyY2VQcmVjb25uZWN0cy5maW5kKG1haW5SZXNv dXJjZUxvYWRLZXkocHJvdG9jb2xIb3N0QW5kUG9ydCwgbG9hZC5wYXJhbWV0ZXJzKCkucmVxdWVz dC5odHRwVXNlckFnZW50KCkpKTsKICAgICBpZiAoaXRlciA9PSBtX3BlbmRpbmdNYWluUmVzb3Vy Y2VQcmVjb25uZWN0cy5lbmQoKSkKICAgICAgICAgcmV0dXJuOwogCkBAIC0xOTQsOSArMTk5LDEw IEBAIHZvaWQgTmV0d29ya0xvYWRTY2hlZHVsZXI6OnVuc2NoZWR1bGVNYWluUmVzb3VyY2VMb2Fk KE5ldHdvcmtMb2FkJiBsb2FkLCBjb25zdCBXCiAgICAgICAgIG1heWJlUHJ1bmVQcmVjb25uZWN0 SW5mbyhpdGVyKTsKIH0KIAotdm9pZCBOZXR3b3JrTG9hZFNjaGVkdWxlcjo6c3RhcnRlZFByZWNv bm5lY3RGb3JNYWluUmVzb3VyY2UoY29uc3QgVVJMJiB1cmwpCit2b2lkIE5ldHdvcmtMb2FkU2No ZWR1bGVyOjpzdGFydGVkUHJlY29ubmVjdEZvck1haW5SZXNvdXJjZShjb25zdCBVUkwmIHVybCwg Y29uc3QgU3RyaW5nJiB1c2VyQWdlbnQpCiB7Ci0gICAgYXV0byBpdGVyID0gbV9wZW5kaW5nTWFp blJlc291cmNlUHJlY29ubmVjdHMuZmluZCh1cmwucHJvdG9jb2xIb3N0QW5kUG9ydCgpKTsKKyAg ICBhdXRvIGtleSA9IG1haW5SZXNvdXJjZUxvYWRLZXkodXJsLnByb3RvY29sSG9zdEFuZFBvcnQo KSwgdXNlckFnZW50KTsKKyAgICBhdXRvIGl0ZXIgPSBtX3BlbmRpbmdNYWluUmVzb3VyY2VQcmVj b25uZWN0cy5maW5kKGtleSk7CiAgICAgaWYgKGl0ZXIgIT0gbV9wZW5kaW5nTWFpblJlc291cmNl UHJlY29ubmVjdHMuZW5kKCkpIHsKICAgICAgICAgUGVuZGluZ01haW5SZXNvdXJjZVByZWNvbm5l Y3RJbmZvJiBpbmZvID0gaXRlci0+dmFsdWU7CiAgICAgICAgIGluZm8ucGVuZGluZ1ByZWNvbm5l Y3RzKys7CkBAIC0yMDQsMTIgKzIxMCwxMiBAQCB2b2lkIE5ldHdvcmtMb2FkU2NoZWR1bGVyOjpz dGFydGVkUHJlY29ubmVjdEZvck1haW5SZXNvdXJjZShjb25zdCBVUkwmIHVybCkKICAgICB9CiAK ICAgICBQZW5kaW5nTWFpblJlc291cmNlUHJlY29ubmVjdEluZm8gaW5mbzsKLSAgICBtX3BlbmRp bmdNYWluUmVzb3VyY2VQcmVjb25uZWN0cy5hZGQodXJsLnByb3RvY29sSG9zdEFuZFBvcnQoKSwg V1RGTW92ZShpbmZvKSk7CisgICAgbV9wZW5kaW5nTWFpblJlc291cmNlUHJlY29ubmVjdHMuYWRk KGtleSwgV1RGTW92ZShpbmZvKSk7CiB9CiAKLXZvaWQgTmV0d29ya0xvYWRTY2hlZHVsZXI6OmZp bmlzaGVkUHJlY29ubmVjdEZvck1haW5SZXNvdXJjZShjb25zdCBVUkwmIHVybCwgY29uc3QgV2Vi Q29yZTo6UmVzb3VyY2VFcnJvciYgZXJyb3IpCit2b2lkIE5ldHdvcmtMb2FkU2NoZWR1bGVyOjpm aW5pc2hlZFByZWNvbm5lY3RGb3JNYWluUmVzb3VyY2UoY29uc3QgVVJMJiB1cmwsIGNvbnN0IFN0 cmluZyYgdXNlckFnZW50LCBjb25zdCBXZWJDb3JlOjpSZXNvdXJjZUVycm9yJiBlcnJvcikKIHsK LSAgICBhdXRvIGl0ZXIgPSBtX3BlbmRpbmdNYWluUmVzb3VyY2VQcmVjb25uZWN0cy5maW5kKHVy bC5wcm90b2NvbEhvc3RBbmRQb3J0KCkpOworICAgIGF1dG8gaXRlciA9IG1fcGVuZGluZ01haW5S ZXNvdXJjZVByZWNvbm5lY3RzLmZpbmQobWFpblJlc291cmNlTG9hZEtleSh1cmwucHJvdG9jb2xI b3N0QW5kUG9ydCgpLCB1c2VyQWdlbnQpKTsKICAgICBpZiAoaXRlciA9PSBtX3BlbmRpbmdNYWlu UmVzb3VyY2VQcmVjb25uZWN0cy5lbmQoKSkKICAgICAgICAgcmV0dXJuOwogCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtMb2FkU2NoZWR1bGVyLmggYi9T b3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtMb2FkU2NoZWR1bGVyLmgKaW5kZXgg ZTA4MGExOGQyZjAyZTI4Njc5ZmI0NDZkMWE5N2E0YjY0ZDhjZTgyZS4uNzMzN2Y3NGJjMjYwNDM3 NGIwYmVkY2QwZDMzY2ZkNmRhNzY5MDk3NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3 b3JrUHJvY2Vzcy9OZXR3b3JrTG9hZFNjaGVkdWxlci5oCisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0 d29ya1Byb2Nlc3MvTmV0d29ya0xvYWRTY2hlZHVsZXIuaApAQCAtMjgsNiArMjgsNyBAQAogI2lu Y2x1ZGUgPFdlYkNvcmUvTG9hZFNjaGVkdWxpbmdNb2RlLmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9O ZXR3b3JrTG9hZE1ldHJpY3MuaD4KICNpbmNsdWRlIDxXZWJDb3JlL1BhZ2VJZGVudGlmaWVyLmg+ CisjaW5jbHVkZSA8dHVwbGU+CiAjaW5jbHVkZSA8d3RmL0hhc2hNYXAuaD4KICNpbmNsdWRlIDx3 dGYvSGFzaFNldC5oPgogI2luY2x1ZGUgPHd0Zi9MaXN0SGFzaFNldC5oPgpAQCAtNTAsOCArNTEs OCBAQCBwdWJsaWM6CiAgICAgdm9pZCBzY2hlZHVsZShOZXR3b3JrTG9hZCYpOwogICAgIHZvaWQg dW5zY2hlZHVsZShOZXR3b3JrTG9hZCYsIGNvbnN0IFdlYkNvcmU6Ok5ldHdvcmtMb2FkTWV0cmlj cyogPSBudWxscHRyKTsKIAotICAgIHZvaWQgc3RhcnRlZFByZWNvbm5lY3RGb3JNYWluUmVzb3Vy Y2UoY29uc3QgVVJMJik7Ci0gICAgdm9pZCBmaW5pc2hlZFByZWNvbm5lY3RGb3JNYWluUmVzb3Vy Y2UoY29uc3QgVVJMJiwgY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VFcnJvciYpOworICAgIHZvaWQg c3RhcnRlZFByZWNvbm5lY3RGb3JNYWluUmVzb3VyY2UoY29uc3QgVVJMJiwgY29uc3QgU3RyaW5n Jik7CisgICAgdm9pZCBmaW5pc2hlZFByZWNvbm5lY3RGb3JNYWluUmVzb3VyY2UoY29uc3QgVVJM JiwgY29uc3QgU3RyaW5nJiwgY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VFcnJvciYpOwogCiAgICAg dm9pZCBzZXRSZXNvdXJjZUxvYWRTY2hlZHVsaW5nTW9kZShXZWJDb3JlOjpQYWdlSWRlbnRpZmll ciwgV2ViQ29yZTo6TG9hZFNjaGVkdWxpbmdNb2RlKTsKICAgICB2b2lkIHByaW9yaXRpemVMb2Fk cyhjb25zdCBWZWN0b3I8TmV0d29ya0xvYWQqPiYpOwpAQCAtNzcsNyArNzgsNyBAQCBwcml2YXRl OgogICAgICAgICB1bnNpZ25lZCBwZW5kaW5nUHJlY29ubmVjdHMgezF9OwogICAgICAgICBMaXN0 SGFzaFNldDxOZXR3b3JrTG9hZCAqPiBwZW5kaW5nTG9hZHM7CiAgICAgfTsKLSAgICB1c2luZyBQ ZW5kaW5nUHJlY29ubmVjdE1hcCA9IEhhc2hNYXA8U3RyaW5nLCBQZW5kaW5nTWFpblJlc291cmNl UHJlY29ubmVjdEluZm8+OworICAgIHVzaW5nIFBlbmRpbmdQcmVjb25uZWN0TWFwID0gSGFzaE1h cDxzdGQ6OnR1cGxlPFN0cmluZywgU3RyaW5nPiwgUGVuZGluZ01haW5SZXNvdXJjZVByZWNvbm5l Y3RJbmZvPjsKICAgICBQZW5kaW5nUHJlY29ubmVjdE1hcCBtX3BlbmRpbmdNYWluUmVzb3VyY2VQ cmVjb25uZWN0czsKIAogICAgIHZvaWQgbWF5YmVQcnVuZVByZWNvbm5lY3RJbmZvKFBlbmRpbmdQ cmVjb25uZWN0TWFwOjppdGVyYXRvciYpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9OZXR3 b3JrUHJvY2Vzcy9OZXR3b3JrUHJvY2Vzcy5jcHAgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9j ZXNzL05ldHdvcmtQcm9jZXNzLmNwcAppbmRleCA4NDZiZGQ1M2YzNDZiNWZjYzQyODA3YTlmM2E1 NDYzMjMyYjgxMWM1Li45Y2E0YzU0MzczMTJjMTU4M2UzMTdhYzQzNzlmZGViNjhlMWUwOGJmIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtQcm9jZXNzLmNw cAorKysgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtQcm9jZXNzLmNwcApA QCAtMTM5OSw5ICsxMzk5LDkgQEAgdm9pZCBOZXR3b3JrUHJvY2Vzczo6cHJlY29ubmVjdFRvKFBB TDo6U2Vzc2lvbklEIHNlc3Npb25JRCwgV2ViUGFnZVByb3h5SWRlbnRpZmkKICAgICBwYXJhbWV0 ZXJzLnN0b3JlZENyZWRlbnRpYWxzUG9saWN5ID0gc3RvcmVkQ3JlZGVudGlhbHNQb2xpY3k7CiAg ICAgcGFyYW1ldGVycy5zaG91bGRQcmVjb25uZWN0T25seSA9IFByZWNvbm5lY3RPbmx5OjpZZXM7 CiAKLSAgICBuZXR3b3JrU2Vzc2lvbi0+bmV0d29ya0xvYWRTY2hlZHVsZXIoKS5zdGFydGVkUHJl Y29ubmVjdEZvck1haW5SZXNvdXJjZSh1cmwpOwotICAgIGF1dG8gdGFzayA9IG5ldyBQcmVjb25u ZWN0VGFzaygqbmV0d29ya1Nlc3Npb24sIFdURk1vdmUocGFyYW1ldGVycyksIFtuZXR3b3JrU2Vz c2lvbiwgdXJsXShjb25zdCBXZWJDb3JlOjpSZXNvdXJjZUVycm9yJiBlcnJvcikgewotICAgICAg ICBuZXR3b3JrU2Vzc2lvbi0+bmV0d29ya0xvYWRTY2hlZHVsZXIoKS5maW5pc2hlZFByZWNvbm5l Y3RGb3JNYWluUmVzb3VyY2UodXJsLCBlcnJvcik7CisgICAgbmV0d29ya1Nlc3Npb24tPm5ldHdv cmtMb2FkU2NoZWR1bGVyKCkuc3RhcnRlZFByZWNvbm5lY3RGb3JNYWluUmVzb3VyY2UodXJsLCB1 c2VyQWdlbnQpOworICAgIGF1dG8gdGFzayA9IG5ldyBQcmVjb25uZWN0VGFzaygqbmV0d29ya1Nl c3Npb24sIFdURk1vdmUocGFyYW1ldGVycyksIFtuZXR3b3JrU2Vzc2lvbiwgdXJsLCB1c2VyQWdl bnRdKGNvbnN0IFdlYkNvcmU6OlJlc291cmNlRXJyb3ImIGVycm9yKSB7CisgICAgICAgIG5ldHdv cmtTZXNzaW9uLT5uZXR3b3JrTG9hZFNjaGVkdWxlcigpLmZpbmlzaGVkUHJlY29ubmVjdEZvck1h aW5SZXNvdXJjZSh1cmwsIHVzZXJBZ2VudCwgZXJyb3IpOwogICAgIH0pOwogICAgIHRhc2stPnNl dFRpbWVvdXQoMTBfcyk7CiAgICAgdGFzay0+c3RhcnQoKTsK 438922 2021-09-21 22:33:24 -0700 2021-09-24 14:00:22 -0700 Patch bug-230565-20210921223324.patch text/plain 7929 nham U3VidmVyc2lvbiBSZXZpc2lvbjogMjgyNzk4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGNlZmQyOGU2MTJjNjNjNjg2 NWNjMDIwN2E3ODUwZDRkYTU1MjM1OGQuLmVlNTNlODRiMGE0NDMzNjEyNDM5M2ViOTBmZDMwNmYw OWE1MmM2N2QgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjcgQEAKKzIwMjEtMDktMjEgIEJlbiBOaGFt ICA8bmhhbUBhcHBsZS5jb20+CisKKyAgICAgICAgUGVuZGluZyBwcmVjb25uZWN0IGtleSBzaG91 bGQgaW5jbHVkZSBVc2VyLUFnZW50CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0yMzA1NjUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBXaGVuIHVzaW5nIGFuIEhUVFBTIHByb3h5LCB0aGUgSFRUUCBjb25uZWN0 aW9uIGNhY2hlIGtleSB1c2VkIGZvciBjb25uZWN0aW9uIGNvYWxlc2NpbmcgaW4KKyAgICAgICAg Q0ZOZXR3b3JrIGluY2x1ZGVzIHRoZSBVc2VyLUFnZW50ICg8cmRhcjovL3Byb2JsZW0vNTk0MzQx NjY+KS4gVGhpcyBtZWFucyB3ZSBzaG91bGQgYWxzbworICAgICAgICBpbmNsdWRlIGl0IGluIHRo ZSBwcmVjb25uZWN0IGNhY2hlIGtleS4gT3RoZXJ3aXNlLCB3ZSBtaWdodCBkZWxheSB0aGUgbWFp biByZXNvdXJjZSBsb2FkIG9uCisgICAgICAgIHByZWNvbm5lY3QgdW5uZWNlc3NhcmlseSBpbiBj YXNlcyB3aGVyZSB0aGUgVXNlci1BZ2VudCBtaXNtYXRjaGVzIGFuZCB0aGUgcHJlY29ubmVjdCBn ZXRzCisgICAgICAgIHRocm93biBhd2F5LiBUaGlzIGNhbiBoYXBwZW4gaWYgKGZvciBpbnN0YW5j ZSkgYSBwYWdlIGlzIGZvcmNlLWxvYWRlZCBpbnRvIGRlc2t0b3Agb3IgbW9iaWxlCisgICAgICAg IG1vZGUgb24gaU9TLCB3aGljaCBjYXVzZXMgYSBVQSBjaGFuZ2UgYWZ0ZXIgdGhlIGNhbGwgdG8g ZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbi4KKworICAgICAgICAqIE5ldHdvcmtQcm9j ZXNzL05ldHdvcmtMb2FkU2NoZWR1bGVyLmNwcDoKKyAgICAgICAgKFdlYktpdDo6bWFpblJlc291 cmNlTG9hZEtleSk6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtMb2FkU2NoZWR1bGVyOjpzY2hl ZHVsZU1haW5SZXNvdXJjZUxvYWQpOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrTG9hZFNjaGVk dWxlcjo6dW5zY2hlZHVsZU1haW5SZXNvdXJjZUxvYWQpOgorICAgICAgICAoV2ViS2l0OjpOZXR3 b3JrTG9hZFNjaGVkdWxlcjo6c3RhcnRlZFByZWNvbm5lY3RGb3JNYWluUmVzb3VyY2UpOgorICAg ICAgICAoV2ViS2l0OjpOZXR3b3JrTG9hZFNjaGVkdWxlcjo6ZmluaXNoZWRQcmVjb25uZWN0Rm9y TWFpblJlc291cmNlKToKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9OZXR3b3JrTG9hZFNjaGVk dWxlci5oOgorICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL05ldHdvcmtQcm9jZXNzLmNwcDoKKyAg ICAgICAgKFdlYktpdDo6TmV0d29ya1Byb2Nlc3M6OnByZWNvbm5lY3RUbyk6CisKIDIwMjEtMDkt MjAgIENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KIAogICAgICAgICBBdm9pZCBkb2lu ZyBhIHNlY29uZCBzZXJ2ZXIgcHJlLWNvbm5lY3QgYWZ0ZXIgYSBwcm9jZXNzLXN3YXAKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya0xvYWRTY2hlZHVsZXIu Y3BwIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrTG9hZFNjaGVkdWxlci5j cHAKaW5kZXggNzg4NGNkNzRjM2YwNzMzZWJkMjVkM2VkNmI5NmQ3MzVjODEwMGFjNC4uNzA4YmUx MGE4MjEwODBjOTY4M2FjMDI1MWMyMTdjOGE4MjNmNTI0MiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrTG9hZFNjaGVkdWxlci5jcHAKKysrIGIvU291cmNl L1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrTG9hZFNjaGVkdWxlci5jcHAKQEAgLTE1Myw2 ICsxNTMsMTEgQEAgdm9pZCBOZXR3b3JrTG9hZFNjaGVkdWxlcjo6dW5zY2hlZHVsZUxvYWQoTmV0 d29ya0xvYWQmIGxvYWQpCiAgICAgICAgIGNvbnRleHQtPnVuc2NoZWR1bGUobG9hZCk7CiB9CiAK K3N0YXRpYyBzdGQ6OnR1cGxlPFN0cmluZywgU3RyaW5nPiBtYWluUmVzb3VyY2VMb2FkS2V5KFN0 cmluZyBwcm90b2NvbEhvc3RBbmRQb3J0LCBTdHJpbmcgdXNlckFnZW50KQoreworICAgIHJldHVy biBzdGQ6Om1ha2VfdHVwbGUocHJvdG9jb2xIb3N0QW5kUG9ydC5pc051bGwoKSA/IGVtcHR5U3Ry aW5nKCkgOiBwcm90b2NvbEhvc3RBbmRQb3J0LCB1c2VyQWdlbnQuaXNOdWxsKCkgPyBlbXB0eVN0 cmluZygpIDogdXNlckFnZW50KTsKK30KKwogdm9pZCBOZXR3b3JrTG9hZFNjaGVkdWxlcjo6c2No ZWR1bGVNYWluUmVzb3VyY2VMb2FkKE5ldHdvcmtMb2FkJiBsb2FkKQogewogICAgIFN0cmluZyBw cm90b2NvbEhvc3RBbmRQb3J0ID0gbG9hZC51cmwoKS5wcm90b2NvbEhvc3RBbmRQb3J0KCk7CkBA IC0xNjEsNyArMTY2LDcgQEAgdm9pZCBOZXR3b3JrTG9hZFNjaGVkdWxlcjo6c2NoZWR1bGVNYWlu UmVzb3VyY2VMb2FkKE5ldHdvcmtMb2FkJiBsb2FkKQogICAgICAgICByZXR1cm47CiAgICAgfQog Ci0gICAgYXV0byBpdGVyID0gbV9wZW5kaW5nTWFpblJlc291cmNlUHJlY29ubmVjdHMuZmluZChw cm90b2NvbEhvc3RBbmRQb3J0KTsKKyAgICBhdXRvIGl0ZXIgPSBtX3BlbmRpbmdNYWluUmVzb3Vy Y2VQcmVjb25uZWN0cy5maW5kKG1haW5SZXNvdXJjZUxvYWRLZXkocHJvdG9jb2xIb3N0QW5kUG9y dCwgbG9hZC5wYXJhbWV0ZXJzKCkucmVxdWVzdC5odHRwVXNlckFnZW50KCkpKTsKICAgICBpZiAo aXRlciA9PSBtX3BlbmRpbmdNYWluUmVzb3VyY2VQcmVjb25uZWN0cy5lbmQoKSkgewogICAgICAg ICBsb2FkLnN0YXJ0KCk7CiAgICAgICAgIHJldHVybjsKQEAgLTE4NSw3ICsxOTAsNyBAQCB2b2lk IE5ldHdvcmtMb2FkU2NoZWR1bGVyOjp1bnNjaGVkdWxlTWFpblJlc291cmNlTG9hZChOZXR3b3Jr TG9hZCYgbG9hZCwgY29uc3QgVwogICAgIGlmIChtZXRyaWNzKQogICAgICAgICB1cGRhdGVPcmln aW5Qcm90b2NvbEluZm8ocHJvdG9jb2xIb3N0QW5kUG9ydCwgbWV0cmljcy0+cHJvdG9jb2wpOwog Ci0gICAgYXV0byBpdGVyID0gbV9wZW5kaW5nTWFpblJlc291cmNlUHJlY29ubmVjdHMuZmluZChw cm90b2NvbEhvc3RBbmRQb3J0KTsKKyAgICBhdXRvIGl0ZXIgPSBtX3BlbmRpbmdNYWluUmVzb3Vy Y2VQcmVjb25uZWN0cy5maW5kKG1haW5SZXNvdXJjZUxvYWRLZXkocHJvdG9jb2xIb3N0QW5kUG9y dCwgbG9hZC5wYXJhbWV0ZXJzKCkucmVxdWVzdC5odHRwVXNlckFnZW50KCkpKTsKICAgICBpZiAo aXRlciA9PSBtX3BlbmRpbmdNYWluUmVzb3VyY2VQcmVjb25uZWN0cy5lbmQoKSkKICAgICAgICAg cmV0dXJuOwogCkBAIC0xOTQsOSArMTk5LDEwIEBAIHZvaWQgTmV0d29ya0xvYWRTY2hlZHVsZXI6 OnVuc2NoZWR1bGVNYWluUmVzb3VyY2VMb2FkKE5ldHdvcmtMb2FkJiBsb2FkLCBjb25zdCBXCiAg ICAgICAgIG1heWJlUHJ1bmVQcmVjb25uZWN0SW5mbyhpdGVyKTsKIH0KIAotdm9pZCBOZXR3b3Jr TG9hZFNjaGVkdWxlcjo6c3RhcnRlZFByZWNvbm5lY3RGb3JNYWluUmVzb3VyY2UoY29uc3QgVVJM JiB1cmwpCit2b2lkIE5ldHdvcmtMb2FkU2NoZWR1bGVyOjpzdGFydGVkUHJlY29ubmVjdEZvck1h aW5SZXNvdXJjZShjb25zdCBVUkwmIHVybCwgY29uc3QgU3RyaW5nJiB1c2VyQWdlbnQpCiB7Ci0g ICAgYXV0byBpdGVyID0gbV9wZW5kaW5nTWFpblJlc291cmNlUHJlY29ubmVjdHMuZmluZCh1cmwu cHJvdG9jb2xIb3N0QW5kUG9ydCgpKTsKKyAgICBhdXRvIGtleSA9IG1haW5SZXNvdXJjZUxvYWRL ZXkodXJsLnByb3RvY29sSG9zdEFuZFBvcnQoKSwgdXNlckFnZW50KTsKKyAgICBhdXRvIGl0ZXIg PSBtX3BlbmRpbmdNYWluUmVzb3VyY2VQcmVjb25uZWN0cy5maW5kKGtleSk7CiAgICAgaWYgKGl0 ZXIgIT0gbV9wZW5kaW5nTWFpblJlc291cmNlUHJlY29ubmVjdHMuZW5kKCkpIHsKICAgICAgICAg UGVuZGluZ01haW5SZXNvdXJjZVByZWNvbm5lY3RJbmZvJiBpbmZvID0gaXRlci0+dmFsdWU7CiAg ICAgICAgIGluZm8ucGVuZGluZ1ByZWNvbm5lY3RzKys7CkBAIC0yMDQsMTIgKzIxMCwxMiBAQCB2 b2lkIE5ldHdvcmtMb2FkU2NoZWR1bGVyOjpzdGFydGVkUHJlY29ubmVjdEZvck1haW5SZXNvdXJj ZShjb25zdCBVUkwmIHVybCkKICAgICB9CiAKICAgICBQZW5kaW5nTWFpblJlc291cmNlUHJlY29u bmVjdEluZm8gaW5mbzsKLSAgICBtX3BlbmRpbmdNYWluUmVzb3VyY2VQcmVjb25uZWN0cy5hZGQo dXJsLnByb3RvY29sSG9zdEFuZFBvcnQoKSwgV1RGTW92ZShpbmZvKSk7CisgICAgbV9wZW5kaW5n TWFpblJlc291cmNlUHJlY29ubmVjdHMuYWRkKGtleSwgV1RGTW92ZShpbmZvKSk7CiB9CiAKLXZv aWQgTmV0d29ya0xvYWRTY2hlZHVsZXI6OmZpbmlzaGVkUHJlY29ubmVjdEZvck1haW5SZXNvdXJj ZShjb25zdCBVUkwmIHVybCwgY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VFcnJvciYgZXJyb3IpCit2 b2lkIE5ldHdvcmtMb2FkU2NoZWR1bGVyOjpmaW5pc2hlZFByZWNvbm5lY3RGb3JNYWluUmVzb3Vy Y2UoY29uc3QgVVJMJiB1cmwsIGNvbnN0IFN0cmluZyYgdXNlckFnZW50LCBjb25zdCBXZWJDb3Jl OjpSZXNvdXJjZUVycm9yJiBlcnJvcikKIHsKLSAgICBhdXRvIGl0ZXIgPSBtX3BlbmRpbmdNYWlu UmVzb3VyY2VQcmVjb25uZWN0cy5maW5kKHVybC5wcm90b2NvbEhvc3RBbmRQb3J0KCkpOworICAg IGF1dG8gaXRlciA9IG1fcGVuZGluZ01haW5SZXNvdXJjZVByZWNvbm5lY3RzLmZpbmQobWFpblJl c291cmNlTG9hZEtleSh1cmwucHJvdG9jb2xIb3N0QW5kUG9ydCgpLCB1c2VyQWdlbnQpKTsKICAg ICBpZiAoaXRlciA9PSBtX3BlbmRpbmdNYWluUmVzb3VyY2VQcmVjb25uZWN0cy5lbmQoKSkKICAg ICAgICAgcmV0dXJuOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNz L05ldHdvcmtMb2FkU2NoZWR1bGVyLmggYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05l dHdvcmtMb2FkU2NoZWR1bGVyLmgKaW5kZXggZTA4MGExOGQyZjAyZTI4Njc5ZmI0NDZkMWE5N2E0 YjY0ZDhjZTgyZS4uNzMzN2Y3NGJjMjYwNDM3NGIwYmVkY2QwZDMzY2ZkNmRhNzY5MDk3NiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrTG9hZFNjaGVkdWxl ci5oCisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya0xvYWRTY2hlZHVs ZXIuaApAQCAtMjgsNiArMjgsNyBAQAogI2luY2x1ZGUgPFdlYkNvcmUvTG9hZFNjaGVkdWxpbmdN b2RlLmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9OZXR3b3JrTG9hZE1ldHJpY3MuaD4KICNpbmNsdWRl IDxXZWJDb3JlL1BhZ2VJZGVudGlmaWVyLmg+CisjaW5jbHVkZSA8dHVwbGU+CiAjaW5jbHVkZSA8 d3RmL0hhc2hNYXAuaD4KICNpbmNsdWRlIDx3dGYvSGFzaFNldC5oPgogI2luY2x1ZGUgPHd0Zi9M aXN0SGFzaFNldC5oPgpAQCAtNTAsOCArNTEsOCBAQCBwdWJsaWM6CiAgICAgdm9pZCBzY2hlZHVs ZShOZXR3b3JrTG9hZCYpOwogICAgIHZvaWQgdW5zY2hlZHVsZShOZXR3b3JrTG9hZCYsIGNvbnN0 IFdlYkNvcmU6Ok5ldHdvcmtMb2FkTWV0cmljcyogPSBudWxscHRyKTsKIAotICAgIHZvaWQgc3Rh cnRlZFByZWNvbm5lY3RGb3JNYWluUmVzb3VyY2UoY29uc3QgVVJMJik7Ci0gICAgdm9pZCBmaW5p c2hlZFByZWNvbm5lY3RGb3JNYWluUmVzb3VyY2UoY29uc3QgVVJMJiwgY29uc3QgV2ViQ29yZTo6 UmVzb3VyY2VFcnJvciYpOworICAgIHZvaWQgc3RhcnRlZFByZWNvbm5lY3RGb3JNYWluUmVzb3Vy Y2UoY29uc3QgVVJMJiwgY29uc3QgU3RyaW5nJik7CisgICAgdm9pZCBmaW5pc2hlZFByZWNvbm5l Y3RGb3JNYWluUmVzb3VyY2UoY29uc3QgVVJMJiwgY29uc3QgU3RyaW5nJiwgY29uc3QgV2ViQ29y ZTo6UmVzb3VyY2VFcnJvciYpOwogCiAgICAgdm9pZCBzZXRSZXNvdXJjZUxvYWRTY2hlZHVsaW5n TW9kZShXZWJDb3JlOjpQYWdlSWRlbnRpZmllciwgV2ViQ29yZTo6TG9hZFNjaGVkdWxpbmdNb2Rl KTsKICAgICB2b2lkIHByaW9yaXRpemVMb2Fkcyhjb25zdCBWZWN0b3I8TmV0d29ya0xvYWQqPiYp OwpAQCAtNzcsNyArNzgsNyBAQCBwcml2YXRlOgogICAgICAgICB1bnNpZ25lZCBwZW5kaW5nUHJl Y29ubmVjdHMgezF9OwogICAgICAgICBMaXN0SGFzaFNldDxOZXR3b3JrTG9hZCAqPiBwZW5kaW5n TG9hZHM7CiAgICAgfTsKLSAgICB1c2luZyBQZW5kaW5nUHJlY29ubmVjdE1hcCA9IEhhc2hNYXA8 U3RyaW5nLCBQZW5kaW5nTWFpblJlc291cmNlUHJlY29ubmVjdEluZm8+OworICAgIHVzaW5nIFBl bmRpbmdQcmVjb25uZWN0TWFwID0gSGFzaE1hcDxzdGQ6OnR1cGxlPFN0cmluZywgU3RyaW5nPiwg UGVuZGluZ01haW5SZXNvdXJjZVByZWNvbm5lY3RJbmZvPjsKICAgICBQZW5kaW5nUHJlY29ubmVj dE1hcCBtX3BlbmRpbmdNYWluUmVzb3VyY2VQcmVjb25uZWN0czsKIAogICAgIHZvaWQgbWF5YmVQ cnVuZVByZWNvbm5lY3RJbmZvKFBlbmRpbmdQcmVjb25uZWN0TWFwOjppdGVyYXRvciYpOwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUHJvY2Vzcy5jcHAg Yi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtQcm9jZXNzLmNwcAppbmRleCA4 NDZiZGQ1M2YzNDZiNWZjYzQyODA3YTlmM2E1NDYzMjMyYjgxMWM1Li45Y2E0YzU0MzczMTJjMTU4 M2UzMTdhYzQzNzlmZGViNjhlMWUwOGJmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdv cmtQcm9jZXNzL05ldHdvcmtQcm9jZXNzLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQ cm9jZXNzL05ldHdvcmtQcm9jZXNzLmNwcApAQCAtMTM5OSw5ICsxMzk5LDkgQEAgdm9pZCBOZXR3 b3JrUHJvY2Vzczo6cHJlY29ubmVjdFRvKFBBTDo6U2Vzc2lvbklEIHNlc3Npb25JRCwgV2ViUGFn ZVByb3h5SWRlbnRpZmkKICAgICBwYXJhbWV0ZXJzLnN0b3JlZENyZWRlbnRpYWxzUG9saWN5ID0g c3RvcmVkQ3JlZGVudGlhbHNQb2xpY3k7CiAgICAgcGFyYW1ldGVycy5zaG91bGRQcmVjb25uZWN0 T25seSA9IFByZWNvbm5lY3RPbmx5OjpZZXM7CiAKLSAgICBuZXR3b3JrU2Vzc2lvbi0+bmV0d29y a0xvYWRTY2hlZHVsZXIoKS5zdGFydGVkUHJlY29ubmVjdEZvck1haW5SZXNvdXJjZSh1cmwpOwot ICAgIGF1dG8gdGFzayA9IG5ldyBQcmVjb25uZWN0VGFzaygqbmV0d29ya1Nlc3Npb24sIFdURk1v dmUocGFyYW1ldGVycyksIFtuZXR3b3JrU2Vzc2lvbiwgdXJsXShjb25zdCBXZWJDb3JlOjpSZXNv dXJjZUVycm9yJiBlcnJvcikgewotICAgICAgICBuZXR3b3JrU2Vzc2lvbi0+bmV0d29ya0xvYWRT Y2hlZHVsZXIoKS5maW5pc2hlZFByZWNvbm5lY3RGb3JNYWluUmVzb3VyY2UodXJsLCBlcnJvcik7 CisgICAgbmV0d29ya1Nlc3Npb24tPm5ldHdvcmtMb2FkU2NoZWR1bGVyKCkuc3RhcnRlZFByZWNv bm5lY3RGb3JNYWluUmVzb3VyY2UodXJsLCB1c2VyQWdlbnQpOworICAgIGF1dG8gdGFzayA9IG5l dyBQcmVjb25uZWN0VGFzaygqbmV0d29ya1Nlc3Npb24sIFdURk1vdmUocGFyYW1ldGVycyksIFtu ZXR3b3JrU2Vzc2lvbiwgdXJsLCB1c2VyQWdlbnRdKGNvbnN0IFdlYkNvcmU6OlJlc291cmNlRXJy b3ImIGVycm9yKSB7CisgICAgICAgIG5ldHdvcmtTZXNzaW9uLT5uZXR3b3JrTG9hZFNjaGVkdWxl cigpLmZpbmlzaGVkUHJlY29ubmVjdEZvck1haW5SZXNvdXJjZSh1cmwsIHVzZXJBZ2VudCwgZXJy b3IpOwogICAgIH0pOwogICAgIHRhc2stPnNldFRpbWVvdXQoMTBfcyk7CiAgICAgdGFzay0+c3Rh cnQoKTsK 439195 2021-09-24 14:00:25 -0700 2021-09-25 09:12:35 -0700 Patch bug-230565-20210924140024.patch text/plain 8268 nham U3VidmVyc2lvbiBSZXZpc2lvbjogMjgzMDU0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDJmZDdkOTQ0YTczN2IxODFl YTA5NGE1ZDQxNmNjYWM5ZWRkYmRkNTMuLjAwYzVkZDczZmJiMjcxOTQ4ZTdkNzAwYTM5MTBiMzhh MTJlNmJjYzEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjcgQEAKKzIwMjEtMDktMjQgIEJlbiBOaGFt ICA8bmhhbUBhcHBsZS5jb20+CisKKyAgICAgICAgUGVuZGluZyBwcmVjb25uZWN0IGtleSBzaG91 bGQgaW5jbHVkZSBVc2VyLUFnZW50CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0yMzA1NjUKKworICAgICAgICBSZXZpZXdlZCBieSBDaHJpcyBEdW1lei4K KworICAgICAgICBXaGVuIHVzaW5nIGFuIEhUVFBTIHByb3h5LCB0aGUgSFRUUCBjb25uZWN0aW9u IGNhY2hlIGtleSB1c2VkIGZvciBjb25uZWN0aW9uIGNvYWxlc2NpbmcgaW4KKyAgICAgICAgQ0ZO ZXR3b3JrIGluY2x1ZGVzIHRoZSBVc2VyLUFnZW50ICg8cmRhcjovL3Byb2JsZW0vNTk0MzQxNjY+ KS4gVGhpcyBtZWFucyB3ZSBzaG91bGQgYWxzbworICAgICAgICBpbmNsdWRlIGl0IGluIHRoZSBw cmVjb25uZWN0IGNhY2hlIGtleS4gT3RoZXJ3aXNlLCB3ZSBtaWdodCBkZWxheSB0aGUgbWFpbiBy ZXNvdXJjZSBsb2FkIG9uCisgICAgICAgIHByZWNvbm5lY3QgdW5uZWNlc3NhcmlseSBpbiBjYXNl cyB3aGVyZSB0aGUgVXNlci1BZ2VudCBtaXNtYXRjaGVzIGFuZCB0aGUgcHJlY29ubmVjdCBnZXRz CisgICAgICAgIHRocm93biBhd2F5LiBUaGlzIGNhbiBoYXBwZW4gaWYgKGZvciBpbnN0YW5jZSkg YSBwYWdlIGlzIGZvcmNlLWxvYWRlZCBpbnRvIGRlc2t0b3Agb3IgbW9iaWxlCisgICAgICAgIG1v ZGUgb24gaU9TLCB3aGljaCBjYXVzZXMgYSBVQSBjaGFuZ2UgYWZ0ZXIgdGhlIGNhbGwgdG8gZGVj aWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbi4KKworICAgICAgICAqIE5ldHdvcmtQcm9jZXNz L05ldHdvcmtMb2FkU2NoZWR1bGVyLmNwcDoKKyAgICAgICAgKFdlYktpdDo6bWFpblJlc291cmNl TG9hZEtleSk6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtMb2FkU2NoZWR1bGVyOjpzY2hlZHVs ZU1haW5SZXNvdXJjZUxvYWQpOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrTG9hZFNjaGVkdWxl cjo6dW5zY2hlZHVsZU1haW5SZXNvdXJjZUxvYWQpOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3Jr TG9hZFNjaGVkdWxlcjo6c3RhcnRlZFByZWNvbm5lY3RGb3JNYWluUmVzb3VyY2UpOgorICAgICAg ICAoV2ViS2l0OjpOZXR3b3JrTG9hZFNjaGVkdWxlcjo6ZmluaXNoZWRQcmVjb25uZWN0Rm9yTWFp blJlc291cmNlKToKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9OZXR3b3JrTG9hZFNjaGVkdWxl ci5oOgorICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL05ldHdvcmtQcm9jZXNzLmNwcDoKKyAgICAg ICAgKFdlYktpdDo6TmV0d29ya1Byb2Nlc3M6OnByZWNvbm5lY3RUbyk6CisKIDIwMjEtMDktMjQg IERldmluIFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29tPgogCiAgICAgICAgIEFkZCB0eXBlY2hl Y2tpbmcgYGlzYCBvdmVybG9hZHMgZm9yIGBzdGQ6OnVuaXF1ZV9wdHJgLCBgV1RGOjpVbmlxdWVS ZWZgLCBhbmQgYFdURjo6V2Vha1B0cmAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29y a1Byb2Nlc3MvTmV0d29ya0xvYWRTY2hlZHVsZXIuY3BwIGIvU291cmNlL1dlYktpdC9OZXR3b3Jr UHJvY2Vzcy9OZXR3b3JrTG9hZFNjaGVkdWxlci5jcHAKaW5kZXggNzg4NGNkNzRjM2YwNzMzZWJk MjVkM2VkNmI5NmQ3MzVjODEwMGFjNC4uZTFlMzc0MDU2ZThlZGVhNjg3NGExMjFjNjM0ZDVlYjNi Y2E5ZDRlZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3Jr TG9hZFNjaGVkdWxlci5jcHAKKysrIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3 b3JrTG9hZFNjaGVkdWxlci5jcHAKQEAgLTE1Myw2ICsxNTMsMTMgQEAgdm9pZCBOZXR3b3JrTG9h ZFNjaGVkdWxlcjo6dW5zY2hlZHVsZUxvYWQoTmV0d29ya0xvYWQmIGxvYWQpCiAgICAgICAgIGNv bnRleHQtPnVuc2NoZWR1bGUobG9hZCk7CiB9CiAKKy8vIFdlIGFkZCBVc2VyLUFnZW50IHRvIHRo ZSBwcmVjb25uZWN0IGtleSBzaW5jZSBpdCBwYXJ0IG9mIHRoZSBIVFRQIGNvbm5lY3Rpb24gY2Fj aGUga2V5IHVzZWQgZm9yCisvLyBjb2FsZXNjaW5nIHNvY2tldHMgaW4gQ0ZOZXR3b3JrIHdoZW4g dXNpbmcgYW4gSFRUUFMgcHJveHkgKDxyZGFyOi8vcHJvYmxlbS81OTQzNDE2Nj4pLgorc3RhdGlj IHN0ZDo6dHVwbGU8U3RyaW5nLCBTdHJpbmc+IG1haW5SZXNvdXJjZUxvYWRLZXkoY29uc3QgU3Ry aW5nJiBwcm90b2NvbEhvc3RBbmRQb3J0LCBjb25zdCBTdHJpbmcmIHVzZXJBZ2VudCkKK3sKKyAg ICByZXR1cm4gc3RkOjptYWtlX3R1cGxlKHByb3RvY29sSG9zdEFuZFBvcnQuaXNOdWxsKCkgPyBl bXB0eVN0cmluZygpIDogcHJvdG9jb2xIb3N0QW5kUG9ydCwgdXNlckFnZW50LmlzTnVsbCgpID8g ZW1wdHlTdHJpbmcoKSA6IHVzZXJBZ2VudCk7Cit9CisKIHZvaWQgTmV0d29ya0xvYWRTY2hlZHVs ZXI6OnNjaGVkdWxlTWFpblJlc291cmNlTG9hZChOZXR3b3JrTG9hZCYgbG9hZCkKIHsKICAgICBT dHJpbmcgcHJvdG9jb2xIb3N0QW5kUG9ydCA9IGxvYWQudXJsKCkucHJvdG9jb2xIb3N0QW5kUG9y dCgpOwpAQCAtMTYxLDcgKzE2OCw3IEBAIHZvaWQgTmV0d29ya0xvYWRTY2hlZHVsZXI6OnNjaGVk dWxlTWFpblJlc291cmNlTG9hZChOZXR3b3JrTG9hZCYgbG9hZCkKICAgICAgICAgcmV0dXJuOwog ICAgIH0KIAotICAgIGF1dG8gaXRlciA9IG1fcGVuZGluZ01haW5SZXNvdXJjZVByZWNvbm5lY3Rz LmZpbmQocHJvdG9jb2xIb3N0QW5kUG9ydCk7CisgICAgYXV0byBpdGVyID0gbV9wZW5kaW5nTWFp blJlc291cmNlUHJlY29ubmVjdHMuZmluZChtYWluUmVzb3VyY2VMb2FkS2V5KHByb3RvY29sSG9z dEFuZFBvcnQsIGxvYWQucGFyYW1ldGVycygpLnJlcXVlc3QuaHR0cFVzZXJBZ2VudCgpKSk7CiAg ICAgaWYgKGl0ZXIgPT0gbV9wZW5kaW5nTWFpblJlc291cmNlUHJlY29ubmVjdHMuZW5kKCkpIHsK ICAgICAgICAgbG9hZC5zdGFydCgpOwogICAgICAgICByZXR1cm47CkBAIC0xODUsNyArMTkyLDcg QEAgdm9pZCBOZXR3b3JrTG9hZFNjaGVkdWxlcjo6dW5zY2hlZHVsZU1haW5SZXNvdXJjZUxvYWQo TmV0d29ya0xvYWQmIGxvYWQsIGNvbnN0IFcKICAgICBpZiAobWV0cmljcykKICAgICAgICAgdXBk YXRlT3JpZ2luUHJvdG9jb2xJbmZvKHByb3RvY29sSG9zdEFuZFBvcnQsIG1ldHJpY3MtPnByb3Rv Y29sKTsKIAotICAgIGF1dG8gaXRlciA9IG1fcGVuZGluZ01haW5SZXNvdXJjZVByZWNvbm5lY3Rz LmZpbmQocHJvdG9jb2xIb3N0QW5kUG9ydCk7CisgICAgYXV0byBpdGVyID0gbV9wZW5kaW5nTWFp blJlc291cmNlUHJlY29ubmVjdHMuZmluZChtYWluUmVzb3VyY2VMb2FkS2V5KHByb3RvY29sSG9z dEFuZFBvcnQsIGxvYWQucGFyYW1ldGVycygpLnJlcXVlc3QuaHR0cFVzZXJBZ2VudCgpKSk7CiAg ICAgaWYgKGl0ZXIgPT0gbV9wZW5kaW5nTWFpblJlc291cmNlUHJlY29ubmVjdHMuZW5kKCkpCiAg ICAgICAgIHJldHVybjsKIApAQCAtMTk0LDkgKzIwMSwxMCBAQCB2b2lkIE5ldHdvcmtMb2FkU2No ZWR1bGVyOjp1bnNjaGVkdWxlTWFpblJlc291cmNlTG9hZChOZXR3b3JrTG9hZCYgbG9hZCwgY29u c3QgVwogICAgICAgICBtYXliZVBydW5lUHJlY29ubmVjdEluZm8oaXRlcik7CiB9CiAKLXZvaWQg TmV0d29ya0xvYWRTY2hlZHVsZXI6OnN0YXJ0ZWRQcmVjb25uZWN0Rm9yTWFpblJlc291cmNlKGNv bnN0IFVSTCYgdXJsKQordm9pZCBOZXR3b3JrTG9hZFNjaGVkdWxlcjo6c3RhcnRlZFByZWNvbm5l Y3RGb3JNYWluUmVzb3VyY2UoY29uc3QgVVJMJiB1cmwsIGNvbnN0IFN0cmluZyYgdXNlckFnZW50 KQogewotICAgIGF1dG8gaXRlciA9IG1fcGVuZGluZ01haW5SZXNvdXJjZVByZWNvbm5lY3RzLmZp bmQodXJsLnByb3RvY29sSG9zdEFuZFBvcnQoKSk7CisgICAgYXV0byBrZXkgPSBtYWluUmVzb3Vy Y2VMb2FkS2V5KHVybC5wcm90b2NvbEhvc3RBbmRQb3J0KCksIHVzZXJBZ2VudCk7CisgICAgYXV0 byBpdGVyID0gbV9wZW5kaW5nTWFpblJlc291cmNlUHJlY29ubmVjdHMuZmluZChrZXkpOwogICAg IGlmIChpdGVyICE9IG1fcGVuZGluZ01haW5SZXNvdXJjZVByZWNvbm5lY3RzLmVuZCgpKSB7CiAg ICAgICAgIFBlbmRpbmdNYWluUmVzb3VyY2VQcmVjb25uZWN0SW5mbyYgaW5mbyA9IGl0ZXItPnZh bHVlOwogICAgICAgICBpbmZvLnBlbmRpbmdQcmVjb25uZWN0cysrOwpAQCAtMjA0LDEyICsyMTIs MTIgQEAgdm9pZCBOZXR3b3JrTG9hZFNjaGVkdWxlcjo6c3RhcnRlZFByZWNvbm5lY3RGb3JNYWlu UmVzb3VyY2UoY29uc3QgVVJMJiB1cmwpCiAgICAgfQogCiAgICAgUGVuZGluZ01haW5SZXNvdXJj ZVByZWNvbm5lY3RJbmZvIGluZm87Ci0gICAgbV9wZW5kaW5nTWFpblJlc291cmNlUHJlY29ubmVj dHMuYWRkKHVybC5wcm90b2NvbEhvc3RBbmRQb3J0KCksIFdURk1vdmUoaW5mbykpOworICAgIG1f cGVuZGluZ01haW5SZXNvdXJjZVByZWNvbm5lY3RzLmFkZChrZXksIFdURk1vdmUoaW5mbykpOwog fQogCi12b2lkIE5ldHdvcmtMb2FkU2NoZWR1bGVyOjpmaW5pc2hlZFByZWNvbm5lY3RGb3JNYWlu UmVzb3VyY2UoY29uc3QgVVJMJiB1cmwsIGNvbnN0IFdlYkNvcmU6OlJlc291cmNlRXJyb3ImIGVy cm9yKQordm9pZCBOZXR3b3JrTG9hZFNjaGVkdWxlcjo6ZmluaXNoZWRQcmVjb25uZWN0Rm9yTWFp blJlc291cmNlKGNvbnN0IFVSTCYgdXJsLCBjb25zdCBTdHJpbmcmIHVzZXJBZ2VudCwgY29uc3Qg V2ViQ29yZTo6UmVzb3VyY2VFcnJvciYgZXJyb3IpCiB7Ci0gICAgYXV0byBpdGVyID0gbV9wZW5k aW5nTWFpblJlc291cmNlUHJlY29ubmVjdHMuZmluZCh1cmwucHJvdG9jb2xIb3N0QW5kUG9ydCgp KTsKKyAgICBhdXRvIGl0ZXIgPSBtX3BlbmRpbmdNYWluUmVzb3VyY2VQcmVjb25uZWN0cy5maW5k KG1haW5SZXNvdXJjZUxvYWRLZXkodXJsLnByb3RvY29sSG9zdEFuZFBvcnQoKSwgdXNlckFnZW50 KSk7CiAgICAgaWYgKGl0ZXIgPT0gbV9wZW5kaW5nTWFpblJlc291cmNlUHJlY29ubmVjdHMuZW5k KCkpCiAgICAgICAgIHJldHVybjsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9OZXR3b3Jr UHJvY2Vzcy9OZXR3b3JrTG9hZFNjaGVkdWxlci5oIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJv Y2Vzcy9OZXR3b3JrTG9hZFNjaGVkdWxlci5oCmluZGV4IGUwODBhMThkMmYwMmUyODY3OWZiNDQ2 ZDFhOTdhNGI2NGQ4Y2U4MmUuLmQyNWU2Yzg0ZTZjZjFmMzU2OTJmZjNjZDc1OTBkMDhhNmEyY2Vm ZTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya0xvYWRT Y2hlZHVsZXIuaAorKysgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtMb2Fk U2NoZWR1bGVyLmgKQEAgLTI4LDYgKzI4LDcgQEAKICNpbmNsdWRlIDxXZWJDb3JlL0xvYWRTY2hl ZHVsaW5nTW9kZS5oPgogI2luY2x1ZGUgPFdlYkNvcmUvTmV0d29ya0xvYWRNZXRyaWNzLmg+CiAj aW5jbHVkZSA8V2ViQ29yZS9QYWdlSWRlbnRpZmllci5oPgorI2luY2x1ZGUgPHR1cGxlPgogI2lu Y2x1ZGUgPHd0Zi9IYXNoTWFwLmg+CiAjaW5jbHVkZSA8d3RmL0hhc2hTZXQuaD4KICNpbmNsdWRl IDx3dGYvTGlzdEhhc2hTZXQuaD4KQEAgLTUwLDggKzUxLDggQEAgcHVibGljOgogICAgIHZvaWQg c2NoZWR1bGUoTmV0d29ya0xvYWQmKTsKICAgICB2b2lkIHVuc2NoZWR1bGUoTmV0d29ya0xvYWQm LCBjb25zdCBXZWJDb3JlOjpOZXR3b3JrTG9hZE1ldHJpY3MqID0gbnVsbHB0cik7CiAKLSAgICB2 b2lkIHN0YXJ0ZWRQcmVjb25uZWN0Rm9yTWFpblJlc291cmNlKGNvbnN0IFVSTCYpOwotICAgIHZv aWQgZmluaXNoZWRQcmVjb25uZWN0Rm9yTWFpblJlc291cmNlKGNvbnN0IFVSTCYsIGNvbnN0IFdl YkNvcmU6OlJlc291cmNlRXJyb3ImKTsKKyAgICB2b2lkIHN0YXJ0ZWRQcmVjb25uZWN0Rm9yTWFp blJlc291cmNlKGNvbnN0IFVSTCYsIGNvbnN0IFN0cmluZyYgdXNlckFnZW50KTsKKyAgICB2b2lk IGZpbmlzaGVkUHJlY29ubmVjdEZvck1haW5SZXNvdXJjZShjb25zdCBVUkwmLCBjb25zdCBTdHJp bmcmIHVzZXJBZ2VudCwgY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VFcnJvciYpOwogCiAgICAgdm9p ZCBzZXRSZXNvdXJjZUxvYWRTY2hlZHVsaW5nTW9kZShXZWJDb3JlOjpQYWdlSWRlbnRpZmllciwg V2ViQ29yZTo6TG9hZFNjaGVkdWxpbmdNb2RlKTsKICAgICB2b2lkIHByaW9yaXRpemVMb2Fkcyhj b25zdCBWZWN0b3I8TmV0d29ya0xvYWQqPiYpOwpAQCAtNzcsNyArNzgsOCBAQCBwcml2YXRlOgog ICAgICAgICB1bnNpZ25lZCBwZW5kaW5nUHJlY29ubmVjdHMgezF9OwogICAgICAgICBMaXN0SGFz aFNldDxOZXR3b3JrTG9hZCAqPiBwZW5kaW5nTG9hZHM7CiAgICAgfTsKLSAgICB1c2luZyBQZW5k aW5nUHJlY29ubmVjdE1hcCA9IEhhc2hNYXA8U3RyaW5nLCBQZW5kaW5nTWFpblJlc291cmNlUHJl Y29ubmVjdEluZm8+OworICAgIC8vIE1hcHMgKHByb3RvY29sSG9zdEFuZFBvcnQsIHVzZXJBZ2Vu dCkgPT4gUGVuZGluZ01haW5SZXNvdXJjZVByZWNvbm5lY3RJbmZvLgorICAgIHVzaW5nIFBlbmRp bmdQcmVjb25uZWN0TWFwID0gSGFzaE1hcDxzdGQ6OnR1cGxlPFN0cmluZywgU3RyaW5nPiwgUGVu ZGluZ01haW5SZXNvdXJjZVByZWNvbm5lY3RJbmZvPjsKICAgICBQZW5kaW5nUHJlY29ubmVjdE1h cCBtX3BlbmRpbmdNYWluUmVzb3VyY2VQcmVjb25uZWN0czsKIAogICAgIHZvaWQgbWF5YmVQcnVu ZVByZWNvbm5lY3RJbmZvKFBlbmRpbmdQcmVjb25uZWN0TWFwOjppdGVyYXRvciYpOwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUHJvY2Vzcy5jcHAgYi9T b3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtQcm9jZXNzLmNwcAppbmRleCA5N2Jk ZDRmODIzNzM2YzNiNjdiNDVmMzM4MDY3YzAyNmUwNmNjM2VhLi4xYzA1OGFlMDg0MTg3YzVjYTRj MjljZTA0ZGJlMmRkZWYyODE5MzNlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQ cm9jZXNzL05ldHdvcmtQcm9jZXNzLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9j ZXNzL05ldHdvcmtQcm9jZXNzLmNwcApAQCAtMTQwMSw5ICsxNDAxLDkgQEAgdm9pZCBOZXR3b3Jr UHJvY2Vzczo6cHJlY29ubmVjdFRvKFBBTDo6U2Vzc2lvbklEIHNlc3Npb25JRCwgV2ViUGFnZVBy b3h5SWRlbnRpZmkKICAgICBwYXJhbWV0ZXJzLnN0b3JlZENyZWRlbnRpYWxzUG9saWN5ID0gc3Rv cmVkQ3JlZGVudGlhbHNQb2xpY3k7CiAgICAgcGFyYW1ldGVycy5zaG91bGRQcmVjb25uZWN0T25s eSA9IFByZWNvbm5lY3RPbmx5OjpZZXM7CiAKLSAgICBuZXR3b3JrU2Vzc2lvbi0+bmV0d29ya0xv YWRTY2hlZHVsZXIoKS5zdGFydGVkUHJlY29ubmVjdEZvck1haW5SZXNvdXJjZSh1cmwpOwotICAg IGF1dG8gdGFzayA9IG5ldyBQcmVjb25uZWN0VGFzaygqbmV0d29ya1Nlc3Npb24sIFdURk1vdmUo cGFyYW1ldGVycyksIFtuZXR3b3JrU2Vzc2lvbiwgdXJsXShjb25zdCBXZWJDb3JlOjpSZXNvdXJj ZUVycm9yJiBlcnJvcikgewotICAgICAgICBuZXR3b3JrU2Vzc2lvbi0+bmV0d29ya0xvYWRTY2hl ZHVsZXIoKS5maW5pc2hlZFByZWNvbm5lY3RGb3JNYWluUmVzb3VyY2UodXJsLCBlcnJvcik7Cisg ICAgbmV0d29ya1Nlc3Npb24tPm5ldHdvcmtMb2FkU2NoZWR1bGVyKCkuc3RhcnRlZFByZWNvbm5l Y3RGb3JNYWluUmVzb3VyY2UodXJsLCB1c2VyQWdlbnQpOworICAgIGF1dG8gdGFzayA9IG5ldyBQ cmVjb25uZWN0VGFzaygqbmV0d29ya1Nlc3Npb24sIFdURk1vdmUocGFyYW1ldGVycyksIFtuZXR3 b3JrU2Vzc2lvbiwgdXJsLCB1c2VyQWdlbnRdKGNvbnN0IFdlYkNvcmU6OlJlc291cmNlRXJyb3Im IGVycm9yKSB7CisgICAgICAgIG5ldHdvcmtTZXNzaW9uLT5uZXR3b3JrTG9hZFNjaGVkdWxlcigp LmZpbmlzaGVkUHJlY29ubmVjdEZvck1haW5SZXNvdXJjZSh1cmwsIHVzZXJBZ2VudCwgZXJyb3Ip OwogICAgIH0pOwogICAgIHRhc2stPnNldFRpbWVvdXQoMTBfcyk7CiAgICAgdGFzay0+c3RhcnQo KTsK