224530 2021-04-13 22:33:41 -0700 Wait until thread exits in CrossThreadTaskHandler::kill() 2021-04-20 22:34:14 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified NEW InRadar P2 Normal --- 1 sihui_liu sihui_liu achristensen beidson benjamin cdumez cmarcelo ews-watchlist ggaren webkit-bug-importer oldest_to_newest 1750008 0 sihui_liu 2021-04-13 22:33:41 -0700 ... 1750013 1 425954 sihui_liu 2021-04-13 23:07:39 -0700 Created attachment 425954 Patch 1750015 2 425954 cdumez 2021-04-13 23:17:05 -0700 Comment on attachment 425954 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=425954&action=review > Source/WTF/ChangeLog:7 > + Please explain WHY you are making this change. 1750181 3 425997 sihui_liu 2021-04-14 10:18:29 -0700 Created attachment 425997 Patch 1750182 4 sihui_liu 2021-04-14 10:18:52 -0700 (In reply to Chris Dumez from comment #2) > Comment on attachment 425954 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=425954&action=review > > > Source/WTF/ChangeLog:7 > > + > > Please explain WHY you are making this change. Added. 1750189 5 425997 cdumez 2021-04-14 10:30:09 -0700 Comment on attachment 425997 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=425997&action=review > Source/WebKit/NetworkProcess/IndexedDB/WebIDBServer.cpp:425 > + CrossThreadTaskHandler::kill(); I have several concerns about this patch: 1. The verb "kill", to me, is not really associated with "wait for remaining tasks to be processed and wait for thread to exit" 2. The new code hangs the NetworkProcess's main thread on a background thread that is used for database activity (such activity likely includes going to disk). I don't think it is ever OK to hang the main thread on such operations. I am all for making the code safe but making the code safe by hanging the main thread does not seem like a good trade-off. 1750229 6 sihui_liu 2021-04-14 11:00:08 -0700 (In reply to Chris Dumez from comment #5) > Comment on attachment 425997 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=425997&action=review > > > Source/WebKit/NetworkProcess/IndexedDB/WebIDBServer.cpp:425 > > + CrossThreadTaskHandler::kill(); > > I have several concerns about this patch: > 1. The verb "kill", to me, is not really associated with "wait for remaining > tasks to be processed and wait for thread to exit" I think so too; can rename it to something like waitUntilFinished(). > 2. The new code hangs the NetworkProcess's main thread on a background > thread that is used for database activity (such activity likely includes > going to disk). I don't think it is ever OK to hang the main thread on such > operations. > ah, I don't think this is a big concern for database thread because WebIDBServer (the only user of CrossThreadTaskHandler for now) is removed in 2 cases: 1. it's idle, no pending tasks or IDB connection from web process. This means the kill operation should be very quick. 2. network process is about to be destroyed (NetworkProcess::didClose). I guess network process does not matter so much at this point. > I am all for making the code safe but making the code safe by hanging the > main thread does not seem like a good trade-off. 1750236 7 426017 sihui_liu 2021-04-14 11:13:15 -0700 Created attachment 426017 Patch 1750337 8 426017 cdumez 2021-04-14 14:30:08 -0700 Comment on attachment 426017 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=426017&action=review > Source/WTF/ChangeLog:9 > + 1. CrossThreadQueue<DataType>::waitForMessage() expects a new task before checking m_killed CrossThreadQueue<DataType>::waitForMessage() should probably be fixed so that it checked m_killed when woken up: - while (found == m_queue.end()) { + while (!m_killed && found == m_queue.end()) { 1752639 9 webkit-bug-importer 2021-04-20 22:34:14 -0700 <rdar://problem/76938794> 425954 2021-04-13 23:07:39 -0700 2021-04-14 10:18:27 -0700 Patch bug-224530-20210413230738.patch text/plain 5037 sihui_liu U3VidmVyc2lvbiBSZXZpc2lvbjogMjc1ODkyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IDg1YWNjOTM1YWMyOWNkNGIwNWJkMmQ2 MjY2MjlkOTkzODVjMGM4MmYuLjk0MmMyZDNjMWUxMDFjNjQ3ZGY2Yjc5ODQ4YmI5ZWVjMTIxZTg0 M2EgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMjEtMDQtMTMgIFNpaHVpIExpdSAgPHNpaHVpX2xp dUBhcHBsZS5jb20+CisKKyAgICAgICAgV2FpdCB1bnRpbCB0aHJlYWQgZXhpdHMgaW4gQ3Jvc3NU aHJlYWRUYXNrSGFuZGxlcjo6a2lsbCgpCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0yMjQ1MzAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICAqIHd0Zi9Dcm9zc1RocmVhZFRhc2tIYW5kbGVyLmNwcDoKKyAgICAg ICAgKFdURjo6Q3Jvc3NUaHJlYWRUYXNrSGFuZGxlcjo6Q3Jvc3NUaHJlYWRUYXNrSGFuZGxlcik6 CisgICAgICAgIChXVEY6OkNyb3NzVGhyZWFkVGFza0hhbmRsZXI6On5Dcm9zc1RocmVhZFRhc2tI YW5kbGVyKToKKyAgICAgICAgKFdURjo6Q3Jvc3NUaHJlYWRUYXNrSGFuZGxlcjo6a2lsbCk6Cisg ICAgICAgIChXVEY6OkNyb3NzVGhyZWFkVGFza0hhbmRsZXI6OnNldENvbXBsZXRpb25DYWxsYmFj ayk6IERlbGV0ZWQuCisgICAgICAgICogd3RmL0Nyb3NzVGhyZWFkVGFza0hhbmRsZXIuaDoKKwog MjAyMS0wNC0xMiAgQmFzdWtlIFN1enVraSAgPGJhc3VrZS5zdXp1a2lAc29ueS5jb20+CiAKICAg ICAgICAgW1BsYXlTdGF0aW9uXSBFbmFibGUgV1RGQ3Jhc2hXaXRoSW5mbyBpbXBsZW1lbnRhdGlv bgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZwppbmRleCA2NmVhOTQxNzA4YzM4Y2U0Y2FjMGExYjBiY2Y3MGQ2NzA3MDA0Njc0Li4w OWJjZmU0Zjc1ZmZlMTQxNGQxZDFiMzk3ODQ0YTIzYjI4YjNiODI2IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwpAQCAtMSwz ICsxLDEzIEBACisyMDIxLTA0LTEzICBTaWh1aSBMaXUgIDxzaWh1aV9saXVAYXBwbGUuY29tPgor CisgICAgICAgIFdhaXQgdW50aWwgdGhyZWFkIGV4aXRzIGluIENyb3NzVGhyZWFkVGFza0hhbmRs ZXI6OmtpbGwoKQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MjI0NTMwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgKiBOZXR3b3JrUHJvY2Vzcy9JbmRleGVkREIvV2ViSURCU2VydmVyLmNwcDoKKyAgICAgICAg KFdlYktpdDo6V2ViSURCU2VydmVyOjpjbG9zZSk6IFBvc3QgYSBjbGVhbnVwIHRhc2sgdG8gdGhy ZWFkLgorCiAyMDIxLTA0LTEzICBDb21taXQgUXVldWUgIDxjb21taXQtcXVldWVAd2Via2l0Lm9y Zz4KIAogICAgICAgICBVbnJldmlld2VkLCByZXZlcnRpbmcgcjI3NTg4OS4KZGlmZiAtLWdpdCBh L1NvdXJjZS9XVEYvd3RmL0Nyb3NzVGhyZWFkVGFza0hhbmRsZXIuY3BwIGIvU291cmNlL1dURi93 dGYvQ3Jvc3NUaHJlYWRUYXNrSGFuZGxlci5jcHAKaW5kZXggZTY5MDc1OWYwNWNjM2U5ZjdhNTA4 M2E5YWZjNDZmODc2NGUzYzRkMS4uNmE2NWJhNDM2ZGM0NjkzYTMyNWU4NmY2NTA0ZGUyMWRmNDI2 N2Y0ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dURi93dGYvQ3Jvc3NUaHJlYWRUYXNrSGFuZGxlci5j cHAKKysrIGIvU291cmNlL1dURi93dGYvQ3Jvc3NUaHJlYWRUYXNrSGFuZGxlci5jcHAKQEAgLTM1 LDE3ICszNSwxNSBAQCBDcm9zc1RocmVhZFRhc2tIYW5kbGVyOjpDcm9zc1RocmVhZFRhc2tIYW5k bGVyKGNvbnN0IGNoYXIqIHRocmVhZE5hbWUsIEF1dG9kcmFpbgogewogICAgIEFTU0VSVChpc01h aW5UaHJlYWQoKSk7CiAgICAgTG9ja2VyPExvY2s+IGxvY2tlcihtX3Rhc2tUaHJlYWRDcmVhdGlv bkxvY2spOwotICAgIFRocmVhZDo6Y3JlYXRlKHRocmVhZE5hbWUsIFt0aGlzXSB7CisgICAgbV90 aHJlYWQgPSBUaHJlYWQ6OmNyZWF0ZSh0aHJlYWROYW1lLCBbdGhpc10gewogICAgICAgICB0YXNr UnVuTG9vcCgpOwotCi0gICAgICAgIGlmIChtX2NvbXBsZXRpb25DYWxsYmFjaykKLSAgICAgICAg ICAgIG1fY29tcGxldGlvbkNhbGxiYWNrKCk7Ci0gICAgfSktPmRldGFjaCgpOworICAgIH0pOwog fQogCiBDcm9zc1RocmVhZFRhc2tIYW5kbGVyOjp+Q3Jvc3NUaHJlYWRUYXNrSGFuZGxlcigpCiB7 CiAgICAgQVNTRVJUKGlzTWFpblRocmVhZCgpKTsKKyAgICBBU1NFUlQoIW1fdGhyZWFkKTsKIH0K IAogdm9pZCBDcm9zc1RocmVhZFRhc2tIYW5kbGVyOjpwb3N0VGFzayhDcm9zc1RocmVhZFRhc2sm JiB0YXNrKQpAQCAtOTIsMTUgKzkwLDIyIEBAIHZvaWQgQ3Jvc3NUaHJlYWRUYXNrSGFuZGxlcjo6 aGFuZGxlVGFza1JlcGxpZXNPbk1haW5UaHJlYWQoKQogICAgICAgICB0YXNrLT5wZXJmb3JtVGFz aygpOwogfQogCi12b2lkIENyb3NzVGhyZWFkVGFza0hhbmRsZXI6OnNldENvbXBsZXRpb25DYWxs YmFjayhGdW5jdGlvbjx2b2lkICgpPiYmIGNvbXBsZXRpb25DYWxsYmFjaykKLXsKLSAgICBtX2Nv bXBsZXRpb25DYWxsYmFjayA9IFdURk1vdmUoY29tcGxldGlvbkNhbGxiYWNrKTsKLX0KLQogdm9p ZCBDcm9zc1RocmVhZFRhc2tIYW5kbGVyOjpraWxsKCkKIHsKLSAgICBtX3Rhc2tRdWV1ZS5raWxs KCk7Ci0gICAgbV90YXNrUmVwbHlRdWV1ZS5raWxsKCk7CisgICAgQVNTRVJUKGlzTWFpblRocmVh ZCgpKTsKKyAgICBBU1NFUlQobV90aHJlYWQpOworCisgICAgcG9zdFRhc2soQ3Jvc3NUaHJlYWRU YXNrKFt0aGlzXSgpIHsKKyAgICAgICAgbV90YXNrUXVldWUua2lsbCgpOworICAgICAgICBtX3Rh c2tSZXBseVF1ZXVlLmtpbGwoKTsKKyAgICB9KSk7CisKKyAgICBtX3RocmVhZC0+d2FpdEZvckNv bXBsZXRpb24oKTsKKworICAgIEFTU0VSVChtX3Rhc2tRdWV1ZS5pc0tpbGxlZCgpKTsKKyAgICBB U1NFUlQobV90YXNrUmVwbHlRdWV1ZS5pc0tpbGxlZCgpKTsKKworICAgIG1fdGhyZWFkID0gbnVs bHB0cjsKIH0KIAogfSAvLyBuYW1lc3BhY2UgV1RGCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL3d0 Zi9Dcm9zc1RocmVhZFRhc2tIYW5kbGVyLmggYi9Tb3VyY2UvV1RGL3d0Zi9Dcm9zc1RocmVhZFRh c2tIYW5kbGVyLmgKaW5kZXggODYzYWM2ZGM1ODQ4YjhmZDY0MWE0MzQ1OWFjOWVhYzc4MDBkZWRh Yy4uNzQ4NDlhZjMyZTkwOGFlNTQyYzk1ZTcwYmNlZjNkOGZkMDNmOTQwZSAxMDA2NDQKLS0tIGEv U291cmNlL1dURi93dGYvQ3Jvc3NUaHJlYWRUYXNrSGFuZGxlci5oCisrKyBiL1NvdXJjZS9XVEYv d3RmL0Nyb3NzVGhyZWFkVGFza0hhbmRsZXIuaApAQCAtNDcsNyArNDcsNiBAQCBwcm90ZWN0ZWQ6 CiAgICAgV1RGX0VYUE9SVF9QUklWQVRFIHZvaWQgcG9zdFRhc2tSZXBseShDcm9zc1RocmVhZFRh c2smJik7CiAKICAgICBXVEZfRVhQT1JUX1BSSVZBVEUgdm9pZCBraWxsKCk7Ci0gICAgV1RGX0VY UE9SVF9QUklWQVRFIHZvaWQgc2V0Q29tcGxldGlvbkNhbGxiYWNrKEZ1bmN0aW9uPHZvaWQgKCk+ JiYpOwogCiBwcml2YXRlOgogICAgIHZvaWQgaGFuZGxlVGFza1JlcGxpZXNPbk1haW5UaHJlYWQo KTsKQEAgLTYyLDcgKzYxLDcgQEAgcHJpdmF0ZToKICAgICBDcm9zc1RocmVhZFF1ZXVlPENyb3Nz VGhyZWFkVGFzaz4gbV90YXNrUXVldWU7CiAgICAgQ3Jvc3NUaHJlYWRRdWV1ZTxDcm9zc1RocmVh ZFRhc2s+IG1fdGFza1JlcGx5UXVldWU7CiAKLSAgICBGdW5jdGlvbjx2b2lkICgpPiBtX2NvbXBs ZXRpb25DYWxsYmFjazsKKyAgICBSZWZQdHI8VGhyZWFkPiBtX3RocmVhZDsKIH07CiAKIH0gLy8g bmFtZXNwYWNlIFdURgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9J bmRleGVkREIvV2ViSURCU2VydmVyLmNwcCBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mv SW5kZXhlZERCL1dlYklEQlNlcnZlci5jcHAKaW5kZXggMDI4Y2I1Mzc4YWUyNDY3MWNkNjJhNjE0 ZWY5NzAzY2M2NjE0MmI0NC4uNWVmOWIxYjk5NzM2NmFjODRhMjFlOWM2ZTRkNDkwNDRkNTMyZThh ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9JbmRleGVkREIvV2Vi SURCU2VydmVyLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL0luZGV4ZWRE Qi9XZWJJREJTZXJ2ZXIuY3BwCkBAIC00MTUsMTkgKzQxNSwxNCBAQCB2b2lkIFdlYklEQlNlcnZl cjo6Y2xvc2UoKQogICAgIGZvciAoYXV0byogY29ubmVjdGlvbiA6IG1fY29ubmVjdGlvbnMpCiAg ICAgICAgIGNvbm5lY3Rpb24tPnJlbW92ZVRocmVhZE1lc3NhZ2VSZWNlaXZlcihNZXNzYWdlczo6 V2ViSURCU2VydmVyOjptZXNzYWdlUmVjZWl2ZXJOYW1lKCkpOwogCi0gICAgQ3Jvc3NUaHJlYWRU YXNrSGFuZGxlcjo6c2V0Q29tcGxldGlvbkNhbGxiYWNrKFtwcm90ZWN0ZWRUaGlzID0gbWFrZVJl ZigqdGhpcyldKCkgbXV0YWJsZSB7Ci0gICAgICAgIEFTU0VSVCghUnVuTG9vcDo6aXNNYWluKCkp OwotICAgICAgICBjYWxsT25NYWluUnVuTG9vcChbcHJvdGVjdGVkVGhpcyA9IFdURk1vdmUocHJv dGVjdGVkVGhpcyldKCkgbXV0YWJsZSB7IH0pOwotICAgIH0pOwotCi0gICAgcG9zdFRhc2soW3Ro aXNdKCkgbXV0YWJsZSB7CisgICAgcG9zdFRhc2soW3RoaXMsIHByb3RlY3RlZFRoaXMgPSBtYWtl UmVmKCp0aGlzKV0oKSBtdXRhYmxlIHsKICAgICAgICAgbV9jb25uZWN0aW9uTWFwLmNsZWFyKCk7 CiAKICAgICAgICAgTG9ja0hvbGRlciBsb2NrZXIobV9zZXJ2ZXJMb2NrKTsKICAgICAgICAgbV9z ZXJ2ZXIgPSBudWxscHRyOwotICAgICAgICBDcm9zc1RocmVhZFRhc2tIYW5kbGVyOjpraWxsKCk7 CiAgICAgfSk7CiAKKyAgICBDcm9zc1RocmVhZFRhc2tIYW5kbGVyOjpraWxsKCk7CiAgICAgbV9j bG9zZUNhbGxiYWNrKCk7CiB9CiAK 425997 2021-04-14 10:18:29 -0700 2021-04-14 11:13:12 -0700 Patch bug-224530-20210414101828.patch text/plain 6488 sihui_liu U3VidmVyc2lvbiBSZXZpc2lvbjogMjc1ODkyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IDg1YWNjOTM1YWMyOWNkNGIwNWJkMmQ2 MjY2MjlkOTkzODVjMGM4MmYuLjdlZDAxZmYyYzg5YjgyMGE4YWNmNjUzYzZjNjdjMDcxMGRmNzQ3 YmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMzUgQEAKKzIwMjEtMDQtMTMgIFNpaHVpIExpdSAgPHNpaHVpX2xp dUBhcHBsZS5jb20+CisKKyAgICAgICAgV2FpdCB1bnRpbCB0aHJlYWQgZXhpdHMgaW4gQ3Jvc3NU aHJlYWRUYXNrSGFuZGxlcjo6a2lsbCgpCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0yMjQ1MzAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBXaGVuIENyb3NzVGhyZWFkVGFza0hhbmRsZXI6OmtpbGwoKSBmaW5p c2hlZCwgaXQgZGlkIG5vdCBndWFyYW50ZWUgdGhyZWFkIGV4aXRzIGJlY2F1c2U6CisgICAgICAg IDEuIENyb3NzVGhyZWFkUXVldWU8RGF0YVR5cGU+Ojp3YWl0Rm9yTWVzc2FnZSgpIGV4cGVjdHMg YSBuZXcgdGFzayBiZWZvcmUgY2hlY2tpbmcgbV9raWxsZWQKKyAgICAgICAgMi4gSXQganVzdCBz ZXQgbV9raWxsZWQsIHdoaWNoIGNhbiBiZSBjaGVja2VkIGluIENyb3NzVGhyZWFkVGFza0hhbmRs ZXI6OnRhc2tSdW5Mb29wKCkgYWZ0ZXIgY3VycmVudCB0YXNrIAorICAgICAgICBmaW5pc2hlcy4K KworICAgICAgICBUaGVyZWZvcmUsIHdlIGFkZGVkIG1fY29tcGxldGlvbkNhbGxiYWNrIHRvIENy b3NzVGhyZWFkVGFza0hhbmRsZXIsIHdoaWNoIHdvdWxkIGJlIGV4ZWN1dGVkIGFmdGVyIHRhc2tS dW5Mb29wKCksCisgICAgICAgIHRvIHNpZ25hbCB3aGVuIHRocmVhZCBpcyBhYm91dCB0byBleGl0 IGFuZCBpdCBpcyBzYWZlIHRvIGRlc3Ryb3kgQ3Jvc3NUaHJlYWRUYXNrSGFuZGxlci4gSWYgCisg ICAgICAgIENyb3NzVGhyZWFkVGFza0hhbmRsZXIgaXMgY3JlYXRlZCBvbiB0aGUgbWFpbiB0aHJl YWQsIHRoZSBvd25lciBvZiBDcm9zc1RocmVhZFRhc2tIYW5kbGVyIG5lZWRzIHRvIHNldCAKKyAg ICAgICAgbV9jb21wbGV0aW9uQ2FsbGJhY2ssIGFuZCBtYXkgbmVlZCB0byBkaXNwYXRjaCBhIHRh c2sgdG8gbWFpbiB0aHJlYWQgaW4gbV9jb21wbGV0aW9uQ2FsbGJhY2sgZm9yIGRlc3Ryb3lpbmcg aXQuIAorCisgICAgICAgIFRoaXMgaXMgY29tcGxpY2F0ZWQgYW5kIGVhc3kgdG8gZ2V0IHdyb25n LiBGb3IgZXhhbXBsZSwgaW4gTmV0d29ya1Byb2Nlc3M6OmRpZENsb3NlLCBXZWJJREJTZXJ2ZXIs IHdoaWNoIGlzIGEKKyAgICAgICAgQ3Jvc3NUaHJlYWRUYXNrSGFuZGxlciwgY2FuIGJlIGNsb3Nl ZCBhbmQgZGlzcGF0Y2ggYSB0YXNrIHRvIG1haW4gcnVubG9vcCBpbiBtX2NvbXBsZXRpb25DYWxs YmFjayBhZnRlciBtYWluIAorICAgICAgICBydW5sb29wIHN0b3BzLgorCisgICAgICAgIFRvIG1h a2UgaXQgZWFzeSBhbmQgc2FmZSwgbm93IENyb3NzVGhyZWFkVGFza0hhbmRsZXI6OmtpbGwoKSBy ZXR1cm5zIGFmdGVyIHNjaGVkdWxlZCB0YXNrcyBmaW5pc2hlcyBhbmQgdGhyZWFkCisgICAgICAg IGV4aXRzLiBOb3cgdGhlIG93bmVyIG9mIENyb3NzVGhyZWFkVGFza0hhbmRsZXIgb25seSBuZWVk cyB0byBjYWxsIGtpbGwoKS4KKworICAgICAgICAqIHd0Zi9Dcm9zc1RocmVhZFRhc2tIYW5kbGVy LmNwcDoKKyAgICAgICAgKFdURjo6Q3Jvc3NUaHJlYWRUYXNrSGFuZGxlcjo6Q3Jvc3NUaHJlYWRU YXNrSGFuZGxlcik6IE1ha2UgdGhyZWFkIGpvaW5hYmxlLgorICAgICAgICAoV1RGOjpDcm9zc1Ro cmVhZFRhc2tIYW5kbGVyOjp+Q3Jvc3NUaHJlYWRUYXNrSGFuZGxlcik6IEFkZCBhbiBhc3NlcnQg dG8gZW5zdXJlIGtpbGwoKSBpcyBjYWxsZWQuCisgICAgICAgIChXVEY6OkNyb3NzVGhyZWFkVGFz a0hhbmRsZXI6OmtpbGwpOiBQb3N0IGEgdGFzayB0byBraWxsIHF1ZXVlcyBzbyBldmVyeSBzY2hl ZHVsZWQgdGFzayB3aWxsIGJlIGV4ZWN1dGVkIGFuZAorICAgICAgICBzdGF0ZSBvZiBxdWV1ZXMg Y2FuIGJlIGNoZWNrZWQgb24gdGltZS4KKyAgICAgICAgKFdURjo6Q3Jvc3NUaHJlYWRUYXNrSGFu ZGxlcjo6c2V0Q29tcGxldGlvbkNhbGxiYWNrKTogRGVsZXRlZC4KKyAgICAgICAgKiB3dGYvQ3Jv c3NUaHJlYWRUYXNrSGFuZGxlci5oOgorCiAyMDIxLTA0LTEyICBCYXN1a2UgU3V6dWtpICA8YmFz dWtlLnN1enVraUBzb255LmNvbT4KIAogICAgICAgICBbUGxheVN0YXRpb25dIEVuYWJsZSBXVEZD cmFzaFdpdGhJbmZvIGltcGxlbWVudGF0aW9uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDY2ZWE5NDE3MDhjMzhjZTRj YWMwYTFiMGJjZjcwZDY3MDcwMDQ2NzQuLjA5YmNmZTRmNzVmZmUxNDE0ZDFkMWIzOTc4NDRhMjNi MjhiM2I4MjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMjEtMDQtMTMgIFNpaHVpIExp dSAgPHNpaHVpX2xpdUBhcHBsZS5jb20+CisKKyAgICAgICAgV2FpdCB1bnRpbCB0aHJlYWQgZXhp dHMgaW4gQ3Jvc3NUaHJlYWRUYXNrSGFuZGxlcjo6a2lsbCgpCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjQ1MzAKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL0luZGV4ZWREQi9X ZWJJREJTZXJ2ZXIuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJJREJTZXJ2ZXI6OmNsb3NlKTog UG9zdCBhIGNsZWFudXAgdGFzayB0byB0aHJlYWQuCisKIDIwMjEtMDQtMTMgIENvbW1pdCBRdWV1 ZSAgPGNvbW1pdC1xdWV1ZUB3ZWJraXQub3JnPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHJldmVy dGluZyByMjc1ODg5LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dURi93dGYvQ3Jvc3NUaHJlYWRUYXNr SGFuZGxlci5jcHAgYi9Tb3VyY2UvV1RGL3d0Zi9Dcm9zc1RocmVhZFRhc2tIYW5kbGVyLmNwcApp bmRleCBlNjkwNzU5ZjA1Y2MzZTlmN2E1MDgzYTlhZmM0NmY4NzY0ZTNjNGQxLi42YTY1YmE0MzZk YzQ2OTNhMzI1ZTg2ZjY1MDRkZTIxZGY0MjY3ZjRkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV1RGL3d0 Zi9Dcm9zc1RocmVhZFRhc2tIYW5kbGVyLmNwcAorKysgYi9Tb3VyY2UvV1RGL3d0Zi9Dcm9zc1Ro cmVhZFRhc2tIYW5kbGVyLmNwcApAQCAtMzUsMTcgKzM1LDE1IEBAIENyb3NzVGhyZWFkVGFza0hh bmRsZXI6OkNyb3NzVGhyZWFkVGFza0hhbmRsZXIoY29uc3QgY2hhciogdGhyZWFkTmFtZSwgQXV0 b2RyYWluCiB7CiAgICAgQVNTRVJUKGlzTWFpblRocmVhZCgpKTsKICAgICBMb2NrZXI8TG9jaz4g bG9ja2VyKG1fdGFza1RocmVhZENyZWF0aW9uTG9jayk7Ci0gICAgVGhyZWFkOjpjcmVhdGUodGhy ZWFkTmFtZSwgW3RoaXNdIHsKKyAgICBtX3RocmVhZCA9IFRocmVhZDo6Y3JlYXRlKHRocmVhZE5h bWUsIFt0aGlzXSB7CiAgICAgICAgIHRhc2tSdW5Mb29wKCk7Ci0KLSAgICAgICAgaWYgKG1fY29t cGxldGlvbkNhbGxiYWNrKQotICAgICAgICAgICAgbV9jb21wbGV0aW9uQ2FsbGJhY2soKTsKLSAg ICB9KS0+ZGV0YWNoKCk7CisgICAgfSk7CiB9CiAKIENyb3NzVGhyZWFkVGFza0hhbmRsZXI6On5D cm9zc1RocmVhZFRhc2tIYW5kbGVyKCkKIHsKICAgICBBU1NFUlQoaXNNYWluVGhyZWFkKCkpOwor ICAgIEFTU0VSVCghbV90aHJlYWQpOwogfQogCiB2b2lkIENyb3NzVGhyZWFkVGFza0hhbmRsZXI6 OnBvc3RUYXNrKENyb3NzVGhyZWFkVGFzayYmIHRhc2spCkBAIC05MiwxNSArOTAsMjIgQEAgdm9p ZCBDcm9zc1RocmVhZFRhc2tIYW5kbGVyOjpoYW5kbGVUYXNrUmVwbGllc09uTWFpblRocmVhZCgp CiAgICAgICAgIHRhc2stPnBlcmZvcm1UYXNrKCk7CiB9CiAKLXZvaWQgQ3Jvc3NUaHJlYWRUYXNr SGFuZGxlcjo6c2V0Q29tcGxldGlvbkNhbGxiYWNrKEZ1bmN0aW9uPHZvaWQgKCk+JiYgY29tcGxl dGlvbkNhbGxiYWNrKQotewotICAgIG1fY29tcGxldGlvbkNhbGxiYWNrID0gV1RGTW92ZShjb21w bGV0aW9uQ2FsbGJhY2spOwotfQotCiB2b2lkIENyb3NzVGhyZWFkVGFza0hhbmRsZXI6OmtpbGwo KQogewotICAgIG1fdGFza1F1ZXVlLmtpbGwoKTsKLSAgICBtX3Rhc2tSZXBseVF1ZXVlLmtpbGwo KTsKKyAgICBBU1NFUlQoaXNNYWluVGhyZWFkKCkpOworICAgIEFTU0VSVChtX3RocmVhZCk7CisK KyAgICBwb3N0VGFzayhDcm9zc1RocmVhZFRhc2soW3RoaXNdKCkgeworICAgICAgICBtX3Rhc2tR dWV1ZS5raWxsKCk7CisgICAgICAgIG1fdGFza1JlcGx5UXVldWUua2lsbCgpOworICAgIH0pKTsK KworICAgIG1fdGhyZWFkLT53YWl0Rm9yQ29tcGxldGlvbigpOworCisgICAgQVNTRVJUKG1fdGFz a1F1ZXVlLmlzS2lsbGVkKCkpOworICAgIEFTU0VSVChtX3Rhc2tSZXBseVF1ZXVlLmlzS2lsbGVk KCkpOworCisgICAgbV90aHJlYWQgPSBudWxscHRyOwogfQogCiB9IC8vIG5hbWVzcGFjZSBXVEYK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvd3RmL0Nyb3NzVGhyZWFkVGFza0hhbmRsZXIuaCBiL1Nv dXJjZS9XVEYvd3RmL0Nyb3NzVGhyZWFkVGFza0hhbmRsZXIuaAppbmRleCA4NjNhYzZkYzU4NDhi OGZkNjQxYTQzNDU5YWM5ZWFjNzgwMGRlZGFjLi43NDg0OWFmMzJlOTA4YWU1NDJjOTVlNzBiY2Vm M2Q4ZmQwM2Y5NDBlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV1RGL3d0Zi9Dcm9zc1RocmVhZFRhc2tI YW5kbGVyLmgKKysrIGIvU291cmNlL1dURi93dGYvQ3Jvc3NUaHJlYWRUYXNrSGFuZGxlci5oCkBA IC00Nyw3ICs0Nyw2IEBAIHByb3RlY3RlZDoKICAgICBXVEZfRVhQT1JUX1BSSVZBVEUgdm9pZCBw b3N0VGFza1JlcGx5KENyb3NzVGhyZWFkVGFzayYmKTsKIAogICAgIFdURl9FWFBPUlRfUFJJVkFU RSB2b2lkIGtpbGwoKTsKLSAgICBXVEZfRVhQT1JUX1BSSVZBVEUgdm9pZCBzZXRDb21wbGV0aW9u Q2FsbGJhY2soRnVuY3Rpb248dm9pZCAoKT4mJik7CiAKIHByaXZhdGU6CiAgICAgdm9pZCBoYW5k bGVUYXNrUmVwbGllc09uTWFpblRocmVhZCgpOwpAQCAtNjIsNyArNjEsNyBAQCBwcml2YXRlOgog ICAgIENyb3NzVGhyZWFkUXVldWU8Q3Jvc3NUaHJlYWRUYXNrPiBtX3Rhc2tRdWV1ZTsKICAgICBD cm9zc1RocmVhZFF1ZXVlPENyb3NzVGhyZWFkVGFzaz4gbV90YXNrUmVwbHlRdWV1ZTsKIAotICAg IEZ1bmN0aW9uPHZvaWQgKCk+IG1fY29tcGxldGlvbkNhbGxiYWNrOworICAgIFJlZlB0cjxUaHJl YWQ+IG1fdGhyZWFkOwogfTsKIAogfSAvLyBuYW1lc3BhY2UgV1RGCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL0luZGV4ZWREQi9XZWJJREJTZXJ2ZXIuY3BwIGIvU291 cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9JbmRleGVkREIvV2ViSURCU2VydmVyLmNwcAppbmRl eCAwMjhjYjUzNzhhZTI0NjcxY2Q2MmE2MTRlZjk3MDNjYzY2MTQyYjQ0Li41ZWY5YjFiOTk3MzY2 YWM4NGEyMWU5YzZlNGQ0OTA0NGQ1MzJlOGFlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05l dHdvcmtQcm9jZXNzL0luZGV4ZWREQi9XZWJJREJTZXJ2ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJL aXQvTmV0d29ya1Byb2Nlc3MvSW5kZXhlZERCL1dlYklEQlNlcnZlci5jcHAKQEAgLTQxNSwxOSAr NDE1LDE0IEBAIHZvaWQgV2ViSURCU2VydmVyOjpjbG9zZSgpCiAgICAgZm9yIChhdXRvKiBjb25u ZWN0aW9uIDogbV9jb25uZWN0aW9ucykKICAgICAgICAgY29ubmVjdGlvbi0+cmVtb3ZlVGhyZWFk TWVzc2FnZVJlY2VpdmVyKE1lc3NhZ2VzOjpXZWJJREJTZXJ2ZXI6Om1lc3NhZ2VSZWNlaXZlck5h bWUoKSk7CiAKLSAgICBDcm9zc1RocmVhZFRhc2tIYW5kbGVyOjpzZXRDb21wbGV0aW9uQ2FsbGJh Y2soW3Byb3RlY3RlZFRoaXMgPSBtYWtlUmVmKCp0aGlzKV0oKSBtdXRhYmxlIHsKLSAgICAgICAg QVNTRVJUKCFSdW5Mb29wOjppc01haW4oKSk7Ci0gICAgICAgIGNhbGxPbk1haW5SdW5Mb29wKFtw cm90ZWN0ZWRUaGlzID0gV1RGTW92ZShwcm90ZWN0ZWRUaGlzKV0oKSBtdXRhYmxlIHsgfSk7Ci0g ICAgfSk7Ci0KLSAgICBwb3N0VGFzayhbdGhpc10oKSBtdXRhYmxlIHsKKyAgICBwb3N0VGFzayhb dGhpcywgcHJvdGVjdGVkVGhpcyA9IG1ha2VSZWYoKnRoaXMpXSgpIG11dGFibGUgewogICAgICAg ICBtX2Nvbm5lY3Rpb25NYXAuY2xlYXIoKTsKIAogICAgICAgICBMb2NrSG9sZGVyIGxvY2tlciht X3NlcnZlckxvY2spOwogICAgICAgICBtX3NlcnZlciA9IG51bGxwdHI7Ci0gICAgICAgIENyb3Nz VGhyZWFkVGFza0hhbmRsZXI6OmtpbGwoKTsKICAgICB9KTsKIAorICAgIENyb3NzVGhyZWFkVGFz a0hhbmRsZXI6OmtpbGwoKTsKICAgICBtX2Nsb3NlQ2FsbGJhY2soKTsKIH0KIAo= 426017 2021-04-14 11:13:15 -0700 2021-04-14 17:50:56 -0700 Patch bug-224530-20210414111314.patch text/plain 6850 sihui_liu U3VidmVyc2lvbiBSZXZpc2lvbjogMjc1OTUyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IDE2ZmEwNTZiMDUyN2Q0ZjA3ZDYzODI0 MjZhNzk1NjEyNzI3YjNhZmQuLjgxZTczMjNhNDYzYTU5MjQxM2MyZjYxY2RjMDI1MTliYjkxZjkx MjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMzcgQEAKKzIwMjEtMDQtMTQgIFNpaHVpIExpdSAgPHNpaHVpX2xp dUBhcHBsZS5jb20+CisKKyAgICAgICAgV2FpdCB1bnRpbCB0aHJlYWQgZXhpdHMgaW4gQ3Jvc3NU aHJlYWRUYXNrSGFuZGxlcjo6d2FpdFVudGlsRmluaXNoZWQoKQorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI0NTMwCisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2hlbiBDcm9zc1RocmVhZFRhc2tIYW5kbGVy OjpraWxsKCkgZmluaXNoZWQsIGl0IGRpZCBub3QgZ3VhcmFudGVlIHRocmVhZCBleGl0cyBiZWNh dXNlOgorICAgICAgICAxLiBDcm9zc1RocmVhZFF1ZXVlPERhdGFUeXBlPjo6d2FpdEZvck1lc3Nh Z2UoKSBleHBlY3RzIGEgbmV3IHRhc2sgYmVmb3JlIGNoZWNraW5nIG1fa2lsbGVkCisgICAgICAg IDIuIEl0IGp1c3Qgc2V0IG1fa2lsbGVkLCB3aGljaCBjYW4gYmUgY2hlY2tlZCBpbiBDcm9zc1Ro cmVhZFRhc2tIYW5kbGVyOjp0YXNrUnVuTG9vcCgpIGFmdGVyIGN1cnJlbnQgdGFzayAKKyAgICAg ICAgZmluaXNoZXMuCisKKyAgICAgICAgVGhlcmVmb3JlLCB3ZSBhZGRlZCBtX2NvbXBsZXRpb25D YWxsYmFjayB0byBDcm9zc1RocmVhZFRhc2tIYW5kbGVyLCB3aGljaCB3b3VsZCBiZSBleGVjdXRl ZCBhZnRlciB0YXNrUnVuTG9vcCgpLAorICAgICAgICB0byBzaWduYWwgd2hlbiB0aHJlYWQgaXMg YWJvdXQgdG8gZXhpdCBhbmQgaXQgaXMgc2FmZSB0byBkZXN0cm95IENyb3NzVGhyZWFkVGFza0hh bmRsZXIuIElmIAorICAgICAgICBDcm9zc1RocmVhZFRhc2tIYW5kbGVyIGlzIGNyZWF0ZWQgb24g dGhlIG1haW4gdGhyZWFkLCB0aGUgb3duZXIgb2YgQ3Jvc3NUaHJlYWRUYXNrSGFuZGxlciBuZWVk cyB0byBzZXQgCisgICAgICAgIG1fY29tcGxldGlvbkNhbGxiYWNrLCBhbmQgbWF5IG5lZWQgdG8g ZGlzcGF0Y2ggYSB0YXNrIHRvIG1haW4gdGhyZWFkIGluIG1fY29tcGxldGlvbkNhbGxiYWNrIGZv ciBkZXN0cm95aW5nIGl0LiAKKworICAgICAgICBUaGlzIGlzIGNvbXBsaWNhdGVkIGFuZCBlYXN5 IHRvIGdldCB3cm9uZy4gRm9yIGV4YW1wbGUsIGluIE5ldHdvcmtQcm9jZXNzOjpkaWRDbG9zZSwg V2ViSURCU2VydmVyLCB3aGljaCBpcyBhCisgICAgICAgIENyb3NzVGhyZWFkVGFza0hhbmRsZXIs IGNhbiBiZSBjbG9zZWQgYW5kIGRpc3BhdGNoIGEgdGFzayB0byBtYWluIHJ1bmxvb3AgaW4gbV9j b21wbGV0aW9uQ2FsbGJhY2sgYWZ0ZXIgbWFpbiAKKyAgICAgICAgcnVubG9vcCBzdG9wcy4KKwor ICAgICAgICBUbyBtYWtlIGl0IGVhc3kgYW5kIHNhZmUsIG5vdyBDcm9zc1RocmVhZFRhc2tIYW5k bGVyOjp3YWl0VW50aWxGaW5pc2hlZCgpIHJldHVybnMgYWZ0ZXIgc2NoZWR1bGVkIHRhc2tzIGZp bmlzaAorICAgICAgICBhbmQgdGhyZWFkIGV4aXRzLiBOb3cgdGhlIG93bmVyIG9mIENyb3NzVGhy ZWFkVGFza0hhbmRsZXIgb25seSBuZWVkcyB0byBjYWxsIHdhaXRVbnRpbEZpbmlzaGVkKCkgYmVm b3JlIAorICAgICAgICBkZXN0cm95aW5nIGl0LgorCisgICAgICAgICogd3RmL0Nyb3NzVGhyZWFk VGFza0hhbmRsZXIuY3BwOgorICAgICAgICAoV1RGOjpDcm9zc1RocmVhZFRhc2tIYW5kbGVyOjpD cm9zc1RocmVhZFRhc2tIYW5kbGVyKTogTWFrZSB0aHJlYWQgam9pbmFibGUuCisgICAgICAgIChX VEY6OkNyb3NzVGhyZWFkVGFza0hhbmRsZXI6On5Dcm9zc1RocmVhZFRhc2tIYW5kbGVyKTogQWRk IGFuIGFzc2VydCB0byBlbnN1cmUgd2FpdFVudGlsRmluaXNoZWQoKSBpcyBjYWxsZWQuCisgICAg ICAgIChXVEY6OkNyb3NzVGhyZWFkVGFza0hhbmRsZXI6OndhaXRVbnRpbEZpbmlzaGVkKTogUG9z dCBhIHRhc2sgdG8ga2lsbCBxdWV1ZXMgc28gZXZlcnkgc2NoZWR1bGVkIHRhc2sgd2lsbCBiZSAK KyAgICAgICAgZXhlY3V0ZWQgYW5kIHN0YXRlIG9mIHF1ZXVlcyBjYW4gYmUgY2hlY2tlZCBvbiB0 aW1lLgorICAgICAgICAoV1RGOjpDcm9zc1RocmVhZFRhc2tIYW5kbGVyOjpzZXRDb21wbGV0aW9u Q2FsbGJhY2spOiBEZWxldGVkLgorICAgICAgICAoV1RGOjpDcm9zc1RocmVhZFRhc2tIYW5kbGVy OjpraWxsKTogRGVsZXRlZC4gUmVuYW1lZCB0byB3YWl0VW50aWxGaW5pc2hlZC4KKyAgICAgICAg KiB3dGYvQ3Jvc3NUaHJlYWRUYXNrSGFuZGxlci5oOgorCiAyMDIxLTA0LTE0ICBBbGV4IENocmlz dGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmVkdWNlIG1heGlt dW0gSGFzaFRhYmxlIGVudHJ5IHNpemUgdG8gMTI4IGJ5dGVzCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDA1MDM2Y2U0 ZTY4NDM4NTBmNmI4ZjVmOTlmNWU5ZWM3ZmYzMWU0MjEuLjg2MDM1Njg1ZGUxN2Q5ODM4NjQ1Y2Jj YjMyYTkyYjA4MGQ0YmU5OTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisr KyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMjEtMDQtMTQg IFNpaHVpIExpdSAgPHNpaHVpX2xpdUBhcHBsZS5jb20+CisKKyAgICAgICAgV2FpdCB1bnRpbCB0 aHJlYWQgZXhpdHMgaW4gQ3Jvc3NUaHJlYWRUYXNrSGFuZGxlcjo6d2FpdFVudGlsRmluaXNoZWQo KQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI0NTMw CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBOZXR3 b3JrUHJvY2Vzcy9JbmRleGVkREIvV2ViSURCU2VydmVyLmNwcDoKKyAgICAgICAgKFdlYktpdDo6 V2ViSURCU2VydmVyOjpjbG9zZSk6CisKIDIwMjEtMDQtMTQgIEthdGUgQ2hlbmV5ICA8a2F0aGVy aW5lX2NoZW5leUBhcHBsZS5jb20+CiAKICAgICAgICAgU2VydmljZSB3b3JrZXIgc29mdC11cGRh dGUgbG9hZHMgbm90IGJlaW5nIG1hcmtlZCBhcHAtYm91bmQKZGlmZiAtLWdpdCBhL1NvdXJjZS9X VEYvd3RmL0Nyb3NzVGhyZWFkVGFza0hhbmRsZXIuY3BwIGIvU291cmNlL1dURi93dGYvQ3Jvc3NU aHJlYWRUYXNrSGFuZGxlci5jcHAKaW5kZXggZTY5MDc1OWYwNWNjM2U5ZjdhNTA4M2E5YWZjNDZm ODc2NGUzYzRkMS4uZjgzOWU1ODlkN2Y0ZTk4ODQ2NWJhZTY1YjU4NjgwOGU3ZDM4OWMzYyAxMDA2 NDQKLS0tIGEvU291cmNlL1dURi93dGYvQ3Jvc3NUaHJlYWRUYXNrSGFuZGxlci5jcHAKKysrIGIv U291cmNlL1dURi93dGYvQ3Jvc3NUaHJlYWRUYXNrSGFuZGxlci5jcHAKQEAgLTM1LDE3ICszNSwx NSBAQCBDcm9zc1RocmVhZFRhc2tIYW5kbGVyOjpDcm9zc1RocmVhZFRhc2tIYW5kbGVyKGNvbnN0 IGNoYXIqIHRocmVhZE5hbWUsIEF1dG9kcmFpbgogewogICAgIEFTU0VSVChpc01haW5UaHJlYWQo KSk7CiAgICAgTG9ja2VyPExvY2s+IGxvY2tlcihtX3Rhc2tUaHJlYWRDcmVhdGlvbkxvY2spOwot ICAgIFRocmVhZDo6Y3JlYXRlKHRocmVhZE5hbWUsIFt0aGlzXSB7CisgICAgbV90aHJlYWQgPSBU aHJlYWQ6OmNyZWF0ZSh0aHJlYWROYW1lLCBbdGhpc10gewogICAgICAgICB0YXNrUnVuTG9vcCgp OwotCi0gICAgICAgIGlmIChtX2NvbXBsZXRpb25DYWxsYmFjaykKLSAgICAgICAgICAgIG1fY29t cGxldGlvbkNhbGxiYWNrKCk7Ci0gICAgfSktPmRldGFjaCgpOworICAgIH0pOwogfQogCiBDcm9z c1RocmVhZFRhc2tIYW5kbGVyOjp+Q3Jvc3NUaHJlYWRUYXNrSGFuZGxlcigpCiB7CiAgICAgQVNT RVJUKGlzTWFpblRocmVhZCgpKTsKKyAgICBBU1NFUlQoIW1fdGhyZWFkKTsKIH0KIAogdm9pZCBD cm9zc1RocmVhZFRhc2tIYW5kbGVyOjpwb3N0VGFzayhDcm9zc1RocmVhZFRhc2smJiB0YXNrKQpA QCAtOTIsMTUgKzkwLDIyIEBAIHZvaWQgQ3Jvc3NUaHJlYWRUYXNrSGFuZGxlcjo6aGFuZGxlVGFz a1JlcGxpZXNPbk1haW5UaHJlYWQoKQogICAgICAgICB0YXNrLT5wZXJmb3JtVGFzaygpOwogfQog Ci12b2lkIENyb3NzVGhyZWFkVGFza0hhbmRsZXI6OnNldENvbXBsZXRpb25DYWxsYmFjayhGdW5j dGlvbjx2b2lkICgpPiYmIGNvbXBsZXRpb25DYWxsYmFjaykKK3ZvaWQgQ3Jvc3NUaHJlYWRUYXNr SGFuZGxlcjo6d2FpdFVudGlsRmluaXNoZWQoKQogewotICAgIG1fY29tcGxldGlvbkNhbGxiYWNr ID0gV1RGTW92ZShjb21wbGV0aW9uQ2FsbGJhY2spOwotfQorICAgIEFTU0VSVChpc01haW5UaHJl YWQoKSk7CisgICAgQVNTRVJUKG1fdGhyZWFkKTsKIAotdm9pZCBDcm9zc1RocmVhZFRhc2tIYW5k bGVyOjpraWxsKCkKLXsKLSAgICBtX3Rhc2tRdWV1ZS5raWxsKCk7Ci0gICAgbV90YXNrUmVwbHlR dWV1ZS5raWxsKCk7CisgICAgcG9zdFRhc2soQ3Jvc3NUaHJlYWRUYXNrKFt0aGlzXSgpIHsKKyAg ICAgICAgbV90YXNrUXVldWUua2lsbCgpOworICAgICAgICBtX3Rhc2tSZXBseVF1ZXVlLmtpbGwo KTsKKyAgICB9KSk7CisKKyAgICBtX3RocmVhZC0+d2FpdEZvckNvbXBsZXRpb24oKTsKKworICAg IEFTU0VSVChtX3Rhc2tRdWV1ZS5pc0tpbGxlZCgpKTsKKyAgICBBU1NFUlQobV90YXNrUmVwbHlR dWV1ZS5pc0tpbGxlZCgpKTsKKworICAgIG1fdGhyZWFkID0gbnVsbHB0cjsKIH0KIAogfSAvLyBu YW1lc3BhY2UgV1RGCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL3d0Zi9Dcm9zc1RocmVhZFRhc2tI YW5kbGVyLmggYi9Tb3VyY2UvV1RGL3d0Zi9Dcm9zc1RocmVhZFRhc2tIYW5kbGVyLmgKaW5kZXgg ODYzYWM2ZGM1ODQ4YjhmZDY0MWE0MzQ1OWFjOWVhYzc4MDBkZWRhYy4uYzgxN2M0MDNhYzVmYTRj OWIyNjk5NjZmODFhN2NhOTNkYzMzZGFjYiAxMDA2NDQKLS0tIGEvU291cmNlL1dURi93dGYvQ3Jv c3NUaHJlYWRUYXNrSGFuZGxlci5oCisrKyBiL1NvdXJjZS9XVEYvd3RmL0Nyb3NzVGhyZWFkVGFz a0hhbmRsZXIuaApAQCAtNDYsOCArNDYsNyBAQCBwcm90ZWN0ZWQ6CiAgICAgV1RGX0VYUE9SVF9Q UklWQVRFIHZvaWQgcG9zdFRhc2soQ3Jvc3NUaHJlYWRUYXNrJiYpOwogICAgIFdURl9FWFBPUlRf UFJJVkFURSB2b2lkIHBvc3RUYXNrUmVwbHkoQ3Jvc3NUaHJlYWRUYXNrJiYpOwogCi0gICAgV1RG X0VYUE9SVF9QUklWQVRFIHZvaWQga2lsbCgpOwotICAgIFdURl9FWFBPUlRfUFJJVkFURSB2b2lk IHNldENvbXBsZXRpb25DYWxsYmFjayhGdW5jdGlvbjx2b2lkICgpPiYmKTsKKyAgICBXVEZfRVhQ T1JUX1BSSVZBVEUgdm9pZCB3YWl0VW50aWxGaW5pc2hlZCgpOwogCiBwcml2YXRlOgogICAgIHZv aWQgaGFuZGxlVGFza1JlcGxpZXNPbk1haW5UaHJlYWQoKTsKQEAgLTYyLDcgKzYxLDcgQEAgcHJp dmF0ZToKICAgICBDcm9zc1RocmVhZFF1ZXVlPENyb3NzVGhyZWFkVGFzaz4gbV90YXNrUXVldWU7 CiAgICAgQ3Jvc3NUaHJlYWRRdWV1ZTxDcm9zc1RocmVhZFRhc2s+IG1fdGFza1JlcGx5UXVldWU7 CiAKLSAgICBGdW5jdGlvbjx2b2lkICgpPiBtX2NvbXBsZXRpb25DYWxsYmFjazsKKyAgICBSZWZQ dHI8VGhyZWFkPiBtX3RocmVhZDsKIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdURgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9JbmRleGVkREIvV2ViSURCU2VydmVyLmNw cCBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvSW5kZXhlZERCL1dlYklEQlNlcnZlci5j cHAKaW5kZXggMDI4Y2I1Mzc4YWUyNDY3MWNkNjJhNjE0ZWY5NzAzY2M2NjE0MmI0NC4uZGYxNGUw NTE1MjVkZDY4MWNmNzBkZWQzOTg0MWY0NGM2YmRlNmQ3MiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9OZXR3b3JrUHJvY2Vzcy9JbmRleGVkREIvV2ViSURCU2VydmVyLmNwcAorKysgYi9Tb3Vy Y2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL0luZGV4ZWREQi9XZWJJREJTZXJ2ZXIuY3BwCkBAIC00 MTUsMTkgKzQxNSwxNCBAQCB2b2lkIFdlYklEQlNlcnZlcjo6Y2xvc2UoKQogICAgIGZvciAoYXV0 byogY29ubmVjdGlvbiA6IG1fY29ubmVjdGlvbnMpCiAgICAgICAgIGNvbm5lY3Rpb24tPnJlbW92 ZVRocmVhZE1lc3NhZ2VSZWNlaXZlcihNZXNzYWdlczo6V2ViSURCU2VydmVyOjptZXNzYWdlUmVj ZWl2ZXJOYW1lKCkpOwogCi0gICAgQ3Jvc3NUaHJlYWRUYXNrSGFuZGxlcjo6c2V0Q29tcGxldGlv bkNhbGxiYWNrKFtwcm90ZWN0ZWRUaGlzID0gbWFrZVJlZigqdGhpcyldKCkgbXV0YWJsZSB7Ci0g ICAgICAgIEFTU0VSVCghUnVuTG9vcDo6aXNNYWluKCkpOwotICAgICAgICBjYWxsT25NYWluUnVu TG9vcChbcHJvdGVjdGVkVGhpcyA9IFdURk1vdmUocHJvdGVjdGVkVGhpcyldKCkgbXV0YWJsZSB7 IH0pOwotICAgIH0pOwotCi0gICAgcG9zdFRhc2soW3RoaXNdKCkgbXV0YWJsZSB7CisgICAgcG9z dFRhc2soW3RoaXMsIHByb3RlY3RlZFRoaXMgPSBtYWtlUmVmKCp0aGlzKV0oKSBtdXRhYmxlIHsK ICAgICAgICAgbV9jb25uZWN0aW9uTWFwLmNsZWFyKCk7CiAKICAgICAgICAgTG9ja0hvbGRlciBs b2NrZXIobV9zZXJ2ZXJMb2NrKTsKICAgICAgICAgbV9zZXJ2ZXIgPSBudWxscHRyOwotICAgICAg ICBDcm9zc1RocmVhZFRhc2tIYW5kbGVyOjpraWxsKCk7CiAgICAgfSk7CiAKKyAgICBDcm9zc1Ro cmVhZFRhc2tIYW5kbGVyOjp3YWl0VW50aWxGaW5pc2hlZCgpOwogICAgIG1fY2xvc2VDYWxsYmFj aygpOwogfQogCg==