199456 2019-07-03 10:15:07 -0700 Use smarter pointers in WKDownloadProgress 2019-07-03 14:01:58 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 achristensen achristensen cdumez commit-queue webkit-bug-importer oldest_to_newest 1549912 0 achristensen 2019-07-03 10:15:07 -0700 Use smarter pointers in WKDownloadProgress 1549916 1 373397 achristensen 2019-07-03 10:17:31 -0700 Created attachment 373397 Patch 1549917 2 achristensen 2019-07-03 10:17:33 -0700 <rdar://problem/51392926> 1549968 3 373397 cdumez 2019-07-03 13:14:49 -0700 Comment on attachment 373397 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=373397&action=review > Source/WebKit/NetworkProcess/Downloads/cocoa/WKDownloadProgress.mm:76 > + if (!isMainThread()) { !RunLoop::isMain() to avoid issues when the app uses both WK1 and WK2. 1549970 4 373408 achristensen 2019-07-03 13:17:58 -0700 Created attachment 373408 Patch 1549985 5 373408 commit-queue 2019-07-03 14:01:57 -0700 Comment on attachment 373408 Patch Clearing flags on attachment: 373408 Committed r247103: <https://trac.webkit.org/changeset/247103> 1549986 6 commit-queue 2019-07-03 14:01:58 -0700 All reviewed patches have been landed. Closing bug. 373397 2019-07-03 10:17:31 -0700 2019-07-03 13:17:57 -0700 Patch bug-199456-20190703101730.patch text/plain 6816 achristensen U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ3MDIyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDJjMTQ4YmRiMmYwYzdjNGM2 Zjg0MjM3ZGFmMjllNjhhM2M4ZDM1OWQuLjNmYjMwZTIzNWIzZjE4MTA2MmJlOTc2MDk1MDljNTE5 ZTJlMTYwMGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMTktMDctMDMgIEFsZXggQ2hy aXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KKworICAgICAgICBVc2Ugc21hcnRl ciBwb2ludGVycyBpbiBXS0Rvd25sb2FkUHJvZ3Jlc3MKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5OTQ1NgorICAgICAgICA8cmRhcjovL3Byb2JsZW0v NTEzOTI5MjY+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgVGhlcmUncyBzdGlsbCBhIHByb2JsZW0gcmVsYXRlZCB0byBvdXIgdXNlIG9mIHJhdyBwb2lu dGVycy4gIExldCdzIGp1c3Qgbm90IHVzZSByYXcgcG9pbnRlcnMuCisKKyAgICAgICAgKiBOZXR3 b3JrUHJvY2Vzcy9Eb3dubG9hZHMvRG93bmxvYWQuaDoKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vz cy9Eb3dubG9hZHMvY29jb2EvRG93bmxvYWRDb2NvYS5tbToKKyAgICAgICAgKFdlYktpdDo6RG93 bmxvYWQ6OnB1Ymxpc2hQcm9ncmVzcyk6CisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvRG93bmxv YWRzL2NvY29hL1dLRG93bmxvYWRQcm9ncmVzcy5oOgorICAgICAgICAqIE5ldHdvcmtQcm9jZXNz L0Rvd25sb2Fkcy9jb2NvYS9XS0Rvd25sb2FkUHJvZ3Jlc3MubW06CisgICAgICAgICgtW1dLRG93 bmxvYWRQcm9ncmVzcyBwZXJmb3JtQ2FuY2VsXSk6CisgICAgICAgICgtW1dLRG93bmxvYWRQcm9n cmVzcyBpbml0V2l0aERvd25sb2FkVGFzazpkb3dubG9hZDpVUkw6c2FuZGJveEV4dGVuc2lvbjpd KToKKyAgICAgICAgKC1bV0tEb3dubG9hZFByb2dyZXNzIHByb2dyZXNzQ2FuY2VsbGVkXSk6IERl bGV0ZWQuCisKIDIwMTktMDctMDEgIEFsZXggQ2hyaXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Vi a2l0Lm9yZz4KIAogICAgICAgICBEZXByZWNhdGUgYnV0IHN0aWxsIGNhbGwgX3dlYlZpZXc6c2hv d0N1c3RvbVNoZWV0Rm9yRWxlbWVudDogYWZ0ZXIgdHJhbnNpdGlvbiB0byBVSUNvbnRleHRNZW51 SW50ZXJhY3Rpb24KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvRG93 bmxvYWRzL0Rvd25sb2FkLmggYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL0Rvd25sb2Fk cy9Eb3dubG9hZC5oCmluZGV4IGY3MjBjMDEyYjM5N2MzMzhkOGZjNTIwY2I4NTBiMmJlMjc5YzJl NDUuLjgyNjVhN2UzZGU2Y2MwMzczODIyOTM4NGE4YTc3YWIwMTI5OGQ1ZjEgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvRG93bmxvYWRzL0Rvd25sb2FkLmgKKysrIGIv U291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9Eb3dubG9hZHMvRG93bmxvYWQuaApAQCAtMzcs NiArMzcsNyBAQAogI2luY2x1ZGUgPHBhbC9TZXNzaW9uSUQuaD4KICNpbmNsdWRlIDx3dGYvTm9u Y29weWFibGUuaD4KICNpbmNsdWRlIDx3dGYvUmV0YWluUHRyLmg+CisjaW5jbHVkZSA8d3RmL1dl YWtQdHIuaD4KIAogI2lmIFBMQVRGT1JNKENPQ09BKQogT0JKQ19DTEFTUyBOU1Byb2dyZXNzOwpA QCAtNjQsNyArNjUsNyBAQCBjbGFzcyBOZXR3b3JrRGF0YVRhc2s7CiBjbGFzcyBOZXR3b3JrU2Vz c2lvbjsKIGNsYXNzIFdlYlBhZ2U7CiAKLWNsYXNzIERvd25sb2FkIDogcHVibGljIElQQzo6TWVz c2FnZVNlbmRlciB7CitjbGFzcyBEb3dubG9hZCA6IHB1YmxpYyBJUEM6Ok1lc3NhZ2VTZW5kZXIs IHB1YmxpYyBDYW5NYWtlV2Vha1B0cjxEb3dubG9hZD4gewogICAgIFdURl9NQUtFX05PTkNPUFlB QkxFKERvd25sb2FkKTsgV1RGX01BS0VfRkFTVF9BTExPQ0FURUQ7CiBwdWJsaWM6CiAgICAgRG93 bmxvYWQoRG93bmxvYWRNYW5hZ2VyJiwgRG93bmxvYWRJRCwgTmV0d29ya0RhdGFUYXNrJiwgY29u c3QgUEFMOjpTZXNzaW9uSUQmIHNlc3Npb25JRCwgY29uc3QgU3RyaW5nJiBzdWdnZXN0ZWRGaWxl bmFtZSA9IHsgfSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL0Rv d25sb2Fkcy9jb2NvYS9Eb3dubG9hZENvY29hLm1tIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJv Y2Vzcy9Eb3dubG9hZHMvY29jb2EvRG93bmxvYWRDb2NvYS5tbQppbmRleCBjN2M1MTRiN2UxNzBm ZmYzZWRmZTgxYTc1N2IxZWY1OWNiNGViMWQ0Li40OTU2MTMzZjRhMGEyZGRjY2MyNTBjOTg2Mzk0 NmE5YjNkZDgzNzM0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL0Rv d25sb2Fkcy9jb2NvYS9Eb3dubG9hZENvY29hLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0d29y a1Byb2Nlc3MvRG93bmxvYWRzL2NvY29hL0Rvd25sb2FkQ29jb2EubW0KQEAgLTExMSw3ICsxMTEs NyBAQCB2b2lkIERvd25sb2FkOjpwdWJsaXNoUHJvZ3Jlc3MoY29uc3QgVVJMJiB1cmwsIFNhbmRi b3hFeHRlbnNpb246OkhhbmRsZSYmIHNhbmRibwogICAgIGlmICghc2FuZGJveEV4dGVuc2lvbikK ICAgICAgICAgcmV0dXJuOwogCi0gICAgbV9wcm9ncmVzcyA9IGFkb3B0TlMoW1tXS0Rvd25sb2Fk UHJvZ3Jlc3MgYWxsb2NdIGluaXRXaXRoRG93bmxvYWRUYXNrOm1fZG93bmxvYWRUYXNrLmdldCgp IGRvd25sb2FkOnRoaXMgVVJMOihOU1VSTCAqKXVybCBzYW5kYm94RXh0ZW5zaW9uOnNhbmRib3hF eHRlbnNpb25dKTsKKyAgICBtX3Byb2dyZXNzID0gYWRvcHROUyhbW1dLRG93bmxvYWRQcm9ncmVz cyBhbGxvY10gaW5pdFdpdGhEb3dubG9hZFRhc2s6bV9kb3dubG9hZFRhc2suZ2V0KCkgZG93bmxv YWQ6KnRoaXMgVVJMOihOU1VSTCAqKXVybCBzYW5kYm94RXh0ZW5zaW9uOnNhbmRib3hFeHRlbnNp b25dKTsKICNpZiBVU0UoTlNQUk9HUkVTU19QVUJMSVNISU5HX1NQSSkKICAgICBbbV9wcm9ncmVz cyBfcHVibGlzaF07CiAjZWxzZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJv Y2Vzcy9Eb3dubG9hZHMvY29jb2EvV0tEb3dubG9hZFByb2dyZXNzLmggYi9Tb3VyY2UvV2ViS2l0 L05ldHdvcmtQcm9jZXNzL0Rvd25sb2Fkcy9jb2NvYS9XS0Rvd25sb2FkUHJvZ3Jlc3MuaAppbmRl eCA4Y2E0ZjVkMjJhMzlmNTI4MzdkOGIxMmI4NDhiNTczNjY1YjY1MWM0Li41MGE3ZjM4MjU2YzU1 ZGMxM2YzZjRiM2RiNzA3MTdiM2NlYWZkNTI3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05l dHdvcmtQcm9jZXNzL0Rvd25sb2Fkcy9jb2NvYS9XS0Rvd25sb2FkUHJvZ3Jlc3MuaAorKysgYi9T b3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL0Rvd25sb2Fkcy9jb2NvYS9XS0Rvd25sb2FkUHJv Z3Jlc3MuaApAQCAtMzksNyArMzksNyBAQCBOU19BU1NVTUVfTk9OTlVMTF9CRUdJTgogCiBAaW50 ZXJmYWNlIFdLRG93bmxvYWRQcm9ncmVzcyA6IE5TUHJvZ3Jlc3MKIAotLSAoaW5zdGFuY2V0eXBl KWluaXRXaXRoRG93bmxvYWRUYXNrOihOU1VSTFNlc3Npb25Eb3dubG9hZFRhc2sgKil0YXNrIGRv d25sb2FkOihXZWJLaXQ6OkRvd25sb2FkKilkb3dubG9hZCBVUkw6KE5TVVJMICopZmlsZVVSTCBz YW5kYm94RXh0ZW5zaW9uOihSZWZQdHI8V2ViS2l0OjpTYW5kYm94RXh0ZW5zaW9uPilzYW5kYm94 RXh0ZW5zaW9uOworLSAoaW5zdGFuY2V0eXBlKWluaXRXaXRoRG93bmxvYWRUYXNrOihOU1VSTFNl c3Npb25Eb3dubG9hZFRhc2sgKil0YXNrIGRvd25sb2FkOihXZWJLaXQ6OkRvd25sb2FkJilkb3du bG9hZCBVUkw6KE5TVVJMICopZmlsZVVSTCBzYW5kYm94RXh0ZW5zaW9uOihSZWZQdHI8V2ViS2l0 OjpTYW5kYm94RXh0ZW5zaW9uPilzYW5kYm94RXh0ZW5zaW9uOwogCiBAZW5kCiAKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvRG93bmxvYWRzL2NvY29hL1dLRG93bmxv YWRQcm9ncmVzcy5tbSBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvRG93bmxvYWRzL2Nv Y29hL1dLRG93bmxvYWRQcm9ncmVzcy5tbQppbmRleCAxYjkzYjY2OThhOTQzZTBjYzJiNTY5ODI5 NjVmMTgxODY2Y2ZmZDk0Li44OThkZDZmNGZjMTBjOTA4ODJkMTg4ZDRiZTk1YmNhNDJmYTdhODUx IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL0Rvd25sb2Fkcy9jb2Nv YS9XS0Rvd25sb2FkUHJvZ3Jlc3MubW0KKysrIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vz cy9Eb3dubG9hZHMvY29jb2EvV0tEb3dubG9hZFByb2dyZXNzLm1tCkBAIC0zOSwzNiArMzksMjQg QEAgc3RhdGljIE5TU3RyaW5nICogY29uc3QgY291bnRPZkJ5dGVzUmVjZWl2ZWRLZXlQYXRoID0g QCJjb3VudE9mQnl0ZXNSZWNlaXZlZCI7CiAKIEBpbXBsZW1lbnRhdGlvbiBXS0Rvd25sb2FkUHJv Z3Jlc3MgewogICAgIFJldGFpblB0cjxOU1VSTFNlc3Npb25Eb3dubG9hZFRhc2s+IG1fdGFzazsK LSAgICBXZWJLaXQ6OkRvd25sb2FkKiBtX2Rvd25sb2FkOworICAgIFdlYWtQdHI8V2ViS2l0OjpE b3dubG9hZD4gbV9kb3dubG9hZDsKICAgICBSZWZQdHI8V2ViS2l0OjpTYW5kYm94RXh0ZW5zaW9u PiBtX3NhbmRib3hFeHRlbnNpb247Ci0gICAgc3RkOjpvbmNlX2ZsYWcgbV9wcm9ncmVzc0NhbmNl bE9uY2U7CiB9CiAKIC0gKHZvaWQpcGVyZm9ybUNhbmNlbAogewogICAgIGlmIChtX2Rvd25sb2Fk KQogICAgICAgICBtX2Rvd25sb2FkLT5jYW5jZWwoKTsKKyAgICBtX2Rvd25sb2FkID0gbnVsbHB0 cjsKIH0KIAotLSAodm9pZClwcm9ncmVzc0NhbmNlbGxlZAotewotICAgIHN0ZDo6Y2FsbF9vbmNl KG1fcHJvZ3Jlc3NDYW5jZWxPbmNlLCBbc2VsZl0gewotICAgICAgICBpZiAoIWlzTWFpblRocmVh ZCgpKSB7Ci0gICAgICAgICAgICBbc2VsZiBwZXJmb3JtU2VsZWN0b3JPbk1haW5UaHJlYWQ6QHNl bGVjdG9yKHBlcmZvcm1DYW5jZWwpIHdpdGhPYmplY3Q6bmlsIHdhaXRVbnRpbERvbmU6Tk9dOwot ICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICB9Ci0KLSAgICAgICAgW3NlbGYgcGVyZm9ybUNh bmNlbF07Ci0gICAgfSk7Ci19Ci0KLS0gKGluc3RhbmNldHlwZSlpbml0V2l0aERvd25sb2FkVGFz azooTlNVUkxTZXNzaW9uRG93bmxvYWRUYXNrICopdGFzayBkb3dubG9hZDooV2ViS2l0OjpEb3du bG9hZCopZG93bmxvYWQgVVJMOihOU1VSTCAqKWZpbGVVUkwgc2FuZGJveEV4dGVuc2lvbjooUmVm UHRyPFdlYktpdDo6U2FuZGJveEV4dGVuc2lvbj4pc2FuZGJveEV4dGVuc2lvbgorLSAoaW5zdGFu Y2V0eXBlKWluaXRXaXRoRG93bmxvYWRUYXNrOihOU1VSTFNlc3Npb25Eb3dubG9hZFRhc2sgKil0 YXNrIGRvd25sb2FkOihXZWJLaXQ6OkRvd25sb2FkJilkb3dubG9hZCBVUkw6KE5TVVJMICopZmls ZVVSTCBzYW5kYm94RXh0ZW5zaW9uOihSZWZQdHI8V2ViS2l0OjpTYW5kYm94RXh0ZW5zaW9uPilz YW5kYm94RXh0ZW5zaW9uCiB7CiAgICAgaWYgKCEoc2VsZiA9IFtzZWxmIGluaXRXaXRoUGFyZW50 Om5pbCB1c2VySW5mbzpuaWxdKSkKICAgICAgICAgcmV0dXJuIG5pbDsKIAogICAgIG1fdGFzayA9 IHRhc2s7Ci0gICAgbV9kb3dubG9hZCA9IGRvd25sb2FkOworICAgIG1fZG93bmxvYWQgPSBtYWtl V2Vha1B0cihkb3dubG9hZCk7CiAKICAgICBbdGFzayBhZGRPYnNlcnZlcjpzZWxmIGZvcktleVBh dGg6Y291bnRPZkJ5dGVzRXhwZWN0ZWRUb1JlY2VpdmVLZXlQYXRoIG9wdGlvbnM6TlNLZXlWYWx1 ZU9ic2VydmluZ09wdGlvbk5ldyB8IE5TS2V5VmFsdWVPYnNlcnZpbmdPcHRpb25Jbml0aWFsIGNv bnRleHQ6V0tEb3dubG9hZFByb2dyZXNzQnl0ZXNFeHBlY3RlZFRvUmVjZWl2ZUNvdW50Q29udGV4 dF07CiAgICAgW3Rhc2sgYWRkT2JzZXJ2ZXI6c2VsZiBmb3JLZXlQYXRoOmNvdW50T2ZCeXRlc1Jl Y2VpdmVkS2V5UGF0aCBvcHRpb25zOk5TS2V5VmFsdWVPYnNlcnZpbmdPcHRpb25OZXcgfCBOU0tl eVZhbHVlT2JzZXJ2aW5nT3B0aW9uSW5pdGlhbCBjb250ZXh0OldLRG93bmxvYWRQcm9ncmVzc0J5 dGVzUmVjZWl2ZWRDb250ZXh0XTsKQEAgLTg0LDggKzcyLDE0IEBAIHN0YXRpYyBOU1N0cmluZyAq IGNvbnN0IGNvdW50T2ZCeXRlc1JlY2VpdmVkS2V5UGF0aCA9IEAiY291bnRPZkJ5dGVzUmVjZWl2 ZWQiOwogICAgIG1fc2FuZGJveEV4dGVuc2lvbiA9IHNhbmRib3hFeHRlbnNpb247CiAKICAgICBz ZWxmLmNhbmNlbGxhYmxlID0gWUVTOwotICAgIHNlbGYuY2FuY2VsbGF0aW9uSGFuZGxlciA9IG1h a2VCbG9ja1B0cihbd2Vha1NlbGYgPSBXZWFrT2JqQ1B0cjxXS0Rvd25sb2FkUHJvZ3Jlc3M+IHsg c2VsZiB9XSB7Ci0gICAgICAgIFt3ZWFrU2VsZi5nZXQoKSBwcm9ncmVzc0NhbmNlbGxlZF07Cisg ICAgc2VsZi5jYW5jZWxsYXRpb25IYW5kbGVyID0gbWFrZUJsb2NrUHRyKFt3ZWFrU2VsZiA9IFdl YWtPYmpDUHRyPFdLRG93bmxvYWRQcm9ncmVzcz4geyBzZWxmIH1dICgpIG11dGFibGUgeworICAg ICAgICBpZiAoIWlzTWFpblRocmVhZCgpKSB7CisgICAgICAgICAgICBSdW5Mb29wOjptYWluKCku ZGlzcGF0Y2goW3dlYWtTZWxmID0gV1RGTW92ZSh3ZWFrU2VsZildIHsKKyAgICAgICAgICAgICAg ICBbd2Vha1NlbGYgcGVyZm9ybUNhbmNlbF07CisgICAgICAgICAgICB9KTsKKyAgICAgICAgICAg IHJldHVybjsKKyAgICAgICAgfQorICAgICAgICBbd2Vha1NlbGYgcGVyZm9ybUNhbmNlbF07CiAg ICAgfSkuZ2V0KCk7CiAKICAgICByZXR1cm4gc2VsZjsK 373408 2019-07-03 13:17:58 -0700 2019-07-03 14:01:57 -0700 Patch bug-199456-20190703131758.patch text/plain 6816 achristensen U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ3MDIyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDJjMTQ4YmRiMmYwYzdjNGM2 Zjg0MjM3ZGFmMjllNjhhM2M4ZDM1OWQuLjVjNzRiMjgwNGE1ZDJlY2QyYTA4YmI1NGY1MjhmYTA2 MmI5NDBhZjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMTktMDctMDMgIEFsZXggQ2hy aXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KKworICAgICAgICBVc2Ugc21hcnRl ciBwb2ludGVycyBpbiBXS0Rvd25sb2FkUHJvZ3Jlc3MKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5OTQ1NgorICAgICAgICA8cmRhcjovL3Byb2JsZW0v NTEzOTI5MjY+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgQ2hyaXMgRHVtZXouCisKKyAgICAgICAg VGhlcmUncyBzdGlsbCBhIHByb2JsZW0gcmVsYXRlZCB0byBvdXIgdXNlIG9mIHJhdyBwb2ludGVy cy4gIExldCdzIGp1c3Qgbm90IHVzZSByYXcgcG9pbnRlcnMuCisKKyAgICAgICAgKiBOZXR3b3Jr UHJvY2Vzcy9Eb3dubG9hZHMvRG93bmxvYWQuaDoKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9E b3dubG9hZHMvY29jb2EvRG93bmxvYWRDb2NvYS5tbToKKyAgICAgICAgKFdlYktpdDo6RG93bmxv YWQ6OnB1Ymxpc2hQcm9ncmVzcyk6CisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvRG93bmxvYWRz L2NvY29hL1dLRG93bmxvYWRQcm9ncmVzcy5oOgorICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL0Rv d25sb2Fkcy9jb2NvYS9XS0Rvd25sb2FkUHJvZ3Jlc3MubW06CisgICAgICAgICgtW1dLRG93bmxv YWRQcm9ncmVzcyBwZXJmb3JtQ2FuY2VsXSk6CisgICAgICAgICgtW1dLRG93bmxvYWRQcm9ncmVz cyBpbml0V2l0aERvd25sb2FkVGFzazpkb3dubG9hZDpVUkw6c2FuZGJveEV4dGVuc2lvbjpdKToK KyAgICAgICAgKC1bV0tEb3dubG9hZFByb2dyZXNzIHByb2dyZXNzQ2FuY2VsbGVkXSk6IERlbGV0 ZWQuCisKIDIwMTktMDctMDEgIEFsZXggQ2hyaXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0 Lm9yZz4KIAogICAgICAgICBEZXByZWNhdGUgYnV0IHN0aWxsIGNhbGwgX3dlYlZpZXc6c2hvd0N1 c3RvbVNoZWV0Rm9yRWxlbWVudDogYWZ0ZXIgdHJhbnNpdGlvbiB0byBVSUNvbnRleHRNZW51SW50 ZXJhY3Rpb24KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvRG93bmxv YWRzL0Rvd25sb2FkLmggYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL0Rvd25sb2Fkcy9E b3dubG9hZC5oCmluZGV4IGY3MjBjMDEyYjM5N2MzMzhkOGZjNTIwY2I4NTBiMmJlMjc5YzJlNDUu LjgyNjVhN2UzZGU2Y2MwMzczODIyOTM4NGE4YTc3YWIwMTI5OGQ1ZjEgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvRG93bmxvYWRzL0Rvd25sb2FkLmgKKysrIGIvU291 cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9Eb3dubG9hZHMvRG93bmxvYWQuaApAQCAtMzcsNiAr MzcsNyBAQAogI2luY2x1ZGUgPHBhbC9TZXNzaW9uSUQuaD4KICNpbmNsdWRlIDx3dGYvTm9uY29w eWFibGUuaD4KICNpbmNsdWRlIDx3dGYvUmV0YWluUHRyLmg+CisjaW5jbHVkZSA8d3RmL1dlYWtQ dHIuaD4KIAogI2lmIFBMQVRGT1JNKENPQ09BKQogT0JKQ19DTEFTUyBOU1Byb2dyZXNzOwpAQCAt NjQsNyArNjUsNyBAQCBjbGFzcyBOZXR3b3JrRGF0YVRhc2s7CiBjbGFzcyBOZXR3b3JrU2Vzc2lv bjsKIGNsYXNzIFdlYlBhZ2U7CiAKLWNsYXNzIERvd25sb2FkIDogcHVibGljIElQQzo6TWVzc2Fn ZVNlbmRlciB7CitjbGFzcyBEb3dubG9hZCA6IHB1YmxpYyBJUEM6Ok1lc3NhZ2VTZW5kZXIsIHB1 YmxpYyBDYW5NYWtlV2Vha1B0cjxEb3dubG9hZD4gewogICAgIFdURl9NQUtFX05PTkNPUFlBQkxF KERvd25sb2FkKTsgV1RGX01BS0VfRkFTVF9BTExPQ0FURUQ7CiBwdWJsaWM6CiAgICAgRG93bmxv YWQoRG93bmxvYWRNYW5hZ2VyJiwgRG93bmxvYWRJRCwgTmV0d29ya0RhdGFUYXNrJiwgY29uc3Qg UEFMOjpTZXNzaW9uSUQmIHNlc3Npb25JRCwgY29uc3QgU3RyaW5nJiBzdWdnZXN0ZWRGaWxlbmFt ZSA9IHsgfSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL0Rvd25s b2Fkcy9jb2NvYS9Eb3dubG9hZENvY29hLm1tIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vz cy9Eb3dubG9hZHMvY29jb2EvRG93bmxvYWRDb2NvYS5tbQppbmRleCBjN2M1MTRiN2UxNzBmZmYz ZWRmZTgxYTc1N2IxZWY1OWNiNGViMWQ0Li40OTU2MTMzZjRhMGEyZGRjY2MyNTBjOTg2Mzk0NmE5 YjNkZDgzNzM0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL0Rvd25s b2Fkcy9jb2NvYS9Eb3dubG9hZENvY29hLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1By b2Nlc3MvRG93bmxvYWRzL2NvY29hL0Rvd25sb2FkQ29jb2EubW0KQEAgLTExMSw3ICsxMTEsNyBA QCB2b2lkIERvd25sb2FkOjpwdWJsaXNoUHJvZ3Jlc3MoY29uc3QgVVJMJiB1cmwsIFNhbmRib3hF eHRlbnNpb246OkhhbmRsZSYmIHNhbmRibwogICAgIGlmICghc2FuZGJveEV4dGVuc2lvbikKICAg ICAgICAgcmV0dXJuOwogCi0gICAgbV9wcm9ncmVzcyA9IGFkb3B0TlMoW1tXS0Rvd25sb2FkUHJv Z3Jlc3MgYWxsb2NdIGluaXRXaXRoRG93bmxvYWRUYXNrOm1fZG93bmxvYWRUYXNrLmdldCgpIGRv d25sb2FkOnRoaXMgVVJMOihOU1VSTCAqKXVybCBzYW5kYm94RXh0ZW5zaW9uOnNhbmRib3hFeHRl bnNpb25dKTsKKyAgICBtX3Byb2dyZXNzID0gYWRvcHROUyhbW1dLRG93bmxvYWRQcm9ncmVzcyBh bGxvY10gaW5pdFdpdGhEb3dubG9hZFRhc2s6bV9kb3dubG9hZFRhc2suZ2V0KCkgZG93bmxvYWQ6 KnRoaXMgVVJMOihOU1VSTCAqKXVybCBzYW5kYm94RXh0ZW5zaW9uOnNhbmRib3hFeHRlbnNpb25d KTsKICNpZiBVU0UoTlNQUk9HUkVTU19QVUJMSVNISU5HX1NQSSkKICAgICBbbV9wcm9ncmVzcyBf cHVibGlzaF07CiAjZWxzZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vz cy9Eb3dubG9hZHMvY29jb2EvV0tEb3dubG9hZFByb2dyZXNzLmggYi9Tb3VyY2UvV2ViS2l0L05l dHdvcmtQcm9jZXNzL0Rvd25sb2Fkcy9jb2NvYS9XS0Rvd25sb2FkUHJvZ3Jlc3MuaAppbmRleCA4 Y2E0ZjVkMjJhMzlmNTI4MzdkOGIxMmI4NDhiNTczNjY1YjY1MWM0Li41MGE3ZjM4MjU2YzU1ZGMx M2YzZjRiM2RiNzA3MTdiM2NlYWZkNTI3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdv cmtQcm9jZXNzL0Rvd25sb2Fkcy9jb2NvYS9XS0Rvd25sb2FkUHJvZ3Jlc3MuaAorKysgYi9Tb3Vy Y2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL0Rvd25sb2Fkcy9jb2NvYS9XS0Rvd25sb2FkUHJvZ3Jl c3MuaApAQCAtMzksNyArMzksNyBAQCBOU19BU1NVTUVfTk9OTlVMTF9CRUdJTgogCiBAaW50ZXJm YWNlIFdLRG93bmxvYWRQcm9ncmVzcyA6IE5TUHJvZ3Jlc3MKIAotLSAoaW5zdGFuY2V0eXBlKWlu aXRXaXRoRG93bmxvYWRUYXNrOihOU1VSTFNlc3Npb25Eb3dubG9hZFRhc2sgKil0YXNrIGRvd25s b2FkOihXZWJLaXQ6OkRvd25sb2FkKilkb3dubG9hZCBVUkw6KE5TVVJMICopZmlsZVVSTCBzYW5k Ym94RXh0ZW5zaW9uOihSZWZQdHI8V2ViS2l0OjpTYW5kYm94RXh0ZW5zaW9uPilzYW5kYm94RXh0 ZW5zaW9uOworLSAoaW5zdGFuY2V0eXBlKWluaXRXaXRoRG93bmxvYWRUYXNrOihOU1VSTFNlc3Np b25Eb3dubG9hZFRhc2sgKil0YXNrIGRvd25sb2FkOihXZWJLaXQ6OkRvd25sb2FkJilkb3dubG9h ZCBVUkw6KE5TVVJMICopZmlsZVVSTCBzYW5kYm94RXh0ZW5zaW9uOihSZWZQdHI8V2ViS2l0OjpT YW5kYm94RXh0ZW5zaW9uPilzYW5kYm94RXh0ZW5zaW9uOwogCiBAZW5kCiAKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvRG93bmxvYWRzL2NvY29hL1dLRG93bmxvYWRQ cm9ncmVzcy5tbSBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvRG93bmxvYWRzL2NvY29h L1dLRG93bmxvYWRQcm9ncmVzcy5tbQppbmRleCAxYjkzYjY2OThhOTQzZTBjYzJiNTY5ODI5NjVm MTgxODY2Y2ZmZDk0Li5kYjVkMmJmNWZjMWQ0ZDdkZGQyMDljYTBiNGRmNjgwYTEwMGFhZjI0IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL0Rvd25sb2Fkcy9jb2NvYS9X S0Rvd25sb2FkUHJvZ3Jlc3MubW0KKysrIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9E b3dubG9hZHMvY29jb2EvV0tEb3dubG9hZFByb2dyZXNzLm1tCkBAIC0zOSwzNiArMzksMjQgQEAg c3RhdGljIE5TU3RyaW5nICogY29uc3QgY291bnRPZkJ5dGVzUmVjZWl2ZWRLZXlQYXRoID0gQCJj b3VudE9mQnl0ZXNSZWNlaXZlZCI7CiAKIEBpbXBsZW1lbnRhdGlvbiBXS0Rvd25sb2FkUHJvZ3Jl c3MgewogICAgIFJldGFpblB0cjxOU1VSTFNlc3Npb25Eb3dubG9hZFRhc2s+IG1fdGFzazsKLSAg ICBXZWJLaXQ6OkRvd25sb2FkKiBtX2Rvd25sb2FkOworICAgIFdlYWtQdHI8V2ViS2l0OjpEb3du bG9hZD4gbV9kb3dubG9hZDsKICAgICBSZWZQdHI8V2ViS2l0OjpTYW5kYm94RXh0ZW5zaW9uPiBt X3NhbmRib3hFeHRlbnNpb247Ci0gICAgc3RkOjpvbmNlX2ZsYWcgbV9wcm9ncmVzc0NhbmNlbE9u Y2U7CiB9CiAKIC0gKHZvaWQpcGVyZm9ybUNhbmNlbAogewogICAgIGlmIChtX2Rvd25sb2FkKQog ICAgICAgICBtX2Rvd25sb2FkLT5jYW5jZWwoKTsKKyAgICBtX2Rvd25sb2FkID0gbnVsbHB0cjsK IH0KIAotLSAodm9pZClwcm9ncmVzc0NhbmNlbGxlZAotewotICAgIHN0ZDo6Y2FsbF9vbmNlKG1f cHJvZ3Jlc3NDYW5jZWxPbmNlLCBbc2VsZl0gewotICAgICAgICBpZiAoIWlzTWFpblRocmVhZCgp KSB7Ci0gICAgICAgICAgICBbc2VsZiBwZXJmb3JtU2VsZWN0b3JPbk1haW5UaHJlYWQ6QHNlbGVj dG9yKHBlcmZvcm1DYW5jZWwpIHdpdGhPYmplY3Q6bmlsIHdhaXRVbnRpbERvbmU6Tk9dOwotICAg ICAgICAgICAgcmV0dXJuOwotICAgICAgICB9Ci0KLSAgICAgICAgW3NlbGYgcGVyZm9ybUNhbmNl bF07Ci0gICAgfSk7Ci19Ci0KLS0gKGluc3RhbmNldHlwZSlpbml0V2l0aERvd25sb2FkVGFzazoo TlNVUkxTZXNzaW9uRG93bmxvYWRUYXNrICopdGFzayBkb3dubG9hZDooV2ViS2l0OjpEb3dubG9h ZCopZG93bmxvYWQgVVJMOihOU1VSTCAqKWZpbGVVUkwgc2FuZGJveEV4dGVuc2lvbjooUmVmUHRy PFdlYktpdDo6U2FuZGJveEV4dGVuc2lvbj4pc2FuZGJveEV4dGVuc2lvbgorLSAoaW5zdGFuY2V0 eXBlKWluaXRXaXRoRG93bmxvYWRUYXNrOihOU1VSTFNlc3Npb25Eb3dubG9hZFRhc2sgKil0YXNr IGRvd25sb2FkOihXZWJLaXQ6OkRvd25sb2FkJilkb3dubG9hZCBVUkw6KE5TVVJMICopZmlsZVVS TCBzYW5kYm94RXh0ZW5zaW9uOihSZWZQdHI8V2ViS2l0OjpTYW5kYm94RXh0ZW5zaW9uPilzYW5k Ym94RXh0ZW5zaW9uCiB7CiAgICAgaWYgKCEoc2VsZiA9IFtzZWxmIGluaXRXaXRoUGFyZW50Om5p bCB1c2VySW5mbzpuaWxdKSkKICAgICAgICAgcmV0dXJuIG5pbDsKIAogICAgIG1fdGFzayA9IHRh c2s7Ci0gICAgbV9kb3dubG9hZCA9IGRvd25sb2FkOworICAgIG1fZG93bmxvYWQgPSBtYWtlV2Vh a1B0cihkb3dubG9hZCk7CiAKICAgICBbdGFzayBhZGRPYnNlcnZlcjpzZWxmIGZvcktleVBhdGg6 Y291bnRPZkJ5dGVzRXhwZWN0ZWRUb1JlY2VpdmVLZXlQYXRoIG9wdGlvbnM6TlNLZXlWYWx1ZU9i c2VydmluZ09wdGlvbk5ldyB8IE5TS2V5VmFsdWVPYnNlcnZpbmdPcHRpb25Jbml0aWFsIGNvbnRl eHQ6V0tEb3dubG9hZFByb2dyZXNzQnl0ZXNFeHBlY3RlZFRvUmVjZWl2ZUNvdW50Q29udGV4dF07 CiAgICAgW3Rhc2sgYWRkT2JzZXJ2ZXI6c2VsZiBmb3JLZXlQYXRoOmNvdW50T2ZCeXRlc1JlY2Vp dmVkS2V5UGF0aCBvcHRpb25zOk5TS2V5VmFsdWVPYnNlcnZpbmdPcHRpb25OZXcgfCBOU0tleVZh bHVlT2JzZXJ2aW5nT3B0aW9uSW5pdGlhbCBjb250ZXh0OldLRG93bmxvYWRQcm9ncmVzc0J5dGVz UmVjZWl2ZWRDb250ZXh0XTsKQEAgLTg0LDggKzcyLDE0IEBAIHN0YXRpYyBOU1N0cmluZyAqIGNv bnN0IGNvdW50T2ZCeXRlc1JlY2VpdmVkS2V5UGF0aCA9IEAiY291bnRPZkJ5dGVzUmVjZWl2ZWQi OwogICAgIG1fc2FuZGJveEV4dGVuc2lvbiA9IHNhbmRib3hFeHRlbnNpb247CiAKICAgICBzZWxm LmNhbmNlbGxhYmxlID0gWUVTOwotICAgIHNlbGYuY2FuY2VsbGF0aW9uSGFuZGxlciA9IG1ha2VC bG9ja1B0cihbd2Vha1NlbGYgPSBXZWFrT2JqQ1B0cjxXS0Rvd25sb2FkUHJvZ3Jlc3M+IHsgc2Vs ZiB9XSB7Ci0gICAgICAgIFt3ZWFrU2VsZi5nZXQoKSBwcm9ncmVzc0NhbmNlbGxlZF07CisgICAg c2VsZi5jYW5jZWxsYXRpb25IYW5kbGVyID0gbWFrZUJsb2NrUHRyKFt3ZWFrU2VsZiA9IFdlYWtP YmpDUHRyPFdLRG93bmxvYWRQcm9ncmVzcz4geyBzZWxmIH1dICgpIG11dGFibGUgeworICAgICAg ICBpZiAoIVJ1bkxvb3A6OmlzTWFpbigpKSB7CisgICAgICAgICAgICBSdW5Mb29wOjptYWluKCku ZGlzcGF0Y2goW3dlYWtTZWxmID0gV1RGTW92ZSh3ZWFrU2VsZildIHsKKyAgICAgICAgICAgICAg ICBbd2Vha1NlbGYgcGVyZm9ybUNhbmNlbF07CisgICAgICAgICAgICB9KTsKKyAgICAgICAgICAg IHJldHVybjsKKyAgICAgICAgfQorICAgICAgICBbd2Vha1NlbGYgcGVyZm9ybUNhbmNlbF07CiAg ICAgfSkuZ2V0KCk7CiAKICAgICByZXR1cm4gc2VsZjsK