182875 2018-02-16 07:49:03 -0800 Explicitly qualify some method calls on this in lamdas in Service Worker code. 2018-02-19 08:47:20 -0800 1 1 1 Unclassified WebKit Service Workers WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 Ms2ger Ms2ger cdumez commit-queue dbates ews-watchlist japhet mcatanzaro webkit-bug-importer oldest_to_newest 1399887 0 Ms2ger 2018-02-16 07:49:03 -0800 . 1399888 1 334042 Ms2ger 2018-02-16 07:53:40 -0800 Created attachment 334042 Patch 1400329 2 334042 mcatanzaro 2018-02-19 05:08:01 -0800 Comment on attachment 334042 Patch Thanks! Maybe we should just disable service workers support when building with GCC 5, since we're going to drop GCC 5 support in two months anyway. (If it was going to be longer than that, I would r+ this.) 1400367 3 334042 cdumez 2018-02-19 08:23:03 -0800 Comment on attachment 334042 Patch This makes me sad but ok I guess. 1400369 4 334042 commit-queue 2018-02-19 08:46:29 -0800 Comment on attachment 334042 Patch Clearing flags on attachment: 334042 Committed r228691: <https://trac.webkit.org/changeset/228691> 1400370 5 commit-queue 2018-02-19 08:46:31 -0800 All reviewed patches have been landed. Closing bug. 1400371 6 webkit-bug-importer 2018-02-19 08:47:20 -0800 <rdar://problem/37672651> 334042 2018-02-16 07:53:40 -0800 2018-02-19 08:46:29 -0800 Patch bug-182875-20180216165338.patch text/plain 15194 Ms2ger U3VidmVyc2lvbiBSZXZpc2lvbjogMjI4NTU5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDBjYzI4NDAyMTU1N2Uy YWJiMWM1ZTYwNzViMjBjN2Q0NThjOGJkYS4uMWE5ODk0YmRkMjlmYWMzOTc4N2M2NTMzZjJlMGYx ZDk3OWU1ZGYzYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM2IEBACisyMDE4LTAyLTE2ICBNczJn ZXIgIDxNczJnZXJAaWdhbGlhLmNvbT4KKworICAgICAgICBFeHBsaWNpdGx5IHF1YWxpZnkgc29t ZSBtZXRob2QgY2FsbHMgb24gdGhpcyBpbiBsYW1kYXMgaW4gU2VydmljZSBXb3JrZXIgY29kZS4K KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4Mjg3NQor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgaXMg bmVjZXNzYXJ5IGZvciB0aGUgY29kZSB0byBidWlsZCB3aXRoIEdDQyA1LiBPdGhlciBjb2RlIGFs cmVhZHkKKyAgICAgICAgYXBwZWFycyB0byBoYXZlIGJlZW4gYWRhcHRlZCBzaW1pbGFybHkuCisK KyAgICAgICAgTm8gY2hhbmdlIGluIGZ1bmN0aW9uYWxpdHkuCisKKyAgICAgICAgKiBsb2FkZXIv RG9jdW1lbnRMb2FkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RG9jdW1lbnRMb2FkZXI6OnJl ZGlyZWN0UmVjZWl2ZWQpOgorICAgICAgICAoV2ViQ29yZTo6RG9jdW1lbnRMb2FkZXI6OnN0YXJ0 TG9hZGluZ01haW5SZXNvdXJjZSk6CisgICAgICAgICogd29ya2Vycy9zZXJ2aWNlL1NlcnZpY2VX b3JrZXJDb250YWluZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U2VydmljZVdvcmtlckNvbnRh aW5lcjo6cmVhZHkpOgorICAgICAgICAoV2ViQ29yZTo6U2VydmljZVdvcmtlckNvbnRhaW5lcjo6 Z2V0UmVnaXN0cmF0aW9uKToKKyAgICAgICAgKFdlYkNvcmU6OlNlcnZpY2VXb3JrZXJDb250YWlu ZXI6OmdldFJlZ2lzdHJhdGlvbnMpOgorICAgICAgICAoV2ViQ29yZTo6U2VydmljZVdvcmtlckNv bnRhaW5lcjo6ZGlkRmluaXNoR2V0UmVnaXN0cmF0aW9uc1JlcXVlc3QpOgorICAgICAgICAqIHdv cmtlcnMvc2VydmljZS9TZXJ2aWNlV29ya2VyR2xvYmFsU2NvcGUuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6U2VydmljZVdvcmtlckdsb2JhbFNjb3BlOjp1cGRhdGVFeHRlbmRlZEV2ZW50c1NldCk6 CisgICAgICAgICogd29ya2Vycy9zZXJ2aWNlL3NlcnZlci9TV1NlcnZlci5jcHA6CisgICAgICAg IChXZWJDb3JlOjpTV1NlcnZlcjo6Y2xhaW0pOgorICAgICAgICAoV2ViQ29yZTo6U1dTZXJ2ZXI6 OkNvbm5lY3Rpb246OnJlc29sdmVSZWdpc3RyYXRpb25SZWFkeVJlcXVlc3RzKToKKyAgICAgICAg KiB3b3JrZXJzL3NlcnZpY2Uvc2VydmVyL1NXU2VydmVyUmVnaXN0cmF0aW9uLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OlNXU2VydmVyUmVnaXN0cmF0aW9uOjp1cGRhdGVSZWdpc3RyYXRpb25TdGF0 ZSk6CisgICAgICAgIChXZWJDb3JlOjpTV1NlcnZlclJlZ2lzdHJhdGlvbjo6c2V0VXBkYXRlVmlh Q2FjaGUpOgorICAgICAgICAoV2ViQ29yZTo6U1dTZXJ2ZXJSZWdpc3RyYXRpb246OnNldExhc3RV cGRhdGVUaW1lKToKKyAgICAgICAgKFdlYkNvcmU6OlNXU2VydmVyUmVnaXN0cmF0aW9uOjpmaXJl VXBkYXRlRm91bmRFdmVudCk6CisgICAgICAgICogd29ya2Vycy9zZXJ2aWNlL3NlcnZlci9TV1Nl cnZlcldvcmtlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTV1NlcnZlcldvcmtlcjo6c2V0U3Rh dGUpOgorCiAyMDE4LTAyLTE2ICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKICAg ICAgICAgW1JlbmRlclRyZWVCdWlsZGVyXSBNb3ZlIFJlbmRlckJsb2NrL1JlbmRlckJsb2NrRmxv dzo6YWRkQ2hpbGQoKSB0byBSZW5kZXJUcmVlQnVpbGRlcgpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdC9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwppbmRleCBhZjVmZjkwNWI4 ZDY0NTc4OGM5NmYwNWE1YmU2NjQyYTJjNjU5YjYyLi4wNGE1OTIzYTJjZDZmOWJhMTkxYWIxZGM1 OTc1MDFmNTliMjc5Y2I1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZworKysg Yi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDE4LTAyLTE2ICBN czJnZXIgIDxNczJnZXJAaWdhbGlhLmNvbT4KKworICAgICAgICBFeHBsaWNpdGx5IHF1YWxpZnkg c29tZSBtZXRob2QgY2FsbHMgb24gdGhpcyBpbiBsYW1kYXMgaW4gU2VydmljZSBXb3JrZXIgY29k ZS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4Mjg3 NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMg aXMgbmVjZXNzYXJ5IGZvciB0aGUgY29kZSB0byBidWlsZCB3aXRoIEdDQyA1LiBPdGhlciBjb2Rl IGFscmVhZHkKKyAgICAgICAgYXBwZWFycyB0byBoYXZlIGJlZW4gYWRhcHRlZCBzaW1pbGFybHku CisKKyAgICAgICAgKiBTdG9yYWdlUHJvY2Vzcy9TZXJ2aWNlV29ya2VyL1dlYlNXU2VydmVyQ29u bmVjdGlvbi5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlNXU2VydmVyQ29ubmVjdGlvbjo6c3Rh cnRGZXRjaCk6CisKIDIwMTgtMDItMTYgIFdlbnNvbiBIc2llaCAgPHdlbnNvbl9oc2llaEBhcHBs ZS5jb20+CiAKICAgICAgICAgW0V4dHJhIHpvb20gbW9kZV0gQWRkIGJhc2ljIHN1cHBvcnQgZm9y IDxpbnB1dCB0eXBlPSdkYXRlJz4gdXNpbmcgZGF0ZSBwaWNrZXIgVUkKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2xvYWRlci9Eb2N1bWVudExvYWRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9s b2FkZXIvRG9jdW1lbnRMb2FkZXIuY3BwCmluZGV4IDY0NTczYTFkMmFjNTNkYWRhZjgzYTUwNTY4 NTZjN2E1NDRkMDk4YTAuLmI5ZGNkOWEyMDQ2Y2VkZGU1NDNjZjc1ODQ2OTA1MWI3MmRjMTYxYWQg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9Eb2N1bWVudExvYWRlci5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0RvY3VtZW50TG9hZGVyLmNwcApAQCAtNTI0LDcgKzUy NCw3IEBAIHZvaWQgRG9jdW1lbnRMb2FkZXI6OnJlZGlyZWN0UmVjZWl2ZWQoQ2FjaGVkUmVzb3Vy Y2UmIHJlc291cmNlLCBSZXNvdXJjZVJlcXVlc3QmCiAgICAgICAgICAgICByZXR1cm47CiAgICAg ICAgIH0KICAgICAgICAgYXV0byB1cmwgPSByZXF1ZXN0LnVybCgpOwotICAgICAgICBtYXRjaFJl Z2lzdHJhdGlvbih1cmwsIFtyZXF1ZXN0ID0gV1RGTW92ZShyZXF1ZXN0KSwgaXNSZWRpcmVjdGlv bkZyb21TZXJ2aWNlV29ya2VyLCBjb21wbGV0aW9uSGFuZGxlciA9IFdURk1vdmUoY29tcGxldGlv bkhhbmRsZXIpLCBwcm90ZWN0ZWRUaGlzID0gV1RGTW92ZShwcm90ZWN0ZWRUaGlzKSwgdGhpc10g KGF1dG8mJiByZWdpc3RyYXRpb25EYXRhKSBtdXRhYmxlIHsKKyAgICAgICAgdGhpcy0+bWF0Y2hS ZWdpc3RyYXRpb24odXJsLCBbcmVxdWVzdCA9IFdURk1vdmUocmVxdWVzdCksIGlzUmVkaXJlY3Rp b25Gcm9tU2VydmljZVdvcmtlciwgY29tcGxldGlvbkhhbmRsZXIgPSBXVEZNb3ZlKGNvbXBsZXRp b25IYW5kbGVyKSwgcHJvdGVjdGVkVGhpcyA9IFdURk1vdmUocHJvdGVjdGVkVGhpcyksIHRoaXNd IChhdXRvJiYgcmVnaXN0cmF0aW9uRGF0YSkgbXV0YWJsZSB7CiAgICAgICAgICAgICBpZiAoIW1f bWFpbkRvY3VtZW50RXJyb3IuaXNOdWxsKCkgfHwgIW1fZnJhbWUpIHsKICAgICAgICAgICAgICAg ICBjb21wbGV0aW9uSGFuZGxlcih7IH0pOwogICAgICAgICAgICAgICAgIHJldHVybjsKQEAgLTUz OCwxMSArNTM4LDExIEBAIHZvaWQgRG9jdW1lbnRMb2FkZXI6OnJlZGlyZWN0UmVjZWl2ZWQoQ2Fj aGVkUmVzb3VyY2UmIHJlc291cmNlLCBSZXNvdXJjZVJlcXVlc3QmCiAgICAgICAgICAgICB9CiAK ICAgICAgICAgICAgIC8vIFNlcnZpY2Ugd29ya2VyIHJlZ2lzdHJhdGlvbiBjaGFuZ2VkLCB3ZSBu ZWVkIHRvIGNhbmNlbCB0aGUgY3VycmVudCBsb2FkIHRvIHJlc3RhcnQgYSBuZXcgb25lLgotICAg ICAgICAgICAgY2xlYXJNYWluUmVzb3VyY2UoKTsKKyAgICAgICAgICAgIHRoaXMtPmNsZWFyTWFp blJlc291cmNlKCk7CiAgICAgICAgICAgICBjb21wbGV0aW9uSGFuZGxlcih7IH0pOwogCiAgICAg ICAgICAgICBtX3NlcnZpY2VXb3JrZXJSZWdpc3RyYXRpb25EYXRhID0gV1RGTW92ZShyZWdpc3Ry YXRpb25EYXRhKTsKLSAgICAgICAgICAgIGxvYWRNYWluUmVzb3VyY2UoV1RGTW92ZShyZXF1ZXN0 KSk7CisgICAgICAgICAgICB0aGlzLT5sb2FkTWFpblJlc291cmNlKFdURk1vdmUocmVxdWVzdCkp OwogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9KTsKICAgICB9KTsKQEAgLTE2NTUsNyAr MTY1NSw3IEBAIHZvaWQgRG9jdW1lbnRMb2FkZXI6OnN0YXJ0TG9hZGluZ01haW5SZXNvdXJjZSgp CiAgICAgICAgICAgICAgICAgcmV0dXJuOwogCiAgICAgICAgICAgICBtX3NlcnZpY2VXb3JrZXJS ZWdpc3RyYXRpb25EYXRhID0gV1RGTW92ZShyZWdpc3RyYXRpb25EYXRhKTsKLSAgICAgICAgICAg IGxvYWRNYWluUmVzb3VyY2UoV1RGTW92ZShyZXF1ZXN0KSk7CisgICAgICAgICAgICB0aGlzLT5s b2FkTWFpblJlc291cmNlKFdURk1vdmUocmVxdWVzdCkpOwogICAgICAgICB9KTsKICNlbHNlCiAg ICAgICAgIGxvYWRNYWluUmVzb3VyY2UoV1RGTW92ZShyZXF1ZXN0KSk7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS93b3JrZXJzL3NlcnZpY2UvU2VydmljZVdvcmtlckNvbnRhaW5lci5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS93b3JrZXJzL3NlcnZpY2UvU2VydmljZVdvcmtlckNvbnRhaW5lci5j cHAKaW5kZXggNjU3NTM2YjVhZWEyMWUwNzRjNTE1YmY4ZGU4YzBhNThkYmQ1YWNkMC4uYmI0M2Qz ZGE2ZTE3ZjlmNjMxMmFmZmI5ZDM2MmNjMzM4NWRkNjczYSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvd29ya2Vycy9zZXJ2aWNlL1NlcnZpY2VXb3JrZXJDb250YWluZXIuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3dvcmtlcnMvc2VydmljZS9TZXJ2aWNlV29ya2VyQ29udGFpbmVyLmNwcApA QCAtOTQsMTAgKzk0LDEwIEBAIGF1dG8gU2VydmljZVdvcmtlckNvbnRhaW5lcjo6cmVhZHkoKSAt PiBSZWFkeVByb21pc2UmCiAgICAgICAgIGNhbGxPbk1haW5UaHJlYWQoW3RoaXMsIGNvbm5lY3Rp b24gPSBtYWtlUmVmKGVuc3VyZVNXQ2xpZW50Q29ubmVjdGlvbigpKSwgdG9wT3JpZ2luID0gY29u dGV4dC50b3BPcmlnaW4oKS5pc29sYXRlZENvcHkoKSwgY2xpZW50VVJMID0gY29udGV4dC51cmwo KS5pc29sYXRlZENvcHkoKSwgY29udGV4dElkZW50aWZpZXJdKCkgbXV0YWJsZSB7CiAgICAgICAg ICAgICBjb25uZWN0aW9uLT53aGVuUmVnaXN0cmF0aW9uUmVhZHkodG9wT3JpZ2luLCBjbGllbnRV UkwsIFt0aGlzLCBjb250ZXh0SWRlbnRpZmllcl0oYXV0byYmIHJlZ2lzdHJhdGlvbkRhdGEpIHsK ICAgICAgICAgICAgICAgICBTY3JpcHRFeGVjdXRpb25Db250ZXh0Ojpwb3N0VGFza1RvKGNvbnRl eHRJZGVudGlmaWVyLCBbdGhpcywgcmVnaXN0cmF0aW9uRGF0YSA9IGNyb3NzVGhyZWFkQ29weShy ZWdpc3RyYXRpb25EYXRhKV0oYXV0byYpIG11dGFibGUgewotICAgICAgICAgICAgICAgICAgICBp ZiAobV9pc1N0b3BwZWQgfHwgIXNjcmlwdEV4ZWN1dGlvbkNvbnRleHQoKS0+c2Vzc2lvbklEKCku aXNWYWxpZCgpKQorICAgICAgICAgICAgICAgICAgICBpZiAobV9pc1N0b3BwZWQgfHwgIXRoaXMt PnNjcmlwdEV4ZWN1dGlvbkNvbnRleHQoKS0+c2Vzc2lvbklEKCkuaXNWYWxpZCgpKQogICAgICAg ICAgICAgICAgICAgICAgICAgcmV0dXJuOwogCi0gICAgICAgICAgICAgICAgICAgIGF1dG8gcmVn aXN0cmF0aW9uID0gU2VydmljZVdvcmtlclJlZ2lzdHJhdGlvbjo6Z2V0T3JDcmVhdGUoKnNjcmlw dEV4ZWN1dGlvbkNvbnRleHQoKSwgKnRoaXMsIFdURk1vdmUocmVnaXN0cmF0aW9uRGF0YSkpOwor ICAgICAgICAgICAgICAgICAgICBhdXRvIHJlZ2lzdHJhdGlvbiA9IFNlcnZpY2VXb3JrZXJSZWdp c3RyYXRpb246OmdldE9yQ3JlYXRlKCp0aGlzLT5zY3JpcHRFeGVjdXRpb25Db250ZXh0KCksICp0 aGlzLCBXVEZNb3ZlKHJlZ2lzdHJhdGlvbkRhdGEpKTsKICAgICAgICAgICAgICAgICAgICAgbV9y ZWFkeVByb21pc2UtPnJlc29sdmUoV1RGTW92ZShyZWdpc3RyYXRpb24pKTsKICAgICAgICAgICAg ICAgICB9KTsKICAgICAgICAgICAgIH0pOwpAQCAtMjY5LDcgKzI2OSw3IEBAIHZvaWQgU2Vydmlj ZVdvcmtlckNvbnRhaW5lcjo6Z2V0UmVnaXN0cmF0aW9uKGNvbnN0IFN0cmluZyYgY2xpZW50VVJM LCBSZWY8RGVmZXJyCiAgICAgY2FsbE9uTWFpblRocmVhZChbY29ubmVjdGlvbiA9IG1ha2VSZWYo ZW5zdXJlU1dDbGllbnRDb25uZWN0aW9uKCkpLCB0aGlzLCB0b3BPcmlnaW4gPSBjb250ZXh0LT50 b3BPcmlnaW4oKS5pc29sYXRlZENvcHkoKSwgcGFyc2VkVVJMID0gcGFyc2VkVVJMLmlzb2xhdGVk Q29weSgpLCBjb250ZXh0SWRlbnRpZmllciwgcGVuZGluZ1Byb21pc2VJZGVudGlmaWVyXSgpIG11 dGFibGUgewogICAgICAgICBjb25uZWN0aW9uLT5tYXRjaFJlZ2lzdHJhdGlvbih0b3BPcmlnaW4s IHBhcnNlZFVSTCwgW3RoaXMsIGNvbnRleHRJZGVudGlmaWVyLCBwZW5kaW5nUHJvbWlzZUlkZW50 aWZpZXJdIChhdXRvJiYgcmVzdWx0KSBtdXRhYmxlIHsKICAgICAgICAgICAgIFNjcmlwdEV4ZWN1 dGlvbkNvbnRleHQ6OnBvc3RUYXNrVG8oY29udGV4dElkZW50aWZpZXIsIFt0aGlzLCBwZW5kaW5n UHJvbWlzZUlkZW50aWZpZXIsIHJlc3VsdCA9IGNyb3NzVGhyZWFkQ29weShyZXN1bHQpXShTY3Jp cHRFeGVjdXRpb25Db250ZXh0JikgbXV0YWJsZSB7Ci0gICAgICAgICAgICAgICAgZGlkRmluaXNo R2V0UmVnaXN0cmF0aW9uUmVxdWVzdChwZW5kaW5nUHJvbWlzZUlkZW50aWZpZXIsIFdURk1vdmUo cmVzdWx0KSk7CisgICAgICAgICAgICAgICAgdGhpcy0+ZGlkRmluaXNoR2V0UmVnaXN0cmF0aW9u UmVxdWVzdChwZW5kaW5nUHJvbWlzZUlkZW50aWZpZXIsIFdURk1vdmUocmVzdWx0KSk7CiAgICAg ICAgICAgICB9KTsKICAgICAgICAgfSk7CiAgICAgfSk7CkBAIC0zMzIsNyArMzMyLDcgQEAgdm9p ZCBTZXJ2aWNlV29ya2VyQ29udGFpbmVyOjpnZXRSZWdpc3RyYXRpb25zKFJlZjxEZWZlcnJlZFBy b21pc2U+JiYgcHJvbWlzZSkKICAgICBjYWxsT25NYWluVGhyZWFkKFtjb25uZWN0aW9uID0gbWFr ZVJlZihlbnN1cmVTV0NsaWVudENvbm5lY3Rpb24oKSksIHRoaXMsIHRvcE9yaWdpbiA9IGNvbnRl eHQtPnRvcE9yaWdpbigpLmlzb2xhdGVkQ29weSgpLCBjb250ZXh0VVJMID0gY29udGV4dFVSTC5p c29sYXRlZENvcHkoKSwgY29udGV4dElkZW50aWZpZXIsIHBlbmRpbmdQcm9taXNlSWRlbnRpZmll cl0oKSBtdXRhYmxlIHsKICAgICAgICAgY29ubmVjdGlvbi0+Z2V0UmVnaXN0cmF0aW9ucyh0b3BP cmlnaW4sIGNvbnRleHRVUkwsIFt0aGlzLCBjb250ZXh0SWRlbnRpZmllciwgcGVuZGluZ1Byb21p c2VJZGVudGlmaWVyXSAoYXV0byYmIHJlZ2lzdHJhdGlvbkRhdGFzKSBtdXRhYmxlIHsKICAgICAg ICAgICAgIFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQ6OnBvc3RUYXNrVG8oY29udGV4dElkZW50aWZp ZXIsIFt0aGlzLCBwZW5kaW5nUHJvbWlzZUlkZW50aWZpZXIsIHJlZ2lzdHJhdGlvbkRhdGFzID0g Y3Jvc3NUaHJlYWRDb3B5KHJlZ2lzdHJhdGlvbkRhdGFzKV0oU2NyaXB0RXhlY3V0aW9uQ29udGV4 dCYpIG11dGFibGUgewotICAgICAgICAgICAgICAgIGRpZEZpbmlzaEdldFJlZ2lzdHJhdGlvbnNS ZXF1ZXN0KHBlbmRpbmdQcm9taXNlSWRlbnRpZmllciwgV1RGTW92ZShyZWdpc3RyYXRpb25EYXRh cykpOworICAgICAgICAgICAgICAgIHRoaXMtPmRpZEZpbmlzaEdldFJlZ2lzdHJhdGlvbnNSZXF1 ZXN0KHBlbmRpbmdQcm9taXNlSWRlbnRpZmllciwgV1RGTW92ZShyZWdpc3RyYXRpb25EYXRhcykp OwogICAgICAgICAgICAgfSk7CiAgICAgICAgIH0pOwogICAgIH0pOwpAQCAtMzU0LDcgKzM1NCw3 IEBAIHZvaWQgU2VydmljZVdvcmtlckNvbnRhaW5lcjo6ZGlkRmluaXNoR2V0UmVnaXN0cmF0aW9u c1JlcXVlc3QodWludDY0X3QgcGVuZGluZ1ByCiAgICAgfQogCiAgICAgYXV0byByZWdpc3RyYXRp b25zID0gV1RGOjptYXAoV1RGTW92ZShyZWdpc3RyYXRpb25EYXRhcyksIFsmXSAoYXV0byYmIHJl Z2lzdHJhdGlvbkRhdGEpIHsKLSAgICAgICAgcmV0dXJuIFNlcnZpY2VXb3JrZXJSZWdpc3RyYXRp b246OmdldE9yQ3JlYXRlKCpzY3JpcHRFeGVjdXRpb25Db250ZXh0KCksICp0aGlzLCBXVEZNb3Zl KHJlZ2lzdHJhdGlvbkRhdGEpKTsKKyAgICAgICAgcmV0dXJuIFNlcnZpY2VXb3JrZXJSZWdpc3Ry YXRpb246OmdldE9yQ3JlYXRlKCp0aGlzLT5zY3JpcHRFeGVjdXRpb25Db250ZXh0KCksICp0aGlz LCBXVEZNb3ZlKHJlZ2lzdHJhdGlvbkRhdGEpKTsKICAgICB9KTsKIAogICAgIHBlbmRpbmdQcm9t aXNlLT5wcm9taXNlLT5yZXNvbHZlPElETFNlcXVlbmNlPElETEludGVyZmFjZTxTZXJ2aWNlV29y a2VyUmVnaXN0cmF0aW9uPj4+KFdURk1vdmUocmVnaXN0cmF0aW9ucykpOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvd29ya2Vycy9zZXJ2aWNlL1NlcnZpY2VXb3JrZXJHbG9iYWxTY29wZS5j cHAgYi9Tb3VyY2UvV2ViQ29yZS93b3JrZXJzL3NlcnZpY2UvU2VydmljZVdvcmtlckdsb2JhbFNj b3BlLmNwcAppbmRleCBiYmY1NmE2ZTQ2NGM5MjU4YjQ5MzM2ZGM0NTE3YTdiMzg2N2ExMjc5Li43 NDNhM2ZmMTA4NTJiZDdiNTg4NGM0NjQ0ZWRhYTJjZWQyODdmNTdjIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS93b3JrZXJzL3NlcnZpY2UvU2VydmljZVdvcmtlckdsb2JhbFNjb3BlLmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS93b3JrZXJzL3NlcnZpY2UvU2VydmljZVdvcmtlckdsb2JhbFNj b3BlLmNwcApAQCAtMTEzLDcgKzExMyw3IEBAIHZvaWQgU2VydmljZVdvcmtlckdsb2JhbFNjb3Bl Ojp1cGRhdGVFeHRlbmRlZEV2ZW50c1NldChFeHRlbmRhYmxlRXZlbnQqIG5ld0V2ZW50CiAgICAg aWYgKG5ld0V2ZW50ICYmIG5ld0V2ZW50LT5wZW5kaW5nUHJvbWlzZUNvdW50KCkpIHsKICAgICAg ICAgbV9leHRlbmRlZEV2ZW50cy5hcHBlbmQoKm5ld0V2ZW50KTsKICAgICAgICAgbmV3RXZlbnQt PndoZW5BbGxFeHRlbmRMaWZldGltZVByb21pc2VzQXJlU2V0dGxlZChbdGhpc10oYXV0byYmKSB7 Ci0gICAgICAgICAgICB1cGRhdGVFeHRlbmRlZEV2ZW50c1NldCgpOworICAgICAgICAgICAgdGhp cy0+dXBkYXRlRXh0ZW5kZWRFdmVudHNTZXQoKTsKICAgICAgICAgfSk7CiAgICAgICAgIC8vIENs ZWFyIG91dCB0aGUgZXZlbnQncyB0YXJnZXQgYXMgaXQgaXMgdGhlIFdvcmtlckdsb2JhbFNjb3Bl IGFuZCB3ZSBkbyBub3Qgd2FudCB0byBrZWVwIGl0CiAgICAgICAgIC8vIGFsaXZlIHVubmVjZXNz YXJpbHkuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS93b3JrZXJzL3NlcnZpY2Uvc2VydmVy L1NXU2VydmVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMvc2VydmljZS9zZXJ2ZXIvU1dT ZXJ2ZXIuY3BwCmluZGV4IDQwMjM1YmMyNzgzYjE5N2M4MjI0YTk2ZTFjNTI2YmIxMWZlM2RiY2Mu LjZjNjA1Nzg0ZTFkOGZlMGVjMDNjMDU2OTYzMjNlMTJkOGYwMGFjYmIgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3dvcmtlcnMvc2VydmljZS9zZXJ2ZXIvU1dTZXJ2ZXIuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3dvcmtlcnMvc2VydmljZS9zZXJ2ZXIvU1dTZXJ2ZXIuY3BwCkBAIC00NDMs NyArNDQzLDcgQEAgdm9pZCBTV1NlcnZlcjo6Y2xhaW0oU1dTZXJ2ZXJXb3JrZXImIHdvcmtlcikK IHsKICAgICBhdXRvJiBvcmlnaW4gPSB3b3JrZXIub3JpZ2luKCk7CiAgICAgZm9yRWFjaENsaWVu dEZvck9yaWdpbihvcmlnaW4sIFsmXShhdXRvJiBjbGllbnREYXRhKSB7Ci0gICAgICAgIGF1dG8q IHJlZ2lzdHJhdGlvbiA9IGRvUmVnaXN0cmF0aW9uTWF0Y2hpbmcob3JpZ2luLnRvcE9yaWdpbiwg Y2xpZW50RGF0YS51cmwpOworICAgICAgICBhdXRvKiByZWdpc3RyYXRpb24gPSB0aGlzLT5kb1Jl Z2lzdHJhdGlvbk1hdGNoaW5nKG9yaWdpbi50b3BPcmlnaW4sIGNsaWVudERhdGEudXJsKTsKICAg ICAgICAgaWYgKCEocmVnaXN0cmF0aW9uICYmIHJlZ2lzdHJhdGlvbi0+a2V5KCkgPT0gd29ya2Vy LnJlZ2lzdHJhdGlvbktleSgpKSkKICAgICAgICAgICAgIHJldHVybjsKIApAQCAtNDUzLDcgKzQ1 Myw3IEBAIHZvaWQgU1dTZXJ2ZXI6OmNsYWltKFNXU2VydmVyV29ya2VyJiB3b3JrZXIpCiAgICAg ICAgICAgICBpZiAocHJldmlvdXNJZGVudGlmaWVyID09IHdvcmtlci5pZGVudGlmaWVyKCkpCiAg ICAgICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICAgICAgcmVzdWx0Lml0ZXJhdG9yLT52YWx1 ZSA9IHdvcmtlci5pZGVudGlmaWVyKCk7Ci0gICAgICAgICAgICBpZiAoYXV0byogY29udHJvbGxp bmdSZWdpc3RyYXRpb24gPSByZWdpc3RyYXRpb25Gcm9tU2VydmljZVdvcmtlcklkZW50aWZpZXIo cHJldmlvdXNJZGVudGlmaWVyKSkKKyAgICAgICAgICAgIGlmIChhdXRvKiBjb250cm9sbGluZ1Jl Z2lzdHJhdGlvbiA9IHRoaXMtPnJlZ2lzdHJhdGlvbkZyb21TZXJ2aWNlV29ya2VySWRlbnRpZmll cihwcmV2aW91c0lkZW50aWZpZXIpKQogICAgICAgICAgICAgICAgIGNvbnRyb2xsaW5nUmVnaXN0 cmF0aW9uLT5yZW1vdmVDbGllbnRVc2luZ1JlZ2lzdHJhdGlvbihjbGllbnREYXRhLmlkZW50aWZp ZXIpOwogICAgICAgICB9CiAgICAgICAgIHJlZ2lzdHJhdGlvbi0+Y29udHJvbENsaWVudChjbGll bnREYXRhLmlkZW50aWZpZXIpOwpAQCAtODI0LDcgKzgyNCw3IEBAIHZvaWQgU1dTZXJ2ZXI6OkNv bm5lY3Rpb246OnJlc29sdmVSZWdpc3RyYXRpb25SZWFkeVJlcXVlc3RzKFNXU2VydmVyUmVnaXN0 cmF0aW9uCiAgICAgICAgIGlmICghcmVnaXN0cmF0aW9uLmtleSgpLmlzTWF0Y2hpbmcocmVxdWVz dC50b3BPcmlnaW4sIHJlcXVlc3QuY2xpZW50VVJMKSkKICAgICAgICAgICAgIHJldHVybiBmYWxz ZTsKIAotICAgICAgICByZWdpc3RyYXRpb25SZWFkeShyZXF1ZXN0LmlkZW50aWZpZXIsIHJlZ2lz dHJhdGlvbi5kYXRhKCkpOworICAgICAgICB0aGlzLT5yZWdpc3RyYXRpb25SZWFkeShyZXF1ZXN0 LmlkZW50aWZpZXIsIHJlZ2lzdHJhdGlvbi5kYXRhKCkpOwogICAgICAgICByZXR1cm4gdHJ1ZTsK ICAgICB9KTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMvc2VydmljZS9z ZXJ2ZXIvU1dTZXJ2ZXJSZWdpc3RyYXRpb24uY3BwIGIvU291cmNlL1dlYkNvcmUvd29ya2Vycy9z ZXJ2aWNlL3NlcnZlci9TV1NlcnZlclJlZ2lzdHJhdGlvbi5jcHAKaW5kZXggYzk1NDM0NDYxZWZj MzZjM2Y1ZTgyYTAzZmFkMzkyNWMzMWM0MDRjMi4uZmJkMGI3MDk3Zjg0NTY0YWVkYzkyN2YzZGU3 Nzk2MGUxMGQzMWUzNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvd29ya2Vycy9zZXJ2aWNl L3NlcnZlci9TV1NlcnZlclJlZ2lzdHJhdGlvbi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvd29y a2Vycy9zZXJ2aWNlL3NlcnZlci9TV1NlcnZlclJlZ2lzdHJhdGlvbi5jcHAKQEAgLTk5LDcgKzk5 LDcgQEAgdm9pZCBTV1NlcnZlclJlZ2lzdHJhdGlvbjo6dXBkYXRlUmVnaXN0cmF0aW9uU3RhdGUo U2VydmljZVdvcmtlclJlZ2lzdHJhdGlvblN0YXQKICAgICAgICAgc2VydmljZVdvcmtlckRhdGEg PSB3b3JrZXItPmRhdGEoKTsKIAogICAgIGZvckVhY2hDb25uZWN0aW9uKFsmXShhdXRvJiBjb25u ZWN0aW9uKSB7Ci0gICAgICAgIGNvbm5lY3Rpb24udXBkYXRlUmVnaXN0cmF0aW9uU3RhdGVJbkNs aWVudChpZGVudGlmaWVyKCksIHN0YXRlLCBzZXJ2aWNlV29ya2VyRGF0YSk7CisgICAgICAgIGNv bm5lY3Rpb24udXBkYXRlUmVnaXN0cmF0aW9uU3RhdGVJbkNsaWVudCh0aGlzLT5pZGVudGlmaWVy KCksIHN0YXRlLCBzZXJ2aWNlV29ya2VyRGF0YSk7CiAgICAgfSk7CiB9CiAKQEAgLTExNCw3ICsx MTQsNyBAQCB2b2lkIFNXU2VydmVyUmVnaXN0cmF0aW9uOjpzZXRVcGRhdGVWaWFDYWNoZShTZXJ2 aWNlV29ya2VyVXBkYXRlVmlhQ2FjaGUgdXBkYXRlVgogewogICAgIG1fdXBkYXRlVmlhQ2FjaGUg PSB1cGRhdGVWaWFDYWNoZTsKICAgICBmb3JFYWNoQ29ubmVjdGlvbihbJl0oYXV0byYgY29ubmVj dGlvbikgewotICAgICAgICBjb25uZWN0aW9uLnNldFJlZ2lzdHJhdGlvblVwZGF0ZVZpYUNhY2hl KGlkZW50aWZpZXIoKSwgdXBkYXRlVmlhQ2FjaGUpOworICAgICAgICBjb25uZWN0aW9uLnNldFJl Z2lzdHJhdGlvblVwZGF0ZVZpYUNhY2hlKHRoaXMtPmlkZW50aWZpZXIoKSwgdXBkYXRlVmlhQ2Fj aGUpOwogICAgIH0pOwogfQogCkBAIC0xMjIsMTQgKzEyMiwxNCBAQCB2b2lkIFNXU2VydmVyUmVn aXN0cmF0aW9uOjpzZXRMYXN0VXBkYXRlVGltZShXYWxsVGltZSB0aW1lKQogewogICAgIG1fbGFz dFVwZGF0ZVRpbWUgPSB0aW1lOwogICAgIGZvckVhY2hDb25uZWN0aW9uKFsmXShhdXRvJiBjb25u ZWN0aW9uKSB7Ci0gICAgICAgIGNvbm5lY3Rpb24uc2V0UmVnaXN0cmF0aW9uTGFzdFVwZGF0ZVRp bWUoaWRlbnRpZmllcigpLCB0aW1lKTsKKyAgICAgICAgY29ubmVjdGlvbi5zZXRSZWdpc3RyYXRp b25MYXN0VXBkYXRlVGltZSh0aGlzLT5pZGVudGlmaWVyKCksIHRpbWUpOwogICAgIH0pOwogfQog CiB2b2lkIFNXU2VydmVyUmVnaXN0cmF0aW9uOjpmaXJlVXBkYXRlRm91bmRFdmVudCgpCiB7CiAg ICAgZm9yRWFjaENvbm5lY3Rpb24oWyZdKGF1dG8mIGNvbm5lY3Rpb24pIHsKLSAgICAgICAgY29u bmVjdGlvbi5maXJlVXBkYXRlRm91bmRFdmVudChpZGVudGlmaWVyKCkpOworICAgICAgICBjb25u ZWN0aW9uLmZpcmVVcGRhdGVGb3VuZEV2ZW50KHRoaXMtPmlkZW50aWZpZXIoKSk7CiAgICAgfSk7 CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMvc2VydmljZS9zZXJ2ZXIv U1dTZXJ2ZXJXb3JrZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvd29ya2Vycy9zZXJ2aWNlL3NlcnZl ci9TV1NlcnZlcldvcmtlci5jcHAKaW5kZXggODc2MDk3NzE0NDdjMDFkNWQ2ZWM4OTA3MTM4MTdl YWFlMWE5ZmJlNS4uZTFlNjk5NzRhZjlmYWM1NWE4YTUwMDVlODE5NzFlNGRlYzg1OGJlMiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvd29ya2Vycy9zZXJ2aWNlL3NlcnZlci9TV1NlcnZlcldv cmtlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvd29ya2Vycy9zZXJ2aWNlL3NlcnZlci9TV1Nl cnZlcldvcmtlci5jcHAKQEAgLTE3OSw3ICsxNzksNyBAQCB2b2lkIFNXU2VydmVyV29ya2VyOjpz ZXRTdGF0ZShTZXJ2aWNlV29ya2VyU3RhdGUgc3RhdGUpCiAgICAgQVNTRVJUKHJlZ2lzdHJhdGlv biB8fCBzdGF0ZSA9PSBTZXJ2aWNlV29ya2VyU3RhdGU6OlJlZHVuZGFudCk7CiAgICAgaWYgKHJl Z2lzdHJhdGlvbikgewogICAgICAgICByZWdpc3RyYXRpb24tPmZvckVhY2hDb25uZWN0aW9uKFsm XShhdXRvJiBjb25uZWN0aW9uKSB7Ci0gICAgICAgICAgICBjb25uZWN0aW9uLnVwZGF0ZVdvcmtl clN0YXRlSW5DbGllbnQoaWRlbnRpZmllcigpLCBzdGF0ZSk7CisgICAgICAgICAgICBjb25uZWN0 aW9uLnVwZGF0ZVdvcmtlclN0YXRlSW5DbGllbnQodGhpcy0+aWRlbnRpZmllcigpLCBzdGF0ZSk7 CiAgICAgICAgIH0pOwogICAgIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9TdG9yYWdl UHJvY2Vzcy9TZXJ2aWNlV29ya2VyL1dlYlNXU2VydmVyQ29ubmVjdGlvbi5jcHAgYi9Tb3VyY2Uv V2ViS2l0L1N0b3JhZ2VQcm9jZXNzL1NlcnZpY2VXb3JrZXIvV2ViU1dTZXJ2ZXJDb25uZWN0aW9u LmNwcAppbmRleCA3NDA1YWU1MzI2NmI2YzA4Y2UyMTI3NTlkYzQ4YmI4YmRhZjBlNGViLi4wMTQ1 ZDYzMjA0OGMwMDRjZDMwODhkMDZjYTNkYzAyZTJkN2E1MjkwIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L1N0b3JhZ2VQcm9jZXNzL1NlcnZpY2VXb3JrZXIvV2ViU1dTZXJ2ZXJDb25uZWN0aW9u LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1N0b3JhZ2VQcm9jZXNzL1NlcnZpY2VXb3JrZXIvV2Vi U1dTZXJ2ZXJDb25uZWN0aW9uLmNwcApAQCAtMTU4LDcgKzE1OCw3IEBAIHZvaWQgV2ViU1dTZXJ2 ZXJDb25uZWN0aW9uOjpzdGFydEZldGNoKHVpbnQ2NF90IGZldGNoSWRlbnRpZmllciwgU2Vydmlj ZVdvcmtlclJlCiAKICAgICAgICAgICAgIGlmIChzdWNjZXNzKSB7CiAgICAgICAgICAgICAgICAg U1dTRVJWRVJDT05ORUNUSU9OX1JFTEVBU0VfTE9HX0lGX0FMTE9XRUQoInN0YXJ0RmV0Y2g6IFN0 YXJ0aW5nIGZldGNoICVsbHUgdmlhIHNlcnZpY2Ugd29ya2VyICVsbHUiLCBmZXRjaElkZW50aWZp ZXIsIHNlcnZpY2VXb3JrZXJJZGVudGlmaWVyLnRvVUludDY0KCkpOwotICAgICAgICAgICAgICAg IHNlbmRUb0NvbnRleHRQcm9jZXNzKGNvbnRleHRDb25uZWN0aW9uLCBNZXNzYWdlczo6V2ViU1dD b250ZXh0TWFuYWdlckNvbm5lY3Rpb246OlN0YXJ0RmV0Y2ggeyBpZGVudGlmaWVyKCksIGZldGNo SWRlbnRpZmllciwgc2VydmljZVdvcmtlcklkZW50aWZpZXIsIHJlcXVlc3QsIG9wdGlvbnMsIGZv cm1EYXRhLCByZWZlcnJlciB9KTsKKyAgICAgICAgICAgICAgICBzZW5kVG9Db250ZXh0UHJvY2Vz cyhjb250ZXh0Q29ubmVjdGlvbiwgTWVzc2FnZXM6OldlYlNXQ29udGV4dE1hbmFnZXJDb25uZWN0 aW9uOjpTdGFydEZldGNoIHsgdGhpcy0+aWRlbnRpZmllcigpLCBmZXRjaElkZW50aWZpZXIsIHNl cnZpY2VXb3JrZXJJZGVudGlmaWVyLCByZXF1ZXN0LCBvcHRpb25zLCBmb3JtRGF0YSwgcmVmZXJy ZXIgfSk7CiAgICAgICAgICAgICB9IGVsc2UgewogICAgICAgICAgICAgICAgIFNXU0VSVkVSQ09O TkVDVElPTl9SRUxFQVNFX0xPR19FUlJPUl9JRl9BTExPV0VEKCJzdGFydEZldGNoOiBmZXRjaElk ZW50aWZpZXI6ICVsbHUgLT4gRGlkTm90SGFuZGxlIGJlY2F1c2UgZmFpbGVkIHRvIHJ1biBzZXJ2 aWNlIHdvcmtlciIsIGZldGNoSWRlbnRpZmllcik7CiAgICAgICAgICAgICAgICAgbV9jb250ZW50 Q29ubmVjdGlvbi0+c2VuZChNZXNzYWdlczo6U2VydmljZVdvcmtlckNsaWVudEZldGNoOjpEaWRO b3RIYW5kbGUgeyB9LCBmZXRjaElkZW50aWZpZXIpOwo=