220455 2021-01-07 20:35:57 -0800 Use WeakHashSet instead of HashSet<T*> 2021-01-07 23:35:17 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 achristensen achristensen benjamin ews-watchlist ggaren webkit-bug-importer oldest_to_newest 1718198 0 achristensen 2021-01-07 20:35:57 -0800 Use WeakHashSet instead of HashSet<T*> 1718199 1 417240 achristensen 2021-01-07 20:36:40 -0800 Created attachment 417240 Patch 1718203 2 417240 ggaren 2021-01-07 20:45:56 -0800 Comment on attachment 417240 Patch r=me 1718230 3 ews-feeder 2021-01-07 23:34:50 -0800 Committed r271287: <https://trac.webkit.org/changeset/271287> All reviewed patches have been landed. Closing bug and clearing flags on attachment 417240. 1718231 4 webkit-bug-importer 2021-01-07 23:35:17 -0800 <rdar://problem/72920703> 417240 2021-01-07 20:36:40 -0800 2021-01-07 23:34:51 -0800 Patch bug-220455-20210107203639.patch text/plain 12855 achristensen SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNzEyODMpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDQyIEBACisyMDIxLTAxLTA3ICBBbGV4IENocmlz dGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgVXNlIFdlYWtIYXNo U2V0IGluc3RlYWQgb2YgSGFzaFNldDxUKj4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTIyMDQ1NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Nlc3Npb24uY3BwOgor ICAgICAgICAoV2ViS2l0OjpOZXR3b3JrU2Vzc2lvbjo6aW52YWxpZGF0ZUFuZENhbmNlbCk6Cisg ICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtTZXNzaW9uOjpyZWdpc3Rlck5ldHdvcmtEYXRhVGFzayk6 CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtTZXNzaW9uOjp1bnJlZ2lzdGVyTmV0d29ya0RhdGFU YXNrKToKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9OZXR3b3JrU2Vzc2lvbi5oOgorICAgICAg ICAoV2ViS2l0OjpOZXR3b3JrU2Vzc2lvbjo6cmVnaXN0ZXJOZXR3b3JrRGF0YVRhc2spOiBEZWxl dGVkLgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrU2Vzc2lvbjo6dW5yZWdpc3Rlck5ldHdvcmtE YXRhVGFzayk6IERlbGV0ZWQuCisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VHcm91cC5jcHA6 CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VHcm91cDo6YWRkUGFnZSk6CisgICAgICAgIChXZWJL aXQ6OldlYlBhZ2VHcm91cDo6cmVtb3ZlUGFnZSk6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VH cm91cDo6c2V0UHJlZmVyZW5jZXMpOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlR3JvdXAu aDoKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcDoKKyAgICAgICAgKFdlYktp dDo6bV9saW1pdHNOYXZpZ2F0aW9uc1RvQXBwQm91bmREb21haW5zKToKKyAgICAgICAgKFdlYktp dDo6V2ViUGFnZVByb3h5Ojp+V2ViUGFnZVByb3h5KToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2Vi UHJlZmVyZW5jZXMuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQcmVmZXJlbmNlczo6fldlYlBy ZWZlcmVuY2VzKToKKyAgICAgICAgKFdlYktpdDo6V2ViUHJlZmVyZW5jZXM6OmFkZFBhZ2UpOgor ICAgICAgICAoV2ViS2l0OjpXZWJQcmVmZXJlbmNlczo6cmVtb3ZlUGFnZSk6CisgICAgICAgIChX ZWJLaXQ6OldlYlByZWZlcmVuY2VzOjp1cGRhdGUpOgorICAgICAgICAoV2ViS2l0OjpXZWJQcmVm ZXJlbmNlczo6dXBkYXRlQm9vbFZhbHVlRm9ySW50ZXJuYWxEZWJ1Z0ZlYXR1cmVLZXkpOgorICAg ICAgICAqIFVJUHJvY2Vzcy9XZWJQcmVmZXJlbmNlcy5oOgorICAgICAgICAqIFdlYlByb2Nlc3Mv R2VvbG9jYXRpb24vV2ViR2VvbG9jYXRpb25NYW5hZ2VyLmNwcDoKKyAgICAgICAgKFdlYktpdDo6 V2ViR2VvbG9jYXRpb25NYW5hZ2VyOjpyZWdpc3RlcldlYlBhZ2UpOgorICAgICAgICAoV2ViS2l0 OjpXZWJHZW9sb2NhdGlvbk1hbmFnZXI6OnVucmVnaXN0ZXJXZWJQYWdlKToKKyAgICAgICAgKFdl YktpdDo6V2ViR2VvbG9jYXRpb25NYW5hZ2VyOjpzZXRFbmFibGVIaWdoQWNjdXJhY3lGb3JQYWdl KToKKyAgICAgICAgKFdlYktpdDo6V2ViR2VvbG9jYXRpb25NYW5hZ2VyOjppc1VwZGF0aW5nIGNv bnN0KToKKyAgICAgICAgKFdlYktpdDo6V2ViR2VvbG9jYXRpb25NYW5hZ2VyOjppc0hpZ2hBY2N1 cmFjeUVuYWJsZWQgY29uc3QpOgorICAgICAgICAqIFdlYlByb2Nlc3MvR2VvbG9jYXRpb24vV2Vi R2VvbG9jYXRpb25NYW5hZ2VyLmg6CisgICAgICAgIChXZWJLaXQ6OldlYkdlb2xvY2F0aW9uTWFu YWdlcjo6aXNVcGRhdGluZyBjb25zdCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJLaXQ6OldlYkdl b2xvY2F0aW9uTWFuYWdlcjo6aXNIaWdoQWNjdXJhY3lFbmFibGVkIGNvbnN0KTogRGVsZXRlZC4K KwogMjAyMS0wMS0wNyAgS2F0ZSBDaGVuZXkgIDxrYXRoZXJpbmVfY2hlbmV5QGFwcGxlLmNvbT4K IAogICAgICAgICBFcnJvciBpbiBsYXlvdXQgdGVzdHM6ICJQYXNzZWQgSVRQIGVuYWJsZWQgc3Rh dGUgKDApIGRvZXMgbm90IG1hdGNoIFRDQyBzZXR0aW5nICgxKSIKSW5kZXg6IFNvdXJjZS9XZWJL aXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Nlc3Npb24uY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Nlc3Npb24uY3BwCShyZXZpc2lvbiAyNzEx NTcpCisrKyBTb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtTZXNzaW9uLmNwcAko d29ya2luZyBjb3B5KQpAQCAtMTUxLDggKzE1MSw4IEBAIHZvaWQgTmV0d29ya1Nlc3Npb246OmRl c3Ryb3lSZXNvdXJjZUxvYWQKIAogdm9pZCBOZXR3b3JrU2Vzc2lvbjo6aW52YWxpZGF0ZUFuZENh bmNlbCgpCiB7Ci0gICAgZm9yIChhdXRvKiB0YXNrIDogbV9kYXRhVGFza1NldCkKLSAgICAgICAg dGFzay0+aW52YWxpZGF0ZUFuZENhbmNlbCgpOworICAgIGZvciAoYXV0byYgdGFzayA6IG1fZGF0 YVRhc2tTZXQpCisgICAgICAgIHRhc2suaW52YWxpZGF0ZUFuZENhbmNlbCgpOwogI2lmIEVOQUJM RShSRVNPVVJDRV9MT0FEX1NUQVRJU1RJQ1MpCiAgICAgaWYgKG1fcmVzb3VyY2VMb2FkU3RhdGlz dGljcykKICAgICAgICAgbV9yZXNvdXJjZUxvYWRTdGF0aXN0aWNzLT5pbnZhbGlkYXRlQW5kQ2Fu Y2VsKCk7CkBAIC0zNzIsNCArMzcyLDE0IEBAIHN0ZDo6dW5pcXVlX3B0cjxXZWJTb2NrZXRUYXNr PiBOZXR3b3JrU2UKICAgICByZXR1cm4gbnVsbHB0cjsKIH0KIAordm9pZCBOZXR3b3JrU2Vzc2lv bjo6cmVnaXN0ZXJOZXR3b3JrRGF0YVRhc2soTmV0d29ya0RhdGFUYXNrJiB0YXNrKQoreworICAg IG1fZGF0YVRhc2tTZXQuYWRkKHRhc2spOworfQorCit2b2lkIE5ldHdvcmtTZXNzaW9uOjp1bnJl Z2lzdGVyTmV0d29ya0RhdGFUYXNrKE5ldHdvcmtEYXRhVGFzayYgdGFzaykKK3sKKyAgICBtX2Rh dGFUYXNrU2V0LnJlbW92ZSh0YXNrKTsKK30KKwogfSAvLyBuYW1lc3BhY2UgV2ViS2l0CkluZGV4 OiBTb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtTZXNzaW9uLmgKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrU2Vzc2lvbi5oCShyZXZp c2lvbiAyNzExNTcpCisrKyBTb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtTZXNz aW9uLmgJKHdvcmtpbmcgY29weSkKQEAgLTgzLDggKzgzLDggQEAgcHVibGljOgogICAgIE5ldHdv cmtQcm9jZXNzJiBuZXR3b3JrUHJvY2VzcygpIHsgcmV0dXJuIG1fbmV0d29ya1Byb2Nlc3M7IH0K ICAgICBXZWJDb3JlOjpOZXR3b3JrU3RvcmFnZVNlc3Npb24qIG5ldHdvcmtTdG9yYWdlU2Vzc2lv bigpIGNvbnN0OwogCi0gICAgdm9pZCByZWdpc3Rlck5ldHdvcmtEYXRhVGFzayhOZXR3b3JrRGF0 YVRhc2smIHRhc2spIHsgbV9kYXRhVGFza1NldC5hZGQoJnRhc2spOyB9Ci0gICAgdm9pZCB1bnJl Z2lzdGVyTmV0d29ya0RhdGFUYXNrKE5ldHdvcmtEYXRhVGFzayYgdGFzaykgeyBtX2RhdGFUYXNr U2V0LnJlbW92ZSgmdGFzayk7IH0KKyAgICB2b2lkIHJlZ2lzdGVyTmV0d29ya0RhdGFUYXNrKE5l dHdvcmtEYXRhVGFzayYpOworICAgIHZvaWQgdW5yZWdpc3Rlck5ldHdvcmtEYXRhVGFzayhOZXR3 b3JrRGF0YVRhc2smKTsKIAogI2lmIEVOQUJMRShSRVNPVVJDRV9MT0FEX1NUQVRJU1RJQ1MpCiAg ICAgV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlKiByZXNvdXJjZUxvYWRTdGF0aXN0aWNz KCkgY29uc3QgeyByZXR1cm4gbV9yZXNvdXJjZUxvYWRTdGF0aXN0aWNzLmdldCgpOyB9CkBAIC0x NTksNyArMTU5LDcgQEAgcHJvdGVjdGVkOgogCiAgICAgUEFMOjpTZXNzaW9uSUQgbV9zZXNzaW9u SUQ7CiAgICAgUmVmPE5ldHdvcmtQcm9jZXNzPiBtX25ldHdvcmtQcm9jZXNzOwotICAgIEhhc2hT ZXQ8TmV0d29ya0RhdGFUYXNrKj4gbV9kYXRhVGFza1NldDsKKyAgICBXZWFrSGFzaFNldDxOZXR3 b3JrRGF0YVRhc2s+IG1fZGF0YVRhc2tTZXQ7CiAjaWYgRU5BQkxFKFJFU09VUkNFX0xPQURfU1RB VElTVElDUykKICAgICBTdHJpbmcgbV9yZXNvdXJjZUxvYWRTdGF0aXN0aWNzRGlyZWN0b3J5Owog ICAgIFJlZlB0cjxXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU+IG1fcmVzb3VyY2VMb2Fk U3RhdGlzdGljczsKSW5kZXg6IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VHcm91cC5j cHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZUdyb3VwLmNw cAkocmV2aXNpb24gMjcxMTU3KQorKysgU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZUdy b3VwLmNwcAkod29ya2luZyBjb3B5KQpAQCAtOTMsMTIgKzkzLDEyIEBAIFdlYlBhZ2VHcm91cDo6 fldlYlBhZ2VHcm91cCgpCiAgICAgd2ViUGFnZUdyb3VwTWFwKCkucmVtb3ZlKHBhZ2VHcm91cElE KCkpOwogfQogCi12b2lkIFdlYlBhZ2VHcm91cDo6YWRkUGFnZShXZWJQYWdlUHJveHkqIHBhZ2Up Cit2b2lkIFdlYlBhZ2VHcm91cDo6YWRkUGFnZShXZWJQYWdlUHJveHkmIHBhZ2UpCiB7CiAgICAg bV9wYWdlcy5hZGQocGFnZSk7CiB9CiAKLXZvaWQgV2ViUGFnZUdyb3VwOjpyZW1vdmVQYWdlKFdl YlBhZ2VQcm94eSogcGFnZSkKK3ZvaWQgV2ViUGFnZUdyb3VwOjpyZW1vdmVQYWdlKFdlYlBhZ2VQ cm94eSYgcGFnZSkKIHsKICAgICBtX3BhZ2VzLnJlbW92ZShwYWdlKTsKIH0KQEAgLTExMSw3ICsx MTEsNyBAQCB2b2lkIFdlYlBhZ2VHcm91cDo6c2V0UHJlZmVyZW5jZXMoV2ViUHJlCiAgICAgbV9w cmVmZXJlbmNlcyA9IHByZWZlcmVuY2VzOwogCiAgICAgZm9yIChhdXRvJiB3ZWJQYWdlUHJveHkg OiBtX3BhZ2VzKQotICAgICAgICB3ZWJQYWdlUHJveHktPnNldFByZWZlcmVuY2VzKCptX3ByZWZl cmVuY2VzKTsKKyAgICAgICAgd2ViUGFnZVByb3h5LnNldFByZWZlcmVuY2VzKCptX3ByZWZlcmVu Y2VzKTsKIH0KIAogV2ViUHJlZmVyZW5jZXMmIFdlYlBhZ2VHcm91cDo6cHJlZmVyZW5jZXMoKSBj b25zdApJbmRleDogU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZUdyb3VwLmgKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZUdyb3VwLmgJKHJldmlzaW9u IDI3MTE1NykKKysrIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VHcm91cC5oCSh3b3Jr aW5nIGNvcHkpCkBAIC0zMSw2ICszMSw3IEBACiAjaW5jbHVkZSA8V2ViQ29yZS9Vc2VyU3R5bGVT aGVldFR5cGVzLmg+CiAjaW5jbHVkZSA8d3RmL0ZvcndhcmQuaD4KICNpbmNsdWRlIDx3dGYvSGFz aFNldC5oPgorI2luY2x1ZGUgPHd0Zi9XZWFrSGFzaFNldC5oPgogI2luY2x1ZGUgPHd0Zi90ZXh0 L1dURlN0cmluZy5oPgogCiBuYW1lc3BhY2UgV2ViS2l0IHsKQEAgLTQ4LDggKzQ5LDggQEAgcHVi bGljOgogCiAgICAgdmlydHVhbCB+V2ViUGFnZUdyb3VwKCk7CiAKLSAgICB2b2lkIGFkZFBhZ2Uo V2ViUGFnZVByb3h5Kik7Ci0gICAgdm9pZCByZW1vdmVQYWdlKFdlYlBhZ2VQcm94eSopOworICAg IHZvaWQgYWRkUGFnZShXZWJQYWdlUHJveHkmKTsKKyAgICB2b2lkIHJlbW92ZVBhZ2UoV2ViUGFn ZVByb3h5Jik7CiAKICAgICB1aW50NjRfdCBwYWdlR3JvdXBJRCgpIGNvbnN0IHsgcmV0dXJuIG1f ZGF0YS5wYWdlR3JvdXBJRDsgfQogCkBAIC02NCw3ICs2NSw3IEBAIHByaXZhdGU6CiAgICAgV2Vi UGFnZUdyb3VwRGF0YSBtX2RhdGE7CiAgICAgUmVmUHRyPFdlYlByZWZlcmVuY2VzPiBtX3ByZWZl cmVuY2VzOwogICAgIFJlZjxXZWJVc2VyQ29udGVudENvbnRyb2xsZXJQcm94eT4gbV91c2VyQ29u dGVudENvbnRyb2xsZXI7Ci0gICAgSGFzaFNldDxXZWJQYWdlUHJveHkqPiBtX3BhZ2VzOworICAg IFdlYWtIYXNoU2V0PFdlYlBhZ2VQcm94eT4gbV9wYWdlczsKIH07CiAKIH0gLy8gbmFtZXNwYWNl IFdlYktpdApJbmRleDogU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCShy ZXZpc2lvbiAyNzExNjIpCisrKyBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHku Y3BwCSh3b3JraW5nIGNvcHkpCkBAIC01NDgsNyArNTQ4LDcgQEAgV2ViUGFnZVByb3h5OjpXZWJQ YWdlUHJveHkoUGFnZUNsaWVudCYgcAogICAgIFdlYlByb2Nlc3NQb29sOjpzdGF0aXN0aWNzKCku d2tQYWdlQ291bnQrKzsKIAogICAgIG1fcHJlZmVyZW5jZXMtPmFkZFBhZ2UoKnRoaXMpOwotICAg IG1fcGFnZUdyb3VwLT5hZGRQYWdlKHRoaXMpOworICAgIG1fcGFnZUdyb3VwLT5hZGRQYWdlKCp0 aGlzKTsKIAogICAgIG1faW5zcGVjdG9yID0gV2ViSW5zcGVjdG9yUHJveHk6OmNyZWF0ZSgqdGhp cyk7CiAKQEAgLTYwNCw3ICs2MDQsNyBAQCBXZWJQYWdlUHJveHk6On5XZWJQYWdlUHJveHkoKQog ICAgICAgICBUZXh0Q2hlY2tlcjo6Y2xvc2VTcGVsbERvY3VtZW50V2l0aFRhZyhtX3NwZWxsRG9j dW1lbnRUYWcudmFsdWUoKSk7CiAKICAgICBtX3ByZWZlcmVuY2VzLT5yZW1vdmVQYWdlKCp0aGlz KTsKLSAgICBtX3BhZ2VHcm91cC0+cmVtb3ZlUGFnZSh0aGlzKTsKKyAgICBtX3BhZ2VHcm91cC0+ cmVtb3ZlUGFnZSgqdGhpcyk7CiAKICNpZm5kZWYgTkRFQlVHCiAgICAgd2ViUGFnZVByb3h5Q291 bnRlci5kZWNyZW1lbnQoKTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByZWZl cmVuY2VzLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcmVm ZXJlbmNlcy5jcHAJKHJldmlzaW9uIDI3MTE1NykKKysrIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L1dlYlByZWZlcmVuY2VzLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNzYsNyArNzYsNyBAQCBXZWJQ cmVmZXJlbmNlczo6V2ViUHJlZmVyZW5jZXMoY29uc3QgV2ViCiAKIFdlYlByZWZlcmVuY2VzOjp+ V2ViUHJlZmVyZW5jZXMoKQogewotICAgIEFTU0VSVChtX3BhZ2VzLmlzRW1wdHkoKSk7CisgICAg QVNTRVJUKG1fcGFnZXMuY29tcHV0ZXNFbXB0eSgpKTsKIH0KIAogUmVmPFdlYlByZWZlcmVuY2Vz PiBXZWJQcmVmZXJlbmNlczo6Y29weSgpIGNvbnN0CkBAIC04NiwxNCArODYsMTQgQEAgUmVmPFdl YlByZWZlcmVuY2VzPiBXZWJQcmVmZXJlbmNlczo6Y29weQogCiB2b2lkIFdlYlByZWZlcmVuY2Vz OjphZGRQYWdlKFdlYlBhZ2VQcm94eSYgd2ViUGFnZVByb3h5KQogewotICAgIEFTU0VSVCghbV9w YWdlcy5jb250YWlucygmd2ViUGFnZVByb3h5KSk7Ci0gICAgbV9wYWdlcy5hZGQoJndlYlBhZ2VQ cm94eSk7CisgICAgQVNTRVJUKCFtX3BhZ2VzLmNvbnRhaW5zKHdlYlBhZ2VQcm94eSkpOworICAg IG1fcGFnZXMuYWRkKHdlYlBhZ2VQcm94eSk7CiB9CiAKIHZvaWQgV2ViUHJlZmVyZW5jZXM6OnJl bW92ZVBhZ2UoV2ViUGFnZVByb3h5JiB3ZWJQYWdlUHJveHkpCiB7Ci0gICAgQVNTRVJUKG1fcGFn ZXMuY29udGFpbnMoJndlYlBhZ2VQcm94eSkpOwotICAgIG1fcGFnZXMucmVtb3ZlKCZ3ZWJQYWdl UHJveHkpOworICAgIEFTU0VSVChtX3BhZ2VzLmNvbnRhaW5zKHdlYlBhZ2VQcm94eSkpOworICAg IG1fcGFnZXMucmVtb3ZlKHdlYlBhZ2VQcm94eSk7CiB9CiAKIHZvaWQgV2ViUHJlZmVyZW5jZXM6 OnVwZGF0ZSgpCkBAIC0xMDQsNyArMTA0LDcgQEAgdm9pZCBXZWJQcmVmZXJlbmNlczo6dXBkYXRl KCkKICAgICB9CiAgICAgICAgIAogICAgIGZvciAoYXV0byYgd2ViUGFnZVByb3h5IDogbV9wYWdl cykKLSAgICAgICAgd2ViUGFnZVByb3h5LT5wcmVmZXJlbmNlc0RpZENoYW5nZSgpOworICAgICAg ICB3ZWJQYWdlUHJveHkucHJlZmVyZW5jZXNEaWRDaGFuZ2UoKTsKIH0KIAogdm9pZCBXZWJQcmVm ZXJlbmNlczo6c3RhcnRCYXRjaGluZ1VwZGF0ZXMoKQpAQCAtMTY2LDggKzE2Niw4IEBAIHZvaWQg V2ViUHJlZmVyZW5jZXM6OnVwZGF0ZUJvb2xWYWx1ZUZvcksKIHZvaWQgV2ViUHJlZmVyZW5jZXM6 OnVwZGF0ZUJvb2xWYWx1ZUZvckludGVybmFsRGVidWdGZWF0dXJlS2V5KGNvbnN0IFN0cmluZyYg a2V5LCBib29sIHZhbHVlKQogewogICAgIGlmIChrZXkgPT0gV2ViUHJlZmVyZW5jZXNLZXk6OnBy b2Nlc3NTd2FwT25Dcm9zc1NpdGVOYXZpZ2F0aW9uRW5hYmxlZEtleSgpKSB7Ci0gICAgICAgIGZv ciAoYXV0byogcGFnZSA6IG1fcGFnZXMpCi0gICAgICAgICAgICBwYWdlLT5wcm9jZXNzKCkucHJv Y2Vzc1Bvb2woKS5jb25maWd1cmF0aW9uKCkuc2V0UHJvY2Vzc1N3YXBzT25OYXZpZ2F0aW9uKHZh bHVlKTsKKyAgICAgICAgZm9yIChhdXRvJiBwYWdlIDogbV9wYWdlcykKKyAgICAgICAgICAgIHBh Z2UucHJvY2VzcygpLnByb2Nlc3NQb29sKCkuY29uZmlndXJhdGlvbigpLnNldFByb2Nlc3NTd2Fw c09uTmF2aWdhdGlvbih2YWx1ZSk7CiAKICAgICAgICAgcmV0dXJuOwogICAgIH0KSW5kZXg6IFNv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByZWZlcmVuY2VzLmgKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJlZmVyZW5jZXMuaAkocmV2aXNpb24gMjcxMTU3KQor KysgU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJlZmVyZW5jZXMuaAkod29ya2luZyBjb3B5 KQpAQCAtMzIsNiArMzIsNyBAQAogI2luY2x1ZGUgIldlYlByZWZlcmVuY2VzU3RvcmUuaCIKICNp bmNsdWRlIDx3dGYvSGFzaFNldC5oPgogI2luY2x1ZGUgPHd0Zi9SZWZQdHIuaD4KKyNpbmNsdWRl IDx3dGYvV2Vha0hhc2hTZXQuaD4KIAogI2RlZmluZSBERUNMQVJFX1BSRUZFUkVOQ0VfR0VUVEVS X0FORF9TRVRURVJTKEtleVVwcGVyLCBLZXlMb3dlciwgVHlwZU5hbWUsIFR5cGUsIERlZmF1bHRW YWx1ZSwgSHVtYW5SZWFkYWJsZU5hbWUsIEh1bWFuUmVhZGFibGVEZXNjcmlwdGlvbikgXAogICAg IHZvaWQgc2V0IyNLZXlVcHBlcihjb25zdCBUeXBlJiB2YWx1ZSk7IFwKQEAgLTEzOCw3ICsxMzks NyBAQCBwcml2YXRlOgogICAgIGNvbnN0IFN0cmluZyBtX2dsb2JhbERlYnVnS2V5UHJlZml4Owog ICAgIFdlYlByZWZlcmVuY2VzU3RvcmUgbV9zdG9yZTsKIAotICAgIEhhc2hTZXQ8V2ViUGFnZVBy b3h5Kj4gbV9wYWdlczsKKyAgICBXZWFrSGFzaFNldDxXZWJQYWdlUHJveHk+IG1fcGFnZXM7CiAg ICAgdW5zaWduZWQgbV91cGRhdGVCYXRjaENvdW50IHsgMCB9OwogICAgIGJvb2wgbV9uZWVkVXBk YXRlQWZ0ZXJCYXRjaCB7IGZhbHNlIH07CiB9OwpJbmRleDogU291cmNlL1dlYktpdC9XZWJQcm9j ZXNzL0dlb2xvY2F0aW9uL1dlYkdlb2xvY2F0aW9uTWFuYWdlci5jcHAKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0dlb2xvY2F0aW9uL1dlYkdlb2xvY2F0aW9uTWFuYWdl ci5jcHAJKHJldmlzaW9uIDI3MTE1NykKKysrIFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9HZW9s b2NhdGlvbi9XZWJHZW9sb2NhdGlvbk1hbmFnZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC01NCw3 ICs1NCw3IEBAIHZvaWQgV2ViR2VvbG9jYXRpb25NYW5hZ2VyOjpyZWdpc3RlcldlYlAKIHsKICAg ICBib29sIHdhc1VwZGF0aW5nID0gaXNVcGRhdGluZygpOwogCi0gICAgbV9wYWdlU2V0LmFkZCgm cGFnZSk7CisgICAgbV9wYWdlU2V0LmFkZChwYWdlKTsKIAogICAgIGlmICghd2FzVXBkYXRpbmcp CiAgICAgICAgIG1fcHJvY2Vzcy5wYXJlbnRQcm9jZXNzQ29ubmVjdGlvbigpLT5zZW5kKE1lc3Nh Z2VzOjpXZWJHZW9sb2NhdGlvbk1hbmFnZXJQcm94eTo6U3RhcnRVcGRhdGluZyhwYWdlLndlYlBh Z2VQcm94eUlkZW50aWZpZXIoKSwgYXV0aG9yaXphdGlvblRva2VuKSwgMCk7CkBAIC02NCw4ICs2 NCw4IEBAIHZvaWQgV2ViR2VvbG9jYXRpb25NYW5hZ2VyOjp1bnJlZ2lzdGVyV2UKIHsKICAgICBi b29sIGhpZ2hBY2N1cmFjeVdhc0VuYWJsZWQgPSBpc0hpZ2hBY2N1cmFjeUVuYWJsZWQoKTsKIAot ICAgIG1fcGFnZVNldC5yZW1vdmUoJnBhZ2UpOwotICAgIG1faGlnaEFjY3VyYWN5UGFnZVNldC5y ZW1vdmUoJnBhZ2UpOworICAgIG1fcGFnZVNldC5yZW1vdmUocGFnZSk7CisgICAgbV9oaWdoQWNj dXJhY3lQYWdlU2V0LnJlbW92ZShwYWdlKTsKIAogICAgIGlmICghaXNVcGRhdGluZygpKQogICAg ICAgICBtX3Byb2Nlc3MucGFyZW50UHJvY2Vzc0Nvbm5lY3Rpb24oKS0+c2VuZChNZXNzYWdlczo6 V2ViR2VvbG9jYXRpb25NYW5hZ2VyUHJveHk6OlN0b3BVcGRhdGluZygpLCAwKTsKQEAgLTgxLDkg KzgxLDkgQEAgdm9pZCBXZWJHZW9sb2NhdGlvbk1hbmFnZXI6OnNldEVuYWJsZUhpZwogICAgIGJv b2wgaGlnaEFjY3VyYWN5V2FzRW5hYmxlZCA9IGlzSGlnaEFjY3VyYWN5RW5hYmxlZCgpOwogCiAg ICAgaWYgKGVuYWJsZWQpCi0gICAgICAgIG1faGlnaEFjY3VyYWN5UGFnZVNldC5hZGQoJnBhZ2Up OworICAgICAgICBtX2hpZ2hBY2N1cmFjeVBhZ2VTZXQuYWRkKHBhZ2UpOwogICAgIGVsc2UKLSAg ICAgICAgbV9oaWdoQWNjdXJhY3lQYWdlU2V0LnJlbW92ZSgmcGFnZSk7CisgICAgICAgIG1faGln aEFjY3VyYWN5UGFnZVNldC5yZW1vdmUocGFnZSk7CiAKICAgICBib29sIGhpZ2hBY2N1cmFjeVNo b3VsZEJlRW5hYmxlZCA9IGlzSGlnaEFjY3VyYWN5RW5hYmxlZCgpOwogICAgIGlmIChoaWdoQWNj dXJhY3lXYXNFbmFibGVkICE9IGhpZ2hBY2N1cmFjeVNob3VsZEJlRW5hYmxlZCkKQEAgLTEyNCw0 ICsxMjQsMTQgQEAgdm9pZCBXZWJHZW9sb2NhdGlvbk1hbmFnZXI6OnJlc2V0UGVybWlzcwogfQog I2VuZGlmIC8vIFBMQVRGT1JNKElPU19GQU1JTFkpCiAKK2Jvb2wgV2ViR2VvbG9jYXRpb25NYW5h Z2VyOjppc1VwZGF0aW5nKCkgY29uc3QKK3sKKyAgICByZXR1cm4gIW1fcGFnZVNldC5jb21wdXRl c0VtcHR5KCk7Cit9CisKK2Jvb2wgV2ViR2VvbG9jYXRpb25NYW5hZ2VyOjppc0hpZ2hBY2N1cmFj eUVuYWJsZWQoKSBjb25zdAoreworICAgIHJldHVybiAhbV9oaWdoQWNjdXJhY3lQYWdlU2V0LmNv bXB1dGVzRW1wdHkoKTsKK30KKwogfSAvLyBuYW1lc3BhY2UgV2ViS2l0CkluZGV4OiBTb3VyY2Uv V2ViS2l0L1dlYlByb2Nlc3MvR2VvbG9jYXRpb24vV2ViR2VvbG9jYXRpb25NYW5hZ2VyLmgKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0dlb2xvY2F0aW9uL1dlYkdlb2xv Y2F0aW9uTWFuYWdlci5oCShyZXZpc2lvbiAyNzExNTcpCisrKyBTb3VyY2UvV2ViS2l0L1dlYlBy b2Nlc3MvR2VvbG9jYXRpb24vV2ViR2VvbG9jYXRpb25NYW5hZ2VyLmgJKHdvcmtpbmcgY29weSkK QEAgLTMyLDYgKzMyLDcgQEAKICNpbmNsdWRlIDx3dGYvSGFzaE1hcC5oPgogI2luY2x1ZGUgPHd0 Zi9IYXNoU2V0Lmg+CiAjaW5jbHVkZSA8d3RmL05vbmNvcHlhYmxlLmg+CisjaW5jbHVkZSA8d3Rm L1dlYWtIYXNoU2V0Lmg+CiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIGNsYXNzIEdlb2xvY2F0aW9u OwpAQCAtNjEsOCArNjIsOCBAQCBwcml2YXRlOgogICAgIC8vIElQQzo6TWVzc2FnZVJlY2VpdmVy CiAgICAgdm9pZCBkaWRSZWNlaXZlTWVzc2FnZShJUEM6OkNvbm5lY3Rpb24mLCBJUEM6OkRlY29k ZXImKSBvdmVycmlkZTsKIAotICAgIGJvb2wgaXNVcGRhdGluZygpIGNvbnN0IHsgcmV0dXJuICFt X3BhZ2VTZXQuaXNFbXB0eSgpOyB9Ci0gICAgYm9vbCBpc0hpZ2hBY2N1cmFjeUVuYWJsZWQoKSBj b25zdCB7IHJldHVybiAhbV9oaWdoQWNjdXJhY3lQYWdlU2V0LmlzRW1wdHkoKTsgfQorICAgIGJv b2wgaXNVcGRhdGluZygpIGNvbnN0OworICAgIGJvb2wgaXNIaWdoQWNjdXJhY3lFbmFibGVkKCkg Y29uc3Q7CiAKICAgICB2b2lkIGRpZENoYW5nZVBvc2l0aW9uKGNvbnN0IFdlYkNvcmU6Okdlb2xv Y2F0aW9uUG9zaXRpb25EYXRhJik7CiAgICAgdm9pZCBkaWRGYWlsVG9EZXRlcm1pbmVQb3NpdGlv bihjb25zdCBTdHJpbmcmIGVycm9yTWVzc2FnZSk7CkBAIC03MSw4ICs3Miw4IEBAIHByaXZhdGU6 CiAjZW5kaWYgLy8gUExBVEZPUk0oSU9TX0ZBTUlMWSkKIAogICAgIFdlYlByb2Nlc3MmIG1fcHJv Y2VzczsKLSAgICBIYXNoU2V0PFdlYlBhZ2UqPiBtX3BhZ2VTZXQ7Ci0gICAgSGFzaFNldDxXZWJQ YWdlKj4gbV9oaWdoQWNjdXJhY3lQYWdlU2V0OworICAgIFdlYWtIYXNoU2V0PFdlYlBhZ2U+IG1f cGFnZVNldDsKKyAgICBXZWFrSGFzaFNldDxXZWJQYWdlPiBtX2hpZ2hBY2N1cmFjeVBhZ2VTZXQ7 CiB9OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQK