223055 2021-03-10 20:18:57 -0800 Use tagged pointers in more places in the MetaAllocator code. 2021-03-11 11:27:34 -0800 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 mark.lam mark.lam benjamin cdumez cmarcelo ews-watchlist saam webkit-bug-importer oldest_to_newest 1738347 0 mark.lam 2021-03-10 20:18:57 -0800 rdar://69971224 1738348 1 422897 mark.lam 2021-03-10 20:23:59 -0800 Created attachment 422897 proposed patch. 1738538 2 422897 mark.lam 2021-03-11 11:03:27 -0800 Comment on attachment 422897 proposed patch. Thanks for the review. Landing now. 1738552 3 ews-feeder 2021-03-11 11:27:31 -0800 Committed r274291: <https://commits.webkit.org/r274291> All reviewed patches have been landed. Closing bug and clearing flags on attachment 422897. 422897 2021-03-10 20:23:59 -0800 2021-03-11 11:27:33 -0800 proposed patch. bug-223055.patch text/plain 10812 mark.lam SW5kZXg6IFNvdXJjZS9XVEYvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XVEYvQ2hh bmdlTG9nCShyZXZpc2lvbiAyNzQyNTEpCisrKyBTb3VyY2UvV1RGL0NoYW5nZUxvZwkod29ya2lu ZyBjb3B5KQpAQCAtMSwzICsxLDMzIEBACisyMDIxLTAzLTEwICBNYXJrIExhbSAgPG1hcmsubGFt QGFwcGxlLmNvbT4KKworICAgICAgICBVc2UgdGFnZ2VkIHBvaW50ZXJzIGluIG1vcmUgcGxhY2Vz IGluIHRoZSBNZXRhQWxsb2NhdG9yIGNvZGUuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0yMjMwNTUKKyAgICAgICAgcmRhcjovLzY5OTcxMjI0CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgMS4gTWFkZSB0aGUg TWV0YUFsbG9jYXRvclB0ciBjb25zdHJ1Y3RvciB0aGF0IHRha2VzIGEgcmF3IHBvaW50ZXIgcHJp dmF0ZSwgYW5kCisgICAgICAgICAgIG9ubHkgY2FsbCBpdCBmcm9tIGEgc3RhdGljIGZhY3Rvcnkg bWV0aG9kLCBNZXRhQWxsb2NhdG9yUHRyOjptYWtlRnJvbVJhd1BvaW50ZXIoKQorICAgICAgICAg ICB0byBtYWtlIGl0IGNsZWFyIHRoYXQgd2UncmUgdXNpbmcgYW4gdW50YWdnZWQgcG9pbnRlciBh cyBhIHNvdXJjZS4KKyAgICAgICAgMi4gQWRkZWQgYSBNZXRhQWxsb2NhdG9yUHRyIGNvbnN0cnVj dG9yIHRoYXQgcmV0YWdzIGEgcG9pbnRlci4KKyAgICAgICAgICAgVGhpcyBhbGxvd3MgbWluaW1p emVzIHRoZSB3aW5kb3cgb2Ygd29ya2luZyB3aXRoIGFuIHVudGFnZ2VkIHBvaW50ZXIuCisgICAg ICAgIDMuIEFzc2VydCB0aGF0IE1ldGFBbGxvY2F0b3I6OmFkZEZyZXNoRnJlZVNwYWNlKCkgaXMg b25seSBjYWxsZWQgYXQgc3lzdGVtCisgICAgICAgICAgIGluaXRpYWxpemF0aW9uIHRpbWUuCisg ICAgICAgIDQuIFJlbW92ZWQgYW4gdW51c2VkIE1ldGFBbGxvY2F0b3I6OkZyZWVTcGFjZU5vZGUg Y29uc3RydWN0b3IuCisKKyAgICAgICAgKiB3dGYvTWV0YUFsbG9jYXRvci5jcHA6CisgICAgICAg IChXVEY6Ok1ldGFBbGxvY2F0b3I6OnJlbGVhc2UpOgorICAgICAgICAoV1RGOjpNZXRhQWxsb2Nh dG9ySGFuZGxlOjpNZXRhQWxsb2NhdG9ySGFuZGxlKToKKyAgICAgICAgKFdURjo6TWV0YUFsbG9j YXRvckhhbmRsZTo6c2hyaW5rKToKKyAgICAgICAgKFdURjo6TWV0YUFsbG9jYXRvcjo6YWxsb2Nh dGUpOgorICAgICAgICAoV1RGOjpNZXRhQWxsb2NhdG9yOjphZGRGcmVzaEZyZWVTcGFjZSk6Cisg ICAgICAgICogd3RmL01ldGFBbGxvY2F0b3IuaDoKKyAgICAgICAgKFdURjo6TWV0YUFsbG9jYXRv cjo6RnJlZVNwYWNlTm9kZTo6RnJlZVNwYWNlTm9kZSk6IERlbGV0ZWQuCisgICAgICAgICogd3Rm L01ldGFBbGxvY2F0b3JIYW5kbGUuaDoKKyAgICAgICAgKiB3dGYvTWV0YUFsbG9jYXRvclB0ci5o OgorICAgICAgICAoV1RGOjpNZXRhQWxsb2NhdG9yUHRyOjptYWtlRnJvbVJhd1BvaW50ZXIpOgor ICAgICAgICAoV1RGOjpNZXRhQWxsb2NhdG9yUHRyOjpNZXRhQWxsb2NhdG9yUHRyKToKKwogMjAy MS0wMy0xMCAgRGVhbiBKYWNrc29uICA8ZGlub0BhcHBsZS5jb20+CiAKICAgICAgICAgVXNlIHN0 ZDo6Zm9yd2FyZCBmb3IgZm9yd2FyZGluZyByZWZlcmVuY2VzIGluc3RlYWQgb2YgV1RGTW92ZQpJ bmRleDogU291cmNlL1dURi93dGYvTWV0YUFsbG9jYXRvci5jcHAKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL1dURi93dGYvTWV0YUFsbG9jYXRvci5jcHAJKHJldmlzaW9uIDI3NDI1MSkKKysrIFNvdXJj ZS9XVEYvd3RmL01ldGFBbGxvY2F0b3IuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xLDUgKzEsNSBA QAogLyoKLSAqIENvcHlyaWdodCAoQykgMjAxMS0yMDIwIEFwcGxlIEluYy4gQWxsIHJpZ2h0cyBy ZXNlcnZlZC4KKyAqIENvcHlyaWdodCAoQykgMjAxMS0yMDIxIEFwcGxlIEluYy4gQWxsIHJpZ2h0 cyByZXNlcnZlZC4KICAqCiAgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQg YmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKICAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1p dHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucwpAQCAtMzAsNiArMzAs NyBAQAogI2luY2x1ZGUgPHd0Zi9NZXRhQWxsb2NhdG9yLmg+CiAKICNpbmNsdWRlIDx3dGYvTmV2 ZXJEZXN0cm95ZWQuaD4KKyNpbmNsdWRlIDx3dGYvV1RGQ29uZmlnLmg+CiAKIG5hbWVzcGFjZSBX VEYgewogCkBAIC02NCw5ICs2NSw5IEBAIHZvaWQgTWV0YUFsbG9jYXRvclRyYWNrZXI6OnJlbGVh c2UoTWV0YUEKIHZvaWQgTWV0YUFsbG9jYXRvcjo6cmVsZWFzZShjb25zdCBMb2NrSG9sZGVyJiwg TWV0YUFsbG9jYXRvckhhbmRsZSYgaGFuZGxlKQogewogICAgIGlmIChoYW5kbGUuc2l6ZUluQnl0 ZXMoKSkgewotICAgICAgICB2b2lkKiBzdGFydCA9IGhhbmRsZS5zdGFydCgpLnVudGFnZ2VkUHRy KCk7CisgICAgICAgIE1lbW9yeVB0ciBzdGFydCA9IGhhbmRsZS5zdGFydCgpOwogICAgICAgICBz aXplX3Qgc2l6ZUluQnl0ZXMgPSBoYW5kbGUuc2l6ZUluQnl0ZXMoKTsKLSAgICAgICAgZGVjcmVt ZW50UGFnZU9jY3VwYW5jeShzdGFydCwgc2l6ZUluQnl0ZXMpOworICAgICAgICBkZWNyZW1lbnRQ YWdlT2NjdXBhbmN5KHN0YXJ0LnVudGFnZ2VkUHRyKCksIHNpemVJbkJ5dGVzKTsKICAgICAgICAg YWRkRnJlZVNwYWNlRnJvbVJlbGVhc2VkSGFuZGxlKEZyZWVTcGFjZVB0cihzdGFydCksIHNpemVJ bkJ5dGVzKTsKICAgICB9CiAKQEAgLTc0LDEwICs3NSwxMCBAQCB2b2lkIE1ldGFBbGxvY2F0b3I6 OnJlbGVhc2UoY29uc3QgTG9ja0hvCiAgICAgICAgIG1fdHJhY2tlci0+cmVsZWFzZShoYW5kbGUp OwogfQogCi1NZXRhQWxsb2NhdG9ySGFuZGxlOjpNZXRhQWxsb2NhdG9ySGFuZGxlKE1ldGFBbGxv Y2F0b3ImIGFsbG9jYXRvciwgdm9pZCogc3RhcnQsIHNpemVfdCBzaXplSW5CeXRlcykKK01ldGFB bGxvY2F0b3JIYW5kbGU6Ok1ldGFBbGxvY2F0b3JIYW5kbGUoTWV0YUFsbG9jYXRvciYgYWxsb2Nh dG9yLCBNZXRhQWxsb2NhdG9ySGFuZGxlOjpNZW1vcnlQdHIgc3RhcnQsIHNpemVfdCBzaXplSW5C eXRlcykKICAgICA6IG1fYWxsb2NhdG9yKGFsbG9jYXRvcikKICAgICAsIG1fc3RhcnQoc3RhcnQp Ci0gICAgLCBtX2VuZChyZWludGVycHJldF9jYXN0PGNoYXIqPihzdGFydCkgKyBzaXplSW5CeXRl cykKKyAgICAsIG1fZW5kKHN0YXJ0ICsgc2l6ZUluQnl0ZXMpCiB7CiAgICAgQVNTRVJUKHN0YXJ0 KTsKICAgICBBU1NFUlQoc2l6ZUluQnl0ZXMpOwpAQCAtMTA0LDE3ICsxMDUsMTggQEAgdm9pZCBN ZXRhQWxsb2NhdG9ySGFuZGxlOjpzaHJpbmsoc2l6ZV90IAogICAgIGlmIChuZXdTaXplSW5CeXRl cyA9PSBzaXplSW5CeXRlcykKICAgICAgICAgcmV0dXJuOwogCi0gICAgdWludHB0cl90IGZyZWVT dGFydCA9IG1fc3RhcnQudW50YWdnZWRQdHI8dWludHB0cl90PigpICsgbmV3U2l6ZUluQnl0ZXM7 CisgICAgTWVtb3J5UHRyIGZyZWVTdGFydCA9IG1fc3RhcnQgKyBuZXdTaXplSW5CeXRlczsKICAg ICBzaXplX3QgZnJlZVNpemUgPSBzaXplSW5CeXRlcyAtIG5ld1NpemVJbkJ5dGVzOwotICAgIHVp bnRwdHJfdCBmcmVlRW5kID0gZnJlZVN0YXJ0ICsgZnJlZVNpemU7CisgICAgdWludHB0cl90IGZy ZWVTdGFydFZhbHVlID0gZnJlZVN0YXJ0LnVudGFnZ2VkUHRyPHVpbnRwdHJfdD4oKTsKKyAgICB1 aW50cHRyX3QgZnJlZUVuZCA9IGZyZWVTdGFydFZhbHVlICsgZnJlZVNpemU7CiAgICAgCi0gICAg dWludHB0cl90IGZpcnN0Q29tcGxldGVseUZyZWVQYWdlID0gKGZyZWVTdGFydCArIGFsbG9jYXRv ci5tX3BhZ2VTaXplIC0gMSkgJiB+KGFsbG9jYXRvci5tX3BhZ2VTaXplIC0gMSk7CisgICAgdWlu dHB0cl90IGZpcnN0Q29tcGxldGVseUZyZWVQYWdlID0gcm91bmRVcFRvTXVsdGlwbGVPZihhbGxv Y2F0b3IubV9wYWdlU2l6ZSwgZnJlZVN0YXJ0VmFsdWUpOwogICAgIGlmIChmaXJzdENvbXBsZXRl bHlGcmVlUGFnZSA8IGZyZWVFbmQpCi0gICAgICAgIGFsbG9jYXRvci5kZWNyZW1lbnRQYWdlT2Nj dXBhbmN5KHJlaW50ZXJwcmV0X2Nhc3Q8dm9pZCo+KGZpcnN0Q29tcGxldGVseUZyZWVQYWdlKSwg ZnJlZVNpemUgLSAoZmlyc3RDb21wbGV0ZWx5RnJlZVBhZ2UgLSBmcmVlU3RhcnQpKTsKKyAgICAg ICAgYWxsb2NhdG9yLmRlY3JlbWVudFBhZ2VPY2N1cGFuY3kocmVpbnRlcnByZXRfY2FzdDx2b2lk Kj4oZmlyc3RDb21wbGV0ZWx5RnJlZVBhZ2UpLCBmcmVlU2l6ZSAtIChmaXJzdENvbXBsZXRlbHlG cmVlUGFnZSAtIGZyZWVTdGFydFZhbHVlKSk7CiAKICAgICBhbGxvY2F0b3IuYWRkRnJlZVNwYWNl RnJvbVJlbGVhc2VkSGFuZGxlKE1ldGFBbGxvY2F0b3I6OkZyZWVTcGFjZVB0cihmcmVlU3RhcnQp LCBmcmVlU2l6ZSk7CiAKLSAgICBtX2VuZCA9IG1fc3RhcnQgKyBuZXdTaXplSW5CeXRlczsKKyAg ICBtX2VuZCA9IGZyZWVTdGFydDsKIH0KIAogdm9pZCBNZXRhQWxsb2NhdG9ySGFuZGxlOjpkdW1w KFByaW50U3RyZWFtJiBvdXQpIGNvbnN0CkBAIC0xODgsNyArMTkwLDcgQEAgUmVmUHRyPE1ldGFB bGxvY2F0b3JIYW5kbGU+IE1ldGFBbGxvY2F0bwogICAgIG1fbnVtQWxsb2NhdGlvbnMrKzsKICNl bmRpZgogCi0gICAgYXV0byBoYW5kbGUgPSBhZG9wdFJlZigqbmV3IE1ldGFBbGxvY2F0b3JIYW5k bGUoKnRoaXMsIHN0YXJ0LnVudGFnZ2VkUHRyKCksIHNpemVJbkJ5dGVzKSk7CisgICAgYXV0byBo YW5kbGUgPSBhZG9wdFJlZigqbmV3IE1ldGFBbGxvY2F0b3JIYW5kbGUoKnRoaXMsIE1lbW9yeVB0 cihzdGFydCksIHNpemVJbkJ5dGVzKSk7CiAKICAgICBpZiAoVU5MSUtFTFkoISFtX3RyYWNrZXIp KQogICAgICAgICBtX3RyYWNrZXItPm5vdGlmeSgqaGFuZGxlLnB0cigpKTsKQEAgLTI4NCw5ICsy ODYsMTAgQEAgdm9pZCBNZXRhQWxsb2NhdG9yOjphZGRGcmVlU3BhY2VGcm9tUmVsZQogCiB2b2lk IE1ldGFBbGxvY2F0b3I6OmFkZEZyZXNoRnJlZVNwYWNlKHZvaWQqIHN0YXJ0LCBzaXplX3Qgc2l6 ZUluQnl0ZXMpCiB7CisgICAgQ29uZmlnOjpBc3NlcnROb3RGcm96ZW5TY29wZSBhc3NlcnROb3RG cm96ZW5TY29wZTsKICAgICBMb2NrSG9sZGVyIGxvY2tlcigmbV9sb2NrKTsKICAgICBtX2J5dGVz UmVzZXJ2ZWQgKz0gc2l6ZUluQnl0ZXM7Ci0gICAgYWRkRnJlZVNwYWNlKEZyZWVTcGFjZVB0cihz dGFydCksIHNpemVJbkJ5dGVzKTsKKyAgICBhZGRGcmVlU3BhY2UoRnJlZVNwYWNlUHRyOjptYWtl RnJvbVJhd1BvaW50ZXIoc3RhcnQpLCBzaXplSW5CeXRlcyk7CiB9CiAKIHNpemVfdCBNZXRhQWxs b2NhdG9yOjpkZWJ1Z0ZyZWVTcGFjZVNpemUoKQpJbmRleDogU291cmNlL1dURi93dGYvTWV0YUFs bG9jYXRvci5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XVEYvd3RmL01ldGFBbGxvY2F0b3IuaAko cmV2aXNpb24gMjc0MjUxKQorKysgU291cmNlL1dURi93dGYvTWV0YUFsbG9jYXRvci5oCSh3b3Jr aW5nIGNvcHkpCkBAIC0xLDUgKzEsNSBAQAogLyoKLSAqIENvcHlyaWdodCAoQykgMjAxMS0yMDE4 IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqIENvcHlyaWdodCAoQykgMjAxMS0y MDIxIEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KICAqCiAgKiBSZWRpc3RyaWJ1dGlv biBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKICAq IG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcg Y29uZGl0aW9ucwpAQCAtNjMsNiArNjMsNyBAQCBjbGFzcyBNZXRhQWxsb2NhdG9yIHsKIAogcHVi bGljOgogICAgIHVzaW5nIEZyZWVTcGFjZVB0ciA9IE1ldGFBbGxvY2F0b3JQdHI8RnJlZVNwYWNl UHRyVGFnPjsKKyAgICB1c2luZyBNZW1vcnlQdHIgPSBNZXRhQWxsb2NhdG9ySGFuZGxlOjpNZW1v cnlQdHI7CiAKICAgICBXVEZfRVhQT1JUX1BSSVZBVEUgTWV0YUFsbG9jYXRvcihMb2NrJiwgc2l6 ZV90IGFsbG9jYXRpb25HcmFudWxlLCBzaXplX3QgcGFnZVNpemUgPSBXVEY6OnBhZ2VTaXplKCkp OwogICAgIApAQCAtMTQyLDExICsxNDMsNiBAQCBwcml2YXRlOgogICAgIHB1YmxpYzoKICAgICAg ICAgRnJlZVNwYWNlTm9kZSgpID0gZGVmYXVsdDsKIAotICAgICAgICBGcmVlU3BhY2VOb2RlKHZv aWQqIHN0YXJ0LCBzaXplX3Qgc2l6ZUluQnl0ZXMpCi0gICAgICAgICAgICA6IG1fc3RhcnQoc3Rh cnQpCi0gICAgICAgICAgICAsIG1fZW5kKHJlaW50ZXJwcmV0X2Nhc3Q8dWludDhfdCo+KHN0YXJ0 KSArIHNpemVJbkJ5dGVzKQotICAgICAgICB7IH0KLQogICAgICAgICBzaXplX3Qgc2l6ZUluQnl0 ZXMoKQogICAgICAgICB7CiAgICAgICAgICAgICByZXR1cm4gbV9lbmQudW50YWdnZWRQdHI8c2l6 ZV90PigpIC0gbV9zdGFydC51bnRhZ2dlZFB0cjxzaXplX3Q+KCk7CkluZGV4OiBTb3VyY2UvV1RG L3d0Zi9NZXRhQWxsb2NhdG9ySGFuZGxlLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dURi93dGYv TWV0YUFsbG9jYXRvckhhbmRsZS5oCShyZXZpc2lvbiAyNzQyNTEpCisrKyBTb3VyY2UvV1RGL3d0 Zi9NZXRhQWxsb2NhdG9ySGFuZGxlLmgJKHdvcmtpbmcgY29weSkKQEAgLTEsNSArMSw1IEBACiAv KgotICogQ29weXJpZ2h0IChDKSAyMDExLTIwMTggQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2Vy dmVkLgorICogQ29weXJpZ2h0IChDKSAyMDExLTIwMjEgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJl c2VydmVkLgogICoKICAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5h cnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAogICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVk IHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCkBAIC00MSw4ICs0MSw2IEBA IGNsYXNzIFByaW50U3RyZWFtOwogREVDTEFSRV9BTExPQ0FUT1JfV0lUSF9IRUFQX0lERU5USUZJ RVIoTWV0YUFsbG9jYXRvckhhbmRsZSk7CiBjbGFzcyBNZXRhQWxsb2NhdG9ySGFuZGxlIDogcHVi bGljIFRocmVhZFNhZmVSZWZDb3VudGVkPE1ldGFBbGxvY2F0b3JIYW5kbGU+LCBwdWJsaWMgUmVk QmxhY2tUcmVlPE1ldGFBbGxvY2F0b3JIYW5kbGUsIHZvaWQqPjo6Tm9kZSB7CiAgICAgV1RGX01B S0VfRkFTVF9BTExPQ0FURURfV0lUSF9IRUFQX0lERU5USUZJRVIoTWV0YUFsbG9jYXRvckhhbmRs ZSk7Ci1wcml2YXRlOgotICAgIE1ldGFBbGxvY2F0b3JIYW5kbGUoTWV0YUFsbG9jYXRvciYsIHZv aWQqIHN0YXJ0LCBzaXplX3Qgc2l6ZUluQnl0ZXMpOwogCiBwdWJsaWM6CiAgICAgdXNpbmcgTWVt b3J5UHRyID0gTWV0YUFsbG9jYXRvclB0cjxIYW5kbGVNZW1vcnlQdHJUYWc+OwpAQCAtOTksMTEg Kzk3LDEzIEBAIHB1YmxpYzoKICAgICBXVEZfRVhQT1JUX1BSSVZBVEUgdm9pZCBkdW1wKFByaW50 U3RyZWFtJiBvdXQpIGNvbnN0OwogICAgIAogcHJpdmF0ZToKLSAgICBmcmllbmQgY2xhc3MgTWV0 YUFsbG9jYXRvcjsKLSAgICAKKyAgICBNZXRhQWxsb2NhdG9ySGFuZGxlKE1ldGFBbGxvY2F0b3Im LCBNZW1vcnlQdHIgc3RhcnQsIHNpemVfdCBzaXplSW5CeXRlcyk7CisKICAgICBNZXRhQWxsb2Nh dG9yJiBtX2FsbG9jYXRvcjsKICAgICBNZW1vcnlQdHIgbV9zdGFydDsKICAgICBNZW1vcnlQdHIg bV9lbmQ7CisKKyAgICBmcmllbmQgY2xhc3MgTWV0YUFsbG9jYXRvcjsKIH07CiAKIH0KSW5kZXg6 IFNvdXJjZS9XVEYvd3RmL01ldGFBbGxvY2F0b3JQdHIuaAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V1RGL3d0Zi9NZXRhQWxsb2NhdG9yUHRyLmgJKHJldmlzaW9uIDI3NDI1MSkKKysrIFNvdXJjZS9X VEYvd3RmL01ldGFBbGxvY2F0b3JQdHIuaAkod29ya2luZyBjb3B5KQpAQCAtMSw1ICsxLDUgQEAK IC8qCi0gKiBDb3B5cmlnaHQgKEMpIDIwMTgtMjAxOSBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVz ZXJ2ZWQuCisgKiBDb3B5cmlnaHQgKEMpIDIwMTgtMjAyMSBBcHBsZSBJbmMuIEFsbCByaWdodHMg cmVzZXJ2ZWQuCiAgKgogICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJp bmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CiAgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0 ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKQEAgLTM3LDExICszNywx MiBAQCBwdWJsaWM6CiAgICAgTWV0YUFsbG9jYXRvclB0cigpID0gZGVmYXVsdDsKICAgICBNZXRh QWxsb2NhdG9yUHRyKHN0ZDo6bnVsbHB0cl90KSB7IH0KIAotICAgIGV4cGxpY2l0IE1ldGFBbGxv Y2F0b3JQdHIodm9pZCogcHRyKQotICAgICAgICA6IG1fcHRyKHRhZ0NvZGVQdHI8dGFnPihwdHIp KQotICAgIHsKLSAgICAgICAgYXNzZXJ0SXNOb3RUYWdnZWQocHRyKTsKLSAgICB9CisgICAgc3Rh dGljIE1ldGFBbGxvY2F0b3JQdHIgbWFrZUZyb21SYXdQb2ludGVyKHZvaWQqIHB0cikgeyByZXR1 cm4gTWV0YUFsbG9jYXRvclB0cihwdHIpOyB9CisKKyAgICB0ZW1wbGF0ZTxQdHJUYWcgb3RoZXJU YWc+CisgICAgZXhwbGljaXQgTWV0YUFsbG9jYXRvclB0cihNZXRhQWxsb2NhdG9yUHRyPG90aGVy VGFnPiBvdGhlcikKKyAgICAgICAgOiBtX3B0cihvdGhlci50ZW1wbGF0ZSByZXRhZ2dlZFB0cjx0 YWc+KCkpCisgICAgeyB9CiAKICAgICBleHBsaWNpdCBNZXRhQWxsb2NhdG9yUHRyKHVpbnRwdHJf dCBwdHJBc0ludCkKICAgICAgICAgOiBNZXRhQWxsb2NhdG9yUHRyKHJlaW50ZXJwcmV0X2Nhc3Q8 dm9pZCo+KHB0ckFzSW50KSkKQEAgLTkzLDYgKzk0LDEyIEBAIHB1YmxpYzoKICAgICB1bnNpZ25l ZCBoYXNoKCkgY29uc3QgeyByZXR1cm4gUHRySGFzaDx2b2lkKj46Omhhc2gobV9wdHIpOyB9CiAK IHByaXZhdGU6CisgICAgZXhwbGljaXQgTWV0YUFsbG9jYXRvclB0cih2b2lkKiBwdHIpCisgICAg ICAgIDogbV9wdHIodGFnQ29kZVB0cjx0YWc+KHB0cikpCisgICAgeworICAgICAgICBhc3NlcnRJ c05vdFRhZ2dlZChwdHIpOworICAgIH0KKwogICAgIHN0YXRpYyB2b2lkKiBlbXB0eVZhbHVlKCkg eyByZXR1cm4gcmVpbnRlcnByZXRfY2FzdDx2b2lkKj4oMSk7IH0KICAgICBzdGF0aWMgdm9pZCog ZGVsZXRlZFZhbHVlKCkgeyByZXR1cm4gcmVpbnRlcnByZXRfY2FzdDx2b2lkKj4oMik7IH0KIApJ bmRleDogVG9vbHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL0NoYW5nZUxvZwkocmV2 aXNpb24gMjc0MjY1KQorKysgVG9vbHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMg KzEsMTMgQEAKKzIwMjEtMDMtMTAgIE1hcmsgTGFtICA8bWFyay5sYW1AYXBwbGUuY29tPgorCisg ICAgICAgIFVzZSB0YWdnZWQgcG9pbnRlcnMgaW4gbW9yZSBwbGFjZXMgaW4gdGhlIE1ldGFBbGxv Y2F0b3IgY29kZS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTIyMzA1NQorICAgICAgICByZGFyOi8vNjk5NzEyMjQKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMvV1RGL01l dGFBbGxvY2F0b3IuY3BwOgorCiAyMDIxLTAzLTEwICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBs ZS5jb20+CiAKICAgICAgICAgVXNlIFJldGFpblB0cjw+IC8gT1NPYmplY3RQdHI8PiBtb3JlIGlu IFdlYktpdApJbmRleDogVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XVEYvTWV0YUFsbG9jYXRv ci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XVEYvTWV0YUFs bG9jYXRvci5jcHAJKHJldmlzaW9uIDI3NDI1MSkKKysrIFRvb2xzL1Rlc3RXZWJLaXRBUEkvVGVz dHMvV1RGL01ldGFBbGxvY2F0b3IuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xLDUgKzEsNSBAQAog LyoKLSAqIENvcHlyaWdodCAoQykgMjAxMS0yMDE4IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNl cnZlZC4KKyAqIENvcHlyaWdodCAoQykgMjAxMS0yMDIxIEFwcGxlIEluYy4gQWxsIHJpZ2h0cyBy ZXNlcnZlZC4KICAqCiAgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmlu YXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKICAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRl ZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucwpAQCAtOTYsNyArOTYsNyBA QCBwdWJsaWM6CiAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgbV9wYXJlbnQtPmFk ZGl0aW9uYWxQYWdlc0luSGVhcCArPSBudW1QYWdlczsKICAgICAgICAgCi0gICAgICAgICAgICAg ICAgcmV0dXJuIEZyZWVTcGFjZVB0cihyZXN1bHQpOworICAgICAgICAgICAgICAgIHJldHVybiBG cmVlU3BhY2VQdHI6Om1ha2VGcm9tUmF3UG9pbnRlcihyZXN1bHQpOwogICAgICAgICAgICAgfQog ICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgZGVmYXVsdDoK