228669 2021-07-30 16:35:18 -0700 [JSC] Move JIT_UNICODE_EXPRESSIONS to ENABLE(YARR_JIT_UNICODE_EXPRESSIONS) in PlatformEnable.h 2021-07-31 13:48:16 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 ysuzuki ysuzuki ashvayka benjamin cdumez cmarcelo ews-watchlist keith_miller mark.lam msaboff saam tzagallo webkit-bug-importer oldest_to_newest 1780994 0 ysuzuki 2021-07-30 16:35:18 -0700 [JSC] Move JIT_UNICODE_EXPRESSIONS to ENABLE(YARR_JIT_UNICODE_EXPRESSIONS) in PlatformEnable.h 1780995 1 434672 ysuzuki 2021-07-30 16:36:43 -0700 Created attachment 434672 Patch 1781027 2 434680 ysuzuki 2021-07-30 18:22:21 -0700 Created attachment 434680 Patch 1781095 3 ysuzuki 2021-07-31 13:47:58 -0700 Committed r280520 (240152@main): <https://commits.webkit.org/240152@main> 1781096 4 webkit-bug-importer 2021-07-31 13:48:16 -0700 <rdar://problem/81369379> 434672 2021-07-30 16:36:43 -0700 2021-07-30 18:22:19 -0700 Patch bug-228669-20210730163642.patch text/plain 10866 ysuzuki U3VidmVyc2lvbiBSZXZpc2lvbjogMjgwNDk3CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCAw YTI3ZjkzZjYzYWQyZjk4NTY1OWI3ZTQ4NjNiYmZlNDE5ZTYwNGRiLi5lMDc1MWZkMmVjMjg5YTE2 Nzk1ZmZkNmQ5ZTRhZWQ1MjlkMTQ1MmMwIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxNSBAQAorMjAyMS0wNy0zMCAgWXVzdWtlIFN1enVraSAgPHlzdXp1a2lAYXBwbGUuY29t PgorCisgICAgICAgIFtKU0NdIE1vdmUgSklUX1VOSUNPREVfRVhQUkVTU0lPTlMgdG8gRU5BQkxF KFlBUlJfSklUX1VOSUNPREVfRVhQUkVTU0lPTlMpIGluIFBsYXRmb3JtRW5hYmxlLmgKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyODY2OQorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE1vdmUgSklUX1VOSUNP REVfRVhQUkVTU0lPTlMgdG8gUGxhdGZvcm1FbmFibGUuaCB0byBhbGlnbiB0byB0aGUgb3RoZXIg WWFyckpJVCBmbGFncy4KKyAgICAgICAgVGhpcyBtYWtlcyBpdCBlYXN5IHRvIHJlYWQgdGhhdCB0 aGlzIGlzIGVuYWJsZWQgb24gQVJNNjQgYW5kIFg4Nl82NC4KKworICAgICAgICAqIHlhcnIvWWFy ckpJVC5jcHA6CisKIDIwMjEtMDctMzAgIFl1c3VrZSBTdXp1a2kgIDx5c3V6dWtpQGFwcGxlLmNv bT4KIAogICAgICAgICBVbnJldmlld2VkLCBmaXggd3JvbmcgYWNjZXNzIHdpZHRoCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV1RGL0NoYW5nZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IDIz YzIzMzg0M2YwMTE5ZTQ1M2VkYjcwYjgxODZmM2U5NWZkMjMzYzQuLmZlY2VlNzdkOTJiNDViZGNm ZmYyYTM2YzQyMWYyNDExZWFmY2JjMTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9n CisrKyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAKKzIwMjEtMDctMzAg IFl1c3VrZSBTdXp1a2kgIDx5c3V6dWtpQGFwcGxlLmNvbT4KKworICAgICAgICBbSlNDXSBNb3Zl IEpJVF9VTklDT0RFX0VYUFJFU1NJT05TIHRvIEVOQUJMRShZQVJSX0pJVF9VTklDT0RFX0VYUFJF U1NJT05TKSBpbiBQbGF0Zm9ybUVuYWJsZS5oCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0yMjg2NjkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICAqIHd0Zi9QbGF0Zm9ybUVuYWJsZS5oOgorCiAyMDIxLTA3LTI5 ICBNeWxlcyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CiAKICAgICAgICAgU3Rv cCBidWlsZGluZyBXZWJHUFUgYW5kIHRoZSBXSExTTCBjb21waWxlciB0byBkZWNyZWFzZSBiaW5h cnkgc2l6ZQpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3lhcnIvWWFyckpJVC5j cHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUveWFyci9ZYXJySklULmNwcAppbmRleCAwYTkyNDA2 MTZjNjg0YmQwZGNmNDM4ZGFlMTk3YjM2ZmU0ZjU5Y2NiLi42NjdkMjFjMWQzODY1MmYxNWViOGQw YzgyYjA0YzQ2MDQwNDQ3N2ZhIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUveWFy ci9ZYXJySklULmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUveWFyci9ZYXJySklULmNw cApAQCAtMTk4LDcgKzE5OCw2IEBAIGNsYXNzIFlhcnJHZW5lcmF0b3IgZmluYWwgOiBwdWJsaWMg WWFyckpJVEluZm8sIHByaXZhdGUgTWFjcm9Bc3NlbWJsZXIgewogICAgIHN0YXRpYyBjb25zdCBS ZWdpc3RlcklEIHJldHVyblJlZ2lzdGVyMiA9IEFSTTY0UmVnaXN0ZXJzOjp4MTsKIAogICAgIGNv bnN0IFRydXN0ZWRJbW0zMiBzdXJyb2dhdGVUYWdNYXNrID0gVHJ1c3RlZEltbTMyKDB4ZmZmZmZj MDApOwotI2RlZmluZSBKSVRfVU5JQ09ERV9FWFBSRVNTSU9OUwogI2VsaWYgQ1BVKE1JUFMpCiAg ICAgc3RhdGljIGNvbnN0IFJlZ2lzdGVySUQgaW5wdXQgPSBNSVBTUmVnaXN0ZXJzOjphMDsKICAg ICBzdGF0aWMgY29uc3QgUmVnaXN0ZXJJRCBpbmRleCA9IE1JUFNSZWdpc3RlcnM6OmExOwpAQCAt MjU5LDcgKzI1OCw2IEBAIGNsYXNzIFlhcnJHZW5lcmF0b3IgZmluYWwgOiBwdWJsaWMgWWFyckpJ VEluZm8sIHByaXZhdGUgTWFjcm9Bc3NlbWJsZXIgewogICAgIGNvbnN0IFRydXN0ZWRJbW0zMiBs ZWFkaW5nU3Vycm9nYXRlVGFnID0gVHJ1c3RlZEltbTMyKDB4ZDgwMCk7CiAgICAgY29uc3QgVHJ1 c3RlZEltbTMyIHRyYWlsaW5nU3Vycm9nYXRlVGFnID0gVHJ1c3RlZEltbTMyKDB4ZGMwMCk7CiAg ICAgY29uc3QgVHJ1c3RlZEltbTMyIHN1cnJvZ2F0ZVRhZ01hc2sgPSBUcnVzdGVkSW1tMzIoMHhm ZmZmZmMwMCk7Ci0jZGVmaW5lIEpJVF9VTklDT0RFX0VYUFJFU1NJT05TCiAjZW5kaWYKIAogI2lm IEVOQUJMRShZQVJSX0pJVF9BTExfUEFSRU5TX0VYUFJFU1NJT05TKQpAQCAtNTYxLDcgKzU1OSw3 IEBAIGNsYXNzIFlhcnJHZW5lcmF0b3IgZmluYWwgOiBwdWJsaWMgWWFyckpJVEluZm8sIHByaXZh dGUgTWFjcm9Bc3NlbWJsZXIgewogICAgICAgICAgICAgdW5pY29kZUZhaWwubGluayh0aGlzKTsK ICAgICB9CiAKLSNpZmRlZiBKSVRfVU5JQ09ERV9FWFBSRVNTSU9OUworI2lmIEVOQUJMRShZQVJS X0pJVF9VTklDT0RFX0VYUFJFU1NJT05TKQogICAgIHZvaWQgYWR2YW5jZUluZGV4QWZ0ZXJDaGFy YWN0ZXJDbGFzc1Rlcm1NYXRjaChjb25zdCBQYXR0ZXJuVGVybSogdGVybSwgSnVtcExpc3QmIGZh aWx1cmVzQWZ0ZXJJbmNyZW1lbnRpbmdJbmRleCwgY29uc3QgUmVnaXN0ZXJJRCBjaGFyYWN0ZXIp CiAgICAgewogICAgICAgICBBU1NFUlQodGVybS0+dHlwZSA9PSBQYXR0ZXJuVGVybTo6VHlwZTo6 Q2hhcmFjdGVyQ2xhc3MpOwpAQCAtNjQ0LDcgKzY0Miw3IEBAIGNsYXNzIFlhcnJHZW5lcmF0b3Ig ZmluYWwgOiBwdWJsaWMgWWFyckpJVEluZm8sIHByaXZhdGUgTWFjcm9Bc3NlbWJsZXIgewogICAg ICAgICByZXR1cm4gQmFzZUluZGV4KGlucHV0LCBpbmRleFJlZywgVGltZXNUd28sIGNoYXJhY3Rl ck9mZnNldCAqIHN0YXRpY19jYXN0PGludDMyX3Q+KHNpemVvZihVQ2hhcikpKTsKICAgICB9CiAK LSNpZmRlZiBKSVRfVU5JQ09ERV9FWFBSRVNTSU9OUworI2lmIEVOQUJMRShZQVJSX0pJVF9VTklD T0RFX0VYUFJFU1NJT05TKQogICAgIHZvaWQgdHJ5UmVhZFVuaWNvZGVDaGFySW1wbChSZWdpc3Rl cklEIHJlc3VsdFJlZykKICAgICB7CiAgICAgICAgIEFTU0VSVChtX2NoYXJTaXplID09IENoYXJT aXplOjpDaGFyMTYpOwpAQCAtNjkxLDcgKzY4OSw3IEBAIGNsYXNzIFlhcnJHZW5lcmF0b3IgZmlu YWwgOiBwdWJsaWMgWWFyckpJVEluZm8sIHByaXZhdGUgTWFjcm9Bc3NlbWJsZXIgewogCiAgICAg ICAgIGlmIChtX2NoYXJTaXplID09IENoYXJTaXplOjpDaGFyOCkKICAgICAgICAgICAgIGxvYWQ4 KGFkZHJlc3MsIHJlc3VsdFJlZyk7Ci0jaWZkZWYgSklUX1VOSUNPREVfRVhQUkVTU0lPTlMKKyNp ZiBFTkFCTEUoWUFSUl9KSVRfVU5JQ09ERV9FWFBSRVNTSU9OUykKICAgICAgICAgZWxzZSBpZiAo bV9kZWNvZGVTdXJyb2dhdGVQYWlycykKICAgICAgICAgICAgIHRyeVJlYWRVbmljb2RlQ2hhcihh ZGRyZXNzLCByZXN1bHRSZWcpOwogI2VuZGlmCkBAIC0xNjc5LDcgKzE2NzcsNyBAQCBjbGFzcyBZ YXJyR2VuZXJhdG9yIGZpbmFsIDogcHVibGljIFlhcnJKSVRJbmZvLCBwcml2YXRlIE1hY3JvQXNz ZW1ibGVyIHsKICAgICAgICAgfQogCiAgICAgICAgIG9wLm1fanVtcHMuYXBwZW5kKGJyYW5jaDMy KE5vdEVxdWFsLCBjaGFyYWN0ZXIsIEltbTMyKGNoKSkpOwotI2lmZGVmIEpJVF9VTklDT0RFX0VY UFJFU1NJT05TCisjaWYgRU5BQkxFKFlBUlJfSklUX1VOSUNPREVfRVhQUkVTU0lPTlMpCiAgICAg ICAgIGlmIChtX2RlY29kZVN1cnJvZ2F0ZVBhaXJzICYmICFVX0lTX0JNUChjaCkpCiAgICAgICAg ICAgICBhZGQzMihUcnVzdGVkSW1tMzIoMiksIGNvdW50UmVnaXN0ZXIpOwogICAgICAgICBlbHNl CkBAIC0xNzExLDcgKzE3MDksNyBAQCBjbGFzcyBZYXJyR2VuZXJhdG9yIGZpbmFsIDogcHVibGlj IFlhcnJKSVRJbmZvLCBwcml2YXRlIE1hY3JvQXNzZW1ibGVyIHsKICAgICAgICAgICAgIGZhaWx1 cmVzLmFwcGVuZChqdW1wSWZDaGFyTm90RXF1YWxzKGNoLCBtX2NoZWNrZWRPZmZzZXQgLSB0ZXJt LT5pbnB1dFBvc2l0aW9uLCBjaGFyYWN0ZXIpKTsKIAogICAgICAgICAgICAgYWRkMzIoVHJ1c3Rl ZEltbTMyKDEpLCBpbmRleCk7Ci0jaWZkZWYgSklUX1VOSUNPREVfRVhQUkVTU0lPTlMKKyNpZiBF TkFCTEUoWUFSUl9KSVRfVU5JQ09ERV9FWFBSRVNTSU9OUykKICAgICAgICAgICAgIGlmIChtX2Rl Y29kZVN1cnJvZ2F0ZVBhaXJzICYmICFVX0lTX0JNUChjaCkpIHsKICAgICAgICAgICAgICAgICBK dW1wIHN1cnJvZ2F0ZVBhaXJPayA9IG5vdEF0RW5kT2ZJbnB1dCgpOwogICAgICAgICAgICAgICAg IHN1YjMyKFRydXN0ZWRJbW0zMigxKSwgaW5kZXgpOwpAQCAtMTc4NSw3ICsxNzgzLDcgQEAgY2xh c3MgWWFyckdlbmVyYXRvciBmaW5hbCA6IHB1YmxpYyBZYXJySklUSW5mbywgcHJpdmF0ZSBNYWNy b0Fzc2VtYmxlciB7CiAgICAgICAgICAgICBub25HcmVlZHlGYWlsdXJlcy5hcHBlbmQoanVtcElm Q2hhck5vdEVxdWFscyhjaCwgbV9jaGVja2VkT2Zmc2V0IC0gdGVybS0+aW5wdXRQb3NpdGlvbiwg Y2hhcmFjdGVyKSk7CiAKICAgICAgICAgICAgIGFkZDMyKFRydXN0ZWRJbW0zMigxKSwgaW5kZXgp OwotI2lmZGVmIEpJVF9VTklDT0RFX0VYUFJFU1NJT05TCisjaWYgRU5BQkxFKFlBUlJfSklUX1VO SUNPREVfRVhQUkVTU0lPTlMpCiAgICAgICAgICAgICBpZiAobV9kZWNvZGVTdXJyb2dhdGVQYWly cyAmJiAhVV9JU19CTVAoY2gpKSB7CiAgICAgICAgICAgICAgICAgSnVtcCBzdXJyb2dhdGVQYWly T2sgPSBub3RBdEVuZE9mSW5wdXQoKTsKICAgICAgICAgICAgICAgICBzdWIzMihUcnVzdGVkSW1t MzIoMSksIGluZGV4KTsKQEAgLTE4MzUsNyArMTgzMyw3IEBAIGNsYXNzIFlhcnJHZW5lcmF0b3Ig ZmluYWwgOiBwdWJsaWMgWWFyckpJVEluZm8sIHByaXZhdGUgTWFjcm9Bc3NlbWJsZXIgewogICAg ICAgICAgICAgICAgIG1hdGNoRGVzdC5saW5rKHRoaXMpOwogICAgICAgICAgICAgfQogICAgICAg ICB9Ci0jaWZkZWYgSklUX1VOSUNPREVfRVhQUkVTU0lPTlMKKyNpZiBFTkFCTEUoWUFSUl9KSVRf VU5JQ09ERV9FWFBSRVNTSU9OUykKICAgICAgICAgaWYgKG1fZGVjb2RlU3Vycm9nYXRlUGFpcnMg JiYgKCF0ZXJtLT5jaGFyYWN0ZXJDbGFzcy0+aGFzT25lQ2hhcmFjdGVyU2l6ZSgpIHx8IHRlcm0t PmludmVydCgpKSkgewogICAgICAgICAgICAgSnVtcCBpc0JNUENoYXIgPSBicmFuY2gzMihMZXNz VGhhbiwgY2hhcmFjdGVyLCBzdXBwbGVtZW50YXJ5UGxhbmVzQmFzZSk7CiAgICAgICAgICAgICBv cC5tX2p1bXBzLmFwcGVuZChhdEVuZE9mSW5wdXQoKSk7CkBAIC0xODQ2LDcgKzE4NDQsNyBAQCBj bGFzcyBZYXJyR2VuZXJhdG9yIGZpbmFsIDogcHVibGljIFlhcnJKSVRJbmZvLCBwcml2YXRlIE1h Y3JvQXNzZW1ibGVyIHsKICAgICB9CiAgICAgdm9pZCBiYWNrdHJhY2tDaGFyYWN0ZXJDbGFzc09u Y2Uoc2l6ZV90IG9wSW5kZXgpCiAgICAgewotI2lmZGVmIEpJVF9VTklDT0RFX0VYUFJFU1NJT05T CisjaWYgRU5BQkxFKFlBUlJfSklUX1VOSUNPREVfRVhQUkVTU0lPTlMpCiAgICAgICAgIGlmICht X2RlY29kZVN1cnJvZ2F0ZVBhaXJzKSB7CiAgICAgICAgICAgICBZYXJyT3AmIG9wID0gbV9vcHNb b3BJbmRleF07CiAgICAgICAgICAgICBQYXR0ZXJuVGVybSogdGVybSA9IG9wLm1fdGVybTsKQEAg LTE4NzQsNyArMTg3Miw3IEBAIGNsYXNzIFlhcnJHZW5lcmF0b3IgZmluYWwgOiBwdWJsaWMgWWFy ckpJVEluZm8sIHByaXZhdGUgTWFjcm9Bc3NlbWJsZXIgewogCiAgICAgICAgIENoZWNrZWQ8dW5z aWduZWQ+IHNjYWxlZE1heENvdW50ID0gdGVybS0+cXVhbnRpdHlNYXhDb3VudDsKIAotI2lmZGVm IEpJVF9VTklDT0RFX0VYUFJFU1NJT05TCisjaWYgRU5BQkxFKFlBUlJfSklUX1VOSUNPREVfRVhQ UkVTU0lPTlMpCiAgICAgICAgIGlmIChtX2RlY29kZVN1cnJvZ2F0ZVBhaXJzICYmIHRlcm0tPmNo YXJhY3RlckNsYXNzLT5oYXNPbmx5Tm9uQk1QQ2hhcmFjdGVycygpICYmICF0ZXJtLT5pbnZlcnQo KSkKICAgICAgICAgICAgIHNjYWxlZE1heENvdW50ICo9IDI7CiAjZW5kaWYKQEAgLTE4OTYsNyAr MTg5NCw3IEBAIGNsYXNzIFlhcnJHZW5lcmF0b3IgZmluYWwgOiBwdWJsaWMgWWFyckpJVEluZm8s IHByaXZhdGUgTWFjcm9Bc3NlbWJsZXIgewogICAgICAgICAgICAgfQogICAgICAgICB9CiAKLSNp ZmRlZiBKSVRfVU5JQ09ERV9FWFBSRVNTSU9OUworI2lmIEVOQUJMRShZQVJSX0pJVF9VTklDT0RF X0VYUFJFU1NJT05TKQogICAgICAgICBpZiAobV9kZWNvZGVTdXJyb2dhdGVQYWlycykgewogICAg ICAgICAgICAgaWYgKHRlcm0tPmlzRml4ZWRXaWR0aENoYXJhY3RlckNsYXNzKCkpCiAgICAgICAg ICAgICAgICAgYWRkMzIoVHJ1c3RlZEltbTMyKHRlcm0tPmNoYXJhY3RlckNsYXNzLT5oYXNOb25C TVBDaGFyYWN0ZXJzKCkgPyAyIDogMSksIGNvdW50UmVnaXN0ZXIpOwpAQCAtMTkzMyw3ICsxOTMx LDcgQEAgY2xhc3MgWWFyckdlbmVyYXRvciBmaW5hbCA6IHB1YmxpYyBZYXJySklUSW5mbywgcHJp dmF0ZSBNYWNyb0Fzc2VtYmxlciB7CiAgICAgICAgIEp1bXBMaXN0IGZhaWx1cmVzOwogICAgICAg ICBKdW1wTGlzdCBmYWlsdXJlc0RlY3JlbWVudEluZGV4OwogICAgICAgICBMYWJlbCBsb29wKHRo aXMpOwotI2lmZGVmIEpJVF9VTklDT0RFX0VYUFJFU1NJT05TCisjaWYgRU5BQkxFKFlBUlJfSklU X1VOSUNPREVfRVhQUkVTU0lPTlMpCiAgICAgICAgIGlmICh0ZXJtLT5pc0ZpeGVkV2lkdGhDaGFy YWN0ZXJDbGFzcygpICYmIHRlcm0tPmNoYXJhY3RlckNsYXNzLT5oYXNOb25CTVBDaGFyYWN0ZXJz KCkpIHsKICAgICAgICAgICAgIG1vdmUoVHJ1c3RlZEltbTMyKDEpLCBjaGFyYWN0ZXIpOwogICAg ICAgICAgICAgZmFpbHVyZXMuYXBwZW5kKGNoZWNrTm90RW5vdWdoSW5wdXQoY2hhcmFjdGVyKSk7 CkBAIC0xOTU2LDcgKzE5NTQsNyBAQCBjbGFzcyBZYXJyR2VuZXJhdG9yIGZpbmFsIDogcHVibGlj IFlhcnJKSVRJbmZvLCBwcml2YXRlIE1hY3JvQXNzZW1ibGVyIHsKICAgICAgICAgICAgIG1hdGNo RGVzdC5saW5rKHRoaXMpOwogICAgICAgICB9CiAKLSNpZmRlZiBKSVRfVU5JQ09ERV9FWFBSRVNT SU9OUworI2lmIEVOQUJMRShZQVJSX0pJVF9VTklDT0RFX0VYUFJFU1NJT05TKQogICAgICAgICBp ZiAobV9kZWNvZGVTdXJyb2dhdGVQYWlycykKICAgICAgICAgICAgIGFkdmFuY2VJbmRleEFmdGVy Q2hhcmFjdGVyQ2xhc3NUZXJtTWF0Y2godGVybSwgZmFpbHVyZXNEZWNyZW1lbnRJbmRleCwgY2hh cmFjdGVyKTsKICAgICAgICAgZWxzZQpAQCAtMjAxMiw3ICsyMDEwLDcgQEAgY2xhc3MgWWFyckdl bmVyYXRvciBmaW5hbCA6IHB1YmxpYyBZYXJySklUSW5mbywgcHJpdmF0ZSBNYWNyb0Fzc2VtYmxl ciB7CiAgICAgICAgICAgICBzdWIzMihUcnVzdGVkSW1tMzIoMSksIGNvdW50UmVnaXN0ZXIpOwog ICAgICAgICAgICAgYWRkMzIoVHJ1c3RlZEltbTMyKDEpLCBpbmRleCk7CiAKLSNpZmRlZiBKSVRf VU5JQ09ERV9FWFBSRVNTSU9OUworI2lmIEVOQUJMRShZQVJSX0pJVF9VTklDT0RFX0VYUFJFU1NJ T05TKQogICAgICAgICAgICAgSnVtcCBpc0JNUENoYXIgPSBicmFuY2gzMihMZXNzVGhhbiwgY2hh cmFjdGVyLCBzdXBwbGVtZW50YXJ5UGxhbmVzQmFzZSk7CiAgICAgICAgICAgICBhZGQzMihUcnVz dGVkSW1tMzIoMSksIGluZGV4KTsKICAgICAgICAgICAgIGlzQk1QQ2hhci5saW5rKHRoaXMpOwpA QCAtMjAzNiw3ICsyMDM0LDcgQEAgY2xhc3MgWWFyckdlbmVyYXRvciBmaW5hbCA6IHB1YmxpYyBZ YXJySklUSW5mbywgcHJpdmF0ZSBNYWNyb0Fzc2VtYmxlciB7CiAgICAgICAgIG1vdmUoVHJ1c3Rl ZEltbTMyKDApLCBjb3VudFJlZ2lzdGVyKTsKICAgICAgICAgb3AubV9yZWVudHJ5ID0gbGFiZWwo KTsKIAotI2lmZGVmIEpJVF9VTklDT0RFX0VYUFJFU1NJT05TCisjaWYgRU5BQkxFKFlBUlJfSklU X1VOSUNPREVfRVhQUkVTU0lPTlMpCiAgICAgICAgIGlmIChtX2RlY29kZVN1cnJvZ2F0ZVBhaXJz KSB7CiAgICAgICAgICAgICBpZiAoIXRlcm0tPmNoYXJhY3RlckNsYXNzLT5oYXNPbmVDaGFyYWN0 ZXJTaXplKCkgfHwgdGVybS0+aW52ZXJ0KCkpCiAgICAgICAgICAgICAgICAgc3RvcmVUb0ZyYW1l KGluZGV4LCB0ZXJtLT5mcmFtZUxvY2F0aW9uICsgQmFja1RyYWNrSW5mb0NoYXJhY3RlckNsYXNz OjpiZWdpbkluZGV4KCkpOwpAQCAtMjA1OSw3ICsyMDU3LDcgQEAgY2xhc3MgWWFyckdlbmVyYXRv ciBmaW5hbCA6IHB1YmxpYyBZYXJySklUSW5mbywgcHJpdmF0ZSBNYWNyb0Fzc2VtYmxlciB7CiAK ICAgICAgICAgbV9iYWNrdHJhY2tpbmdTdGF0ZS5saW5rKHRoaXMpOwogCi0jaWZkZWYgSklUX1VO SUNPREVfRVhQUkVTU0lPTlMKKyNpZiBFTkFCTEUoWUFSUl9KSVRfVU5JQ09ERV9FWFBSRVNTSU9O UykKICAgICAgICAgaWYgKG1fZGVjb2RlU3Vycm9nYXRlUGFpcnMpIHsKICAgICAgICAgICAgIGlm ICghdGVybS0+Y2hhcmFjdGVyQ2xhc3MtPmhhc09uZUNoYXJhY3RlclNpemUoKSB8fCB0ZXJtLT5p bnZlcnQoKSkKICAgICAgICAgICAgICAgICBsb2FkRnJvbUZyYW1lKHRlcm0tPmZyYW1lTG9jYXRp b24gKyBCYWNrVHJhY2tJbmZvQ2hhcmFjdGVyQ2xhc3M6OmJlZ2luSW5kZXgoKSwgaW5kZXgpOwpA QCAtMjA4Niw3ICsyMDg0LDcgQEAgY2xhc3MgWWFyckdlbmVyYXRvciBmaW5hbCA6IHB1YmxpYyBZ YXJySklUSW5mbywgcHJpdmF0ZSBNYWNyb0Fzc2VtYmxlciB7CiAgICAgICAgICAgICB9CiAgICAg ICAgIH0KIAotI2lmZGVmIEpJVF9VTklDT0RFX0VYUFJFU1NJT05TCisjaWYgRU5BQkxFKFlBUlJf SklUX1VOSUNPREVfRVhQUkVTU0lPTlMpCiAgICAgICAgIGlmIChtX2RlY29kZVN1cnJvZ2F0ZVBh aXJzKQogICAgICAgICAgICAgYWR2YW5jZUluZGV4QWZ0ZXJDaGFyYWN0ZXJDbGFzc1Rlcm1NYXRj aCh0ZXJtLCBub25HcmVlZHlGYWlsdXJlc0RlY3JlbWVudEluZGV4LCBjaGFyYWN0ZXIpOwogICAg ICAgICBlbHNlCkBAIC0zOTMwLDcgKzM5MjgsNyBAQCBjbGFzcyBZYXJyR2VuZXJhdG9yIGZpbmFs IDogcHVibGljIFlhcnJKSVRJbmZvLCBwcml2YXRlIE1hY3JvQXNzZW1ibGVyIHsKIAogICAgIHZv aWQgZ2VuZXJhdGVUcnlSZWFkVW5pY29kZUNoYXJhY3RlckhlbHBlcigpCiAgICAgewotI2lmZGVm IEpJVF9VTklDT0RFX0VYUFJFU1NJT05TCisjaWYgRU5BQkxFKFlBUlJfSklUX1VOSUNPREVfRVhQ UkVTU0lPTlMpCiAgICAgICAgIGlmIChtX3RyeVJlYWRVbmljb2RlQ2hhcmFjdGVyQ2FsbHMuaXNF bXB0eSgpKQogICAgICAgICAgICAgcmV0dXJuOwogCkBAIC00MDc0LDcgKzQwNzIsNyBAQCBjbGFz cyBZYXJyR2VuZXJhdG9yIGZpbmFsIDogcHVibGljIFlhcnJKSVRJbmZvLCBwcml2YXRlIE1hY3Jv QXNzZW1ibGVyIHsKICAgICB7CiAgICAgICAgIFlhcnJDb2RlQmxvY2smIGNvZGVCbG9jayA9IG1f Y29kZUJsb2NrOwogCi0jaWZuZGVmIEpJVF9VTklDT0RFX0VYUFJFU1NJT05TCisjaWYgRU5BQkxF KFlBUlJfSklUX1VOSUNPREVfRVhQUkVTU0lPTlMpCiAgICAgICAgIGlmIChtX2RlY29kZVN1cnJv Z2F0ZVBhaXJzKSB7CiAgICAgICAgICAgICBjb2RlQmxvY2suc2V0RmFsbEJhY2tXaXRoRmFpbHVy ZVJlYXNvbihKSVRGYWlsdXJlUmVhc29uOjpEZWNvZGVTdXJyb2dhdGVQYWlyKTsKICAgICAgICAg ICAgIHJldHVybjsKQEAgLTQxNDAsNyArNDEzOCw3IEBAIGNsYXNzIFlhcnJHZW5lcmF0b3IgZmlu YWwgOiBwdWJsaWMgWWFyckpJVEluZm8sIHByaXZhdGUgTWFjcm9Bc3NlbWJsZXIgewogICAgICAg ICAgICAgbW92ZShyZWdUMCwgc3RhY2tQb2ludGVyUmVnaXN0ZXIpOwogICAgICAgICB9CiAKLSNp ZmRlZiBKSVRfVU5JQ09ERV9FWFBSRVNTSU9OUworI2lmIEVOQUJMRShZQVJSX0pJVF9VTklDT0RF X0VYUFJFU1NJT05TKQogICAgICAgICBpZiAobV9kZWNvZGVTdXJyb2dhdGVQYWlycykKICAgICAg ICAgICAgIGdldEVmZmVjdGl2ZUFkZHJlc3MoQmFzZUluZGV4KGlucHV0LCBsZW5ndGgsIFRpbWVz VHdvKSwgZW5kT2ZTdHJpbmdBZGRyZXNzKTsKICNlbmRpZgpkaWZmIC0tZ2l0IGEvU291cmNlL1dU Ri93dGYvUGxhdGZvcm1FbmFibGUuaCBiL1NvdXJjZS9XVEYvd3RmL1BsYXRmb3JtRW5hYmxlLmgK aW5kZXggZDg2ODhkY2ViNjA5YmUwZTcxMjNlNTQxOTlkNjJmMzIxYzhhYzhlNS4uNWMxNGQxNGMx NDgyY2VlNGM1NDA1NGVmZTE4MzY3OGQ1Njg3ZmUxOSAxMDA2NDQKLS0tIGEvU291cmNlL1dURi93 dGYvUGxhdGZvcm1FbmFibGUuaAorKysgYi9Tb3VyY2UvV1RGL3d0Zi9QbGF0Zm9ybUVuYWJsZS5o CkBAIC03NTEsNiArNzUxLDEwIEBACiAjZGVmaW5lIEVOQUJMRV9ZQVJSX0pJVF9CQUNLUkVGRVJF TkNFUyAxCiAjZW5kaWYKIAorI2lmIENQVShBUk02NCkgfHwgQ1BVKFg4Nl82NCkKKyNkZWZpbmUg RU5BQkxFX1lBUlJfSklUX1VOSUNPREVfRVhQUkVTU0lPTlMgMQorI2VuZGlmCisKIC8qIElmIGVp dGhlciB0aGUgSklUIG9yIHRoZSBSZWdFeHAgSklUIGlzIGVuYWJsZWQsIHRoZW4gdGhlIEFzc2Vt YmxlciBtdXN0IGJlCiAgICBlbmFibGVkIGFzIHdlbGw6ICovCiAjaWYgRU5BQkxFKEpJVCkgfHwg RU5BQkxFKFlBUlJfSklUKSB8fCAhRU5BQkxFKENfTE9PUCkK 434680 2021-07-30 18:22:21 -0700 2021-07-31 06:17:42 -0700 Patch bug-228669-20210730182221.patch text/plain 10867 ysuzuki U3VidmVyc2lvbiBSZXZpc2lvbjogMjgwNDk3CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCAw YTI3ZjkzZjYzYWQyZjk4NTY1OWI3ZTQ4NjNiYmZlNDE5ZTYwNGRiLi5lMDc1MWZkMmVjMjg5YTE2 Nzk1ZmZkNmQ5ZTRhZWQ1MjlkMTQ1MmMwIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxNSBAQAorMjAyMS0wNy0zMCAgWXVzdWtlIFN1enVraSAgPHlzdXp1a2lAYXBwbGUuY29t PgorCisgICAgICAgIFtKU0NdIE1vdmUgSklUX1VOSUNPREVfRVhQUkVTU0lPTlMgdG8gRU5BQkxF KFlBUlJfSklUX1VOSUNPREVfRVhQUkVTU0lPTlMpIGluIFBsYXRmb3JtRW5hYmxlLmgKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyODY2OQorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE1vdmUgSklUX1VOSUNP REVfRVhQUkVTU0lPTlMgdG8gUGxhdGZvcm1FbmFibGUuaCB0byBhbGlnbiB0byB0aGUgb3RoZXIg WWFyckpJVCBmbGFncy4KKyAgICAgICAgVGhpcyBtYWtlcyBpdCBlYXN5IHRvIHJlYWQgdGhhdCB0 aGlzIGlzIGVuYWJsZWQgb24gQVJNNjQgYW5kIFg4Nl82NC4KKworICAgICAgICAqIHlhcnIvWWFy ckpJVC5jcHA6CisKIDIwMjEtMDctMzAgIFl1c3VrZSBTdXp1a2kgIDx5c3V6dWtpQGFwcGxlLmNv bT4KIAogICAgICAgICBVbnJldmlld2VkLCBmaXggd3JvbmcgYWNjZXNzIHdpZHRoCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV1RGL0NoYW5nZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IDIz YzIzMzg0M2YwMTE5ZTQ1M2VkYjcwYjgxODZmM2U5NWZkMjMzYzQuLmZlY2VlNzdkOTJiNDViZGNm ZmYyYTM2YzQyMWYyNDExZWFmY2JjMTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9n CisrKyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAKKzIwMjEtMDctMzAg IFl1c3VrZSBTdXp1a2kgIDx5c3V6dWtpQGFwcGxlLmNvbT4KKworICAgICAgICBbSlNDXSBNb3Zl IEpJVF9VTklDT0RFX0VYUFJFU1NJT05TIHRvIEVOQUJMRShZQVJSX0pJVF9VTklDT0RFX0VYUFJF U1NJT05TKSBpbiBQbGF0Zm9ybUVuYWJsZS5oCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0yMjg2NjkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICAqIHd0Zi9QbGF0Zm9ybUVuYWJsZS5oOgorCiAyMDIxLTA3LTI5 ICBNeWxlcyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CiAKICAgICAgICAgU3Rv cCBidWlsZGluZyBXZWJHUFUgYW5kIHRoZSBXSExTTCBjb21waWxlciB0byBkZWNyZWFzZSBiaW5h cnkgc2l6ZQpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3lhcnIvWWFyckpJVC5j cHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUveWFyci9ZYXJySklULmNwcAppbmRleCAwYTkyNDA2 MTZjNjg0YmQwZGNmNDM4ZGFlMTk3YjM2ZmU0ZjU5Y2NiLi5hYTdiZjhiNmFhY2MwZWY4NmFkOGQ2 NGU5NWY3YmJmMDk3YmU1YTEwIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUveWFy ci9ZYXJySklULmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUveWFyci9ZYXJySklULmNw cApAQCAtMTk4LDcgKzE5OCw2IEBAIGNsYXNzIFlhcnJHZW5lcmF0b3IgZmluYWwgOiBwdWJsaWMg WWFyckpJVEluZm8sIHByaXZhdGUgTWFjcm9Bc3NlbWJsZXIgewogICAgIHN0YXRpYyBjb25zdCBS ZWdpc3RlcklEIHJldHVyblJlZ2lzdGVyMiA9IEFSTTY0UmVnaXN0ZXJzOjp4MTsKIAogICAgIGNv bnN0IFRydXN0ZWRJbW0zMiBzdXJyb2dhdGVUYWdNYXNrID0gVHJ1c3RlZEltbTMyKDB4ZmZmZmZj MDApOwotI2RlZmluZSBKSVRfVU5JQ09ERV9FWFBSRVNTSU9OUwogI2VsaWYgQ1BVKE1JUFMpCiAg ICAgc3RhdGljIGNvbnN0IFJlZ2lzdGVySUQgaW5wdXQgPSBNSVBTUmVnaXN0ZXJzOjphMDsKICAg ICBzdGF0aWMgY29uc3QgUmVnaXN0ZXJJRCBpbmRleCA9IE1JUFNSZWdpc3RlcnM6OmExOwpAQCAt MjU5LDcgKzI1OCw2IEBAIGNsYXNzIFlhcnJHZW5lcmF0b3IgZmluYWwgOiBwdWJsaWMgWWFyckpJ VEluZm8sIHByaXZhdGUgTWFjcm9Bc3NlbWJsZXIgewogICAgIGNvbnN0IFRydXN0ZWRJbW0zMiBs ZWFkaW5nU3Vycm9nYXRlVGFnID0gVHJ1c3RlZEltbTMyKDB4ZDgwMCk7CiAgICAgY29uc3QgVHJ1 c3RlZEltbTMyIHRyYWlsaW5nU3Vycm9nYXRlVGFnID0gVHJ1c3RlZEltbTMyKDB4ZGMwMCk7CiAg ICAgY29uc3QgVHJ1c3RlZEltbTMyIHN1cnJvZ2F0ZVRhZ01hc2sgPSBUcnVzdGVkSW1tMzIoMHhm ZmZmZmMwMCk7Ci0jZGVmaW5lIEpJVF9VTklDT0RFX0VYUFJFU1NJT05TCiAjZW5kaWYKIAogI2lm IEVOQUJMRShZQVJSX0pJVF9BTExfUEFSRU5TX0VYUFJFU1NJT05TKQpAQCAtNTYxLDcgKzU1OSw3 IEBAIGNsYXNzIFlhcnJHZW5lcmF0b3IgZmluYWwgOiBwdWJsaWMgWWFyckpJVEluZm8sIHByaXZh dGUgTWFjcm9Bc3NlbWJsZXIgewogICAgICAgICAgICAgdW5pY29kZUZhaWwubGluayh0aGlzKTsK ICAgICB9CiAKLSNpZmRlZiBKSVRfVU5JQ09ERV9FWFBSRVNTSU9OUworI2lmIEVOQUJMRShZQVJS X0pJVF9VTklDT0RFX0VYUFJFU1NJT05TKQogICAgIHZvaWQgYWR2YW5jZUluZGV4QWZ0ZXJDaGFy YWN0ZXJDbGFzc1Rlcm1NYXRjaChjb25zdCBQYXR0ZXJuVGVybSogdGVybSwgSnVtcExpc3QmIGZh aWx1cmVzQWZ0ZXJJbmNyZW1lbnRpbmdJbmRleCwgY29uc3QgUmVnaXN0ZXJJRCBjaGFyYWN0ZXIp CiAgICAgewogICAgICAgICBBU1NFUlQodGVybS0+dHlwZSA9PSBQYXR0ZXJuVGVybTo6VHlwZTo6 Q2hhcmFjdGVyQ2xhc3MpOwpAQCAtNjQ0LDcgKzY0Miw3IEBAIGNsYXNzIFlhcnJHZW5lcmF0b3Ig ZmluYWwgOiBwdWJsaWMgWWFyckpJVEluZm8sIHByaXZhdGUgTWFjcm9Bc3NlbWJsZXIgewogICAg ICAgICByZXR1cm4gQmFzZUluZGV4KGlucHV0LCBpbmRleFJlZywgVGltZXNUd28sIGNoYXJhY3Rl ck9mZnNldCAqIHN0YXRpY19jYXN0PGludDMyX3Q+KHNpemVvZihVQ2hhcikpKTsKICAgICB9CiAK LSNpZmRlZiBKSVRfVU5JQ09ERV9FWFBSRVNTSU9OUworI2lmIEVOQUJMRShZQVJSX0pJVF9VTklD T0RFX0VYUFJFU1NJT05TKQogICAgIHZvaWQgdHJ5UmVhZFVuaWNvZGVDaGFySW1wbChSZWdpc3Rl cklEIHJlc3VsdFJlZykKICAgICB7CiAgICAgICAgIEFTU0VSVChtX2NoYXJTaXplID09IENoYXJT aXplOjpDaGFyMTYpOwpAQCAtNjkxLDcgKzY4OSw3IEBAIGNsYXNzIFlhcnJHZW5lcmF0b3IgZmlu YWwgOiBwdWJsaWMgWWFyckpJVEluZm8sIHByaXZhdGUgTWFjcm9Bc3NlbWJsZXIgewogCiAgICAg ICAgIGlmIChtX2NoYXJTaXplID09IENoYXJTaXplOjpDaGFyOCkKICAgICAgICAgICAgIGxvYWQ4 KGFkZHJlc3MsIHJlc3VsdFJlZyk7Ci0jaWZkZWYgSklUX1VOSUNPREVfRVhQUkVTU0lPTlMKKyNp ZiBFTkFCTEUoWUFSUl9KSVRfVU5JQ09ERV9FWFBSRVNTSU9OUykKICAgICAgICAgZWxzZSBpZiAo bV9kZWNvZGVTdXJyb2dhdGVQYWlycykKICAgICAgICAgICAgIHRyeVJlYWRVbmljb2RlQ2hhcihh ZGRyZXNzLCByZXN1bHRSZWcpOwogI2VuZGlmCkBAIC0xNjc5LDcgKzE2NzcsNyBAQCBjbGFzcyBZ YXJyR2VuZXJhdG9yIGZpbmFsIDogcHVibGljIFlhcnJKSVRJbmZvLCBwcml2YXRlIE1hY3JvQXNz ZW1ibGVyIHsKICAgICAgICAgfQogCiAgICAgICAgIG9wLm1fanVtcHMuYXBwZW5kKGJyYW5jaDMy KE5vdEVxdWFsLCBjaGFyYWN0ZXIsIEltbTMyKGNoKSkpOwotI2lmZGVmIEpJVF9VTklDT0RFX0VY UFJFU1NJT05TCisjaWYgRU5BQkxFKFlBUlJfSklUX1VOSUNPREVfRVhQUkVTU0lPTlMpCiAgICAg ICAgIGlmIChtX2RlY29kZVN1cnJvZ2F0ZVBhaXJzICYmICFVX0lTX0JNUChjaCkpCiAgICAgICAg ICAgICBhZGQzMihUcnVzdGVkSW1tMzIoMiksIGNvdW50UmVnaXN0ZXIpOwogICAgICAgICBlbHNl CkBAIC0xNzExLDcgKzE3MDksNyBAQCBjbGFzcyBZYXJyR2VuZXJhdG9yIGZpbmFsIDogcHVibGlj IFlhcnJKSVRJbmZvLCBwcml2YXRlIE1hY3JvQXNzZW1ibGVyIHsKICAgICAgICAgICAgIGZhaWx1 cmVzLmFwcGVuZChqdW1wSWZDaGFyTm90RXF1YWxzKGNoLCBtX2NoZWNrZWRPZmZzZXQgLSB0ZXJt LT5pbnB1dFBvc2l0aW9uLCBjaGFyYWN0ZXIpKTsKIAogICAgICAgICAgICAgYWRkMzIoVHJ1c3Rl ZEltbTMyKDEpLCBpbmRleCk7Ci0jaWZkZWYgSklUX1VOSUNPREVfRVhQUkVTU0lPTlMKKyNpZiBF TkFCTEUoWUFSUl9KSVRfVU5JQ09ERV9FWFBSRVNTSU9OUykKICAgICAgICAgICAgIGlmIChtX2Rl Y29kZVN1cnJvZ2F0ZVBhaXJzICYmICFVX0lTX0JNUChjaCkpIHsKICAgICAgICAgICAgICAgICBK dW1wIHN1cnJvZ2F0ZVBhaXJPayA9IG5vdEF0RW5kT2ZJbnB1dCgpOwogICAgICAgICAgICAgICAg IHN1YjMyKFRydXN0ZWRJbW0zMigxKSwgaW5kZXgpOwpAQCAtMTc4NSw3ICsxNzgzLDcgQEAgY2xh c3MgWWFyckdlbmVyYXRvciBmaW5hbCA6IHB1YmxpYyBZYXJySklUSW5mbywgcHJpdmF0ZSBNYWNy b0Fzc2VtYmxlciB7CiAgICAgICAgICAgICBub25HcmVlZHlGYWlsdXJlcy5hcHBlbmQoanVtcElm Q2hhck5vdEVxdWFscyhjaCwgbV9jaGVja2VkT2Zmc2V0IC0gdGVybS0+aW5wdXRQb3NpdGlvbiwg Y2hhcmFjdGVyKSk7CiAKICAgICAgICAgICAgIGFkZDMyKFRydXN0ZWRJbW0zMigxKSwgaW5kZXgp OwotI2lmZGVmIEpJVF9VTklDT0RFX0VYUFJFU1NJT05TCisjaWYgRU5BQkxFKFlBUlJfSklUX1VO SUNPREVfRVhQUkVTU0lPTlMpCiAgICAgICAgICAgICBpZiAobV9kZWNvZGVTdXJyb2dhdGVQYWly cyAmJiAhVV9JU19CTVAoY2gpKSB7CiAgICAgICAgICAgICAgICAgSnVtcCBzdXJyb2dhdGVQYWly T2sgPSBub3RBdEVuZE9mSW5wdXQoKTsKICAgICAgICAgICAgICAgICBzdWIzMihUcnVzdGVkSW1t MzIoMSksIGluZGV4KTsKQEAgLTE4MzUsNyArMTgzMyw3IEBAIGNsYXNzIFlhcnJHZW5lcmF0b3Ig ZmluYWwgOiBwdWJsaWMgWWFyckpJVEluZm8sIHByaXZhdGUgTWFjcm9Bc3NlbWJsZXIgewogICAg ICAgICAgICAgICAgIG1hdGNoRGVzdC5saW5rKHRoaXMpOwogICAgICAgICAgICAgfQogICAgICAg ICB9Ci0jaWZkZWYgSklUX1VOSUNPREVfRVhQUkVTU0lPTlMKKyNpZiBFTkFCTEUoWUFSUl9KSVRf VU5JQ09ERV9FWFBSRVNTSU9OUykKICAgICAgICAgaWYgKG1fZGVjb2RlU3Vycm9nYXRlUGFpcnMg JiYgKCF0ZXJtLT5jaGFyYWN0ZXJDbGFzcy0+aGFzT25lQ2hhcmFjdGVyU2l6ZSgpIHx8IHRlcm0t PmludmVydCgpKSkgewogICAgICAgICAgICAgSnVtcCBpc0JNUENoYXIgPSBicmFuY2gzMihMZXNz VGhhbiwgY2hhcmFjdGVyLCBzdXBwbGVtZW50YXJ5UGxhbmVzQmFzZSk7CiAgICAgICAgICAgICBv cC5tX2p1bXBzLmFwcGVuZChhdEVuZE9mSW5wdXQoKSk7CkBAIC0xODQ2LDcgKzE4NDQsNyBAQCBj bGFzcyBZYXJyR2VuZXJhdG9yIGZpbmFsIDogcHVibGljIFlhcnJKSVRJbmZvLCBwcml2YXRlIE1h Y3JvQXNzZW1ibGVyIHsKICAgICB9CiAgICAgdm9pZCBiYWNrdHJhY2tDaGFyYWN0ZXJDbGFzc09u Y2Uoc2l6ZV90IG9wSW5kZXgpCiAgICAgewotI2lmZGVmIEpJVF9VTklDT0RFX0VYUFJFU1NJT05T CisjaWYgRU5BQkxFKFlBUlJfSklUX1VOSUNPREVfRVhQUkVTU0lPTlMpCiAgICAgICAgIGlmICht X2RlY29kZVN1cnJvZ2F0ZVBhaXJzKSB7CiAgICAgICAgICAgICBZYXJyT3AmIG9wID0gbV9vcHNb b3BJbmRleF07CiAgICAgICAgICAgICBQYXR0ZXJuVGVybSogdGVybSA9IG9wLm1fdGVybTsKQEAg LTE4NzQsNyArMTg3Miw3IEBAIGNsYXNzIFlhcnJHZW5lcmF0b3IgZmluYWwgOiBwdWJsaWMgWWFy ckpJVEluZm8sIHByaXZhdGUgTWFjcm9Bc3NlbWJsZXIgewogCiAgICAgICAgIENoZWNrZWQ8dW5z aWduZWQ+IHNjYWxlZE1heENvdW50ID0gdGVybS0+cXVhbnRpdHlNYXhDb3VudDsKIAotI2lmZGVm IEpJVF9VTklDT0RFX0VYUFJFU1NJT05TCisjaWYgRU5BQkxFKFlBUlJfSklUX1VOSUNPREVfRVhQ UkVTU0lPTlMpCiAgICAgICAgIGlmIChtX2RlY29kZVN1cnJvZ2F0ZVBhaXJzICYmIHRlcm0tPmNo YXJhY3RlckNsYXNzLT5oYXNPbmx5Tm9uQk1QQ2hhcmFjdGVycygpICYmICF0ZXJtLT5pbnZlcnQo KSkKICAgICAgICAgICAgIHNjYWxlZE1heENvdW50ICo9IDI7CiAjZW5kaWYKQEAgLTE4OTYsNyAr MTg5NCw3IEBAIGNsYXNzIFlhcnJHZW5lcmF0b3IgZmluYWwgOiBwdWJsaWMgWWFyckpJVEluZm8s IHByaXZhdGUgTWFjcm9Bc3NlbWJsZXIgewogICAgICAgICAgICAgfQogICAgICAgICB9CiAKLSNp ZmRlZiBKSVRfVU5JQ09ERV9FWFBSRVNTSU9OUworI2lmIEVOQUJMRShZQVJSX0pJVF9VTklDT0RF X0VYUFJFU1NJT05TKQogICAgICAgICBpZiAobV9kZWNvZGVTdXJyb2dhdGVQYWlycykgewogICAg ICAgICAgICAgaWYgKHRlcm0tPmlzRml4ZWRXaWR0aENoYXJhY3RlckNsYXNzKCkpCiAgICAgICAg ICAgICAgICAgYWRkMzIoVHJ1c3RlZEltbTMyKHRlcm0tPmNoYXJhY3RlckNsYXNzLT5oYXNOb25C TVBDaGFyYWN0ZXJzKCkgPyAyIDogMSksIGNvdW50UmVnaXN0ZXIpOwpAQCAtMTkzMyw3ICsxOTMx LDcgQEAgY2xhc3MgWWFyckdlbmVyYXRvciBmaW5hbCA6IHB1YmxpYyBZYXJySklUSW5mbywgcHJp dmF0ZSBNYWNyb0Fzc2VtYmxlciB7CiAgICAgICAgIEp1bXBMaXN0IGZhaWx1cmVzOwogICAgICAg ICBKdW1wTGlzdCBmYWlsdXJlc0RlY3JlbWVudEluZGV4OwogICAgICAgICBMYWJlbCBsb29wKHRo aXMpOwotI2lmZGVmIEpJVF9VTklDT0RFX0VYUFJFU1NJT05TCisjaWYgRU5BQkxFKFlBUlJfSklU X1VOSUNPREVfRVhQUkVTU0lPTlMpCiAgICAgICAgIGlmICh0ZXJtLT5pc0ZpeGVkV2lkdGhDaGFy YWN0ZXJDbGFzcygpICYmIHRlcm0tPmNoYXJhY3RlckNsYXNzLT5oYXNOb25CTVBDaGFyYWN0ZXJz KCkpIHsKICAgICAgICAgICAgIG1vdmUoVHJ1c3RlZEltbTMyKDEpLCBjaGFyYWN0ZXIpOwogICAg ICAgICAgICAgZmFpbHVyZXMuYXBwZW5kKGNoZWNrTm90RW5vdWdoSW5wdXQoY2hhcmFjdGVyKSk7 CkBAIC0xOTU2LDcgKzE5NTQsNyBAQCBjbGFzcyBZYXJyR2VuZXJhdG9yIGZpbmFsIDogcHVibGlj IFlhcnJKSVRJbmZvLCBwcml2YXRlIE1hY3JvQXNzZW1ibGVyIHsKICAgICAgICAgICAgIG1hdGNo RGVzdC5saW5rKHRoaXMpOwogICAgICAgICB9CiAKLSNpZmRlZiBKSVRfVU5JQ09ERV9FWFBSRVNT SU9OUworI2lmIEVOQUJMRShZQVJSX0pJVF9VTklDT0RFX0VYUFJFU1NJT05TKQogICAgICAgICBp ZiAobV9kZWNvZGVTdXJyb2dhdGVQYWlycykKICAgICAgICAgICAgIGFkdmFuY2VJbmRleEFmdGVy Q2hhcmFjdGVyQ2xhc3NUZXJtTWF0Y2godGVybSwgZmFpbHVyZXNEZWNyZW1lbnRJbmRleCwgY2hh cmFjdGVyKTsKICAgICAgICAgZWxzZQpAQCAtMjAxMiw3ICsyMDEwLDcgQEAgY2xhc3MgWWFyckdl bmVyYXRvciBmaW5hbCA6IHB1YmxpYyBZYXJySklUSW5mbywgcHJpdmF0ZSBNYWNyb0Fzc2VtYmxl ciB7CiAgICAgICAgICAgICBzdWIzMihUcnVzdGVkSW1tMzIoMSksIGNvdW50UmVnaXN0ZXIpOwog ICAgICAgICAgICAgYWRkMzIoVHJ1c3RlZEltbTMyKDEpLCBpbmRleCk7CiAKLSNpZmRlZiBKSVRf VU5JQ09ERV9FWFBSRVNTSU9OUworI2lmIEVOQUJMRShZQVJSX0pJVF9VTklDT0RFX0VYUFJFU1NJ T05TKQogICAgICAgICAgICAgSnVtcCBpc0JNUENoYXIgPSBicmFuY2gzMihMZXNzVGhhbiwgY2hh cmFjdGVyLCBzdXBwbGVtZW50YXJ5UGxhbmVzQmFzZSk7CiAgICAgICAgICAgICBhZGQzMihUcnVz dGVkSW1tMzIoMSksIGluZGV4KTsKICAgICAgICAgICAgIGlzQk1QQ2hhci5saW5rKHRoaXMpOwpA QCAtMjAzNiw3ICsyMDM0LDcgQEAgY2xhc3MgWWFyckdlbmVyYXRvciBmaW5hbCA6IHB1YmxpYyBZ YXJySklUSW5mbywgcHJpdmF0ZSBNYWNyb0Fzc2VtYmxlciB7CiAgICAgICAgIG1vdmUoVHJ1c3Rl ZEltbTMyKDApLCBjb3VudFJlZ2lzdGVyKTsKICAgICAgICAgb3AubV9yZWVudHJ5ID0gbGFiZWwo KTsKIAotI2lmZGVmIEpJVF9VTklDT0RFX0VYUFJFU1NJT05TCisjaWYgRU5BQkxFKFlBUlJfSklU X1VOSUNPREVfRVhQUkVTU0lPTlMpCiAgICAgICAgIGlmIChtX2RlY29kZVN1cnJvZ2F0ZVBhaXJz KSB7CiAgICAgICAgICAgICBpZiAoIXRlcm0tPmNoYXJhY3RlckNsYXNzLT5oYXNPbmVDaGFyYWN0 ZXJTaXplKCkgfHwgdGVybS0+aW52ZXJ0KCkpCiAgICAgICAgICAgICAgICAgc3RvcmVUb0ZyYW1l KGluZGV4LCB0ZXJtLT5mcmFtZUxvY2F0aW9uICsgQmFja1RyYWNrSW5mb0NoYXJhY3RlckNsYXNz OjpiZWdpbkluZGV4KCkpOwpAQCAtMjA1OSw3ICsyMDU3LDcgQEAgY2xhc3MgWWFyckdlbmVyYXRv ciBmaW5hbCA6IHB1YmxpYyBZYXJySklUSW5mbywgcHJpdmF0ZSBNYWNyb0Fzc2VtYmxlciB7CiAK ICAgICAgICAgbV9iYWNrdHJhY2tpbmdTdGF0ZS5saW5rKHRoaXMpOwogCi0jaWZkZWYgSklUX1VO SUNPREVfRVhQUkVTU0lPTlMKKyNpZiBFTkFCTEUoWUFSUl9KSVRfVU5JQ09ERV9FWFBSRVNTSU9O UykKICAgICAgICAgaWYgKG1fZGVjb2RlU3Vycm9nYXRlUGFpcnMpIHsKICAgICAgICAgICAgIGlm ICghdGVybS0+Y2hhcmFjdGVyQ2xhc3MtPmhhc09uZUNoYXJhY3RlclNpemUoKSB8fCB0ZXJtLT5p bnZlcnQoKSkKICAgICAgICAgICAgICAgICBsb2FkRnJvbUZyYW1lKHRlcm0tPmZyYW1lTG9jYXRp b24gKyBCYWNrVHJhY2tJbmZvQ2hhcmFjdGVyQ2xhc3M6OmJlZ2luSW5kZXgoKSwgaW5kZXgpOwpA QCAtMjA4Niw3ICsyMDg0LDcgQEAgY2xhc3MgWWFyckdlbmVyYXRvciBmaW5hbCA6IHB1YmxpYyBZ YXJySklUSW5mbywgcHJpdmF0ZSBNYWNyb0Fzc2VtYmxlciB7CiAgICAgICAgICAgICB9CiAgICAg ICAgIH0KIAotI2lmZGVmIEpJVF9VTklDT0RFX0VYUFJFU1NJT05TCisjaWYgRU5BQkxFKFlBUlJf SklUX1VOSUNPREVfRVhQUkVTU0lPTlMpCiAgICAgICAgIGlmIChtX2RlY29kZVN1cnJvZ2F0ZVBh aXJzKQogICAgICAgICAgICAgYWR2YW5jZUluZGV4QWZ0ZXJDaGFyYWN0ZXJDbGFzc1Rlcm1NYXRj aCh0ZXJtLCBub25HcmVlZHlGYWlsdXJlc0RlY3JlbWVudEluZGV4LCBjaGFyYWN0ZXIpOwogICAg ICAgICBlbHNlCkBAIC0zOTMwLDcgKzM5MjgsNyBAQCBjbGFzcyBZYXJyR2VuZXJhdG9yIGZpbmFs IDogcHVibGljIFlhcnJKSVRJbmZvLCBwcml2YXRlIE1hY3JvQXNzZW1ibGVyIHsKIAogICAgIHZv aWQgZ2VuZXJhdGVUcnlSZWFkVW5pY29kZUNoYXJhY3RlckhlbHBlcigpCiAgICAgewotI2lmZGVm IEpJVF9VTklDT0RFX0VYUFJFU1NJT05TCisjaWYgRU5BQkxFKFlBUlJfSklUX1VOSUNPREVfRVhQ UkVTU0lPTlMpCiAgICAgICAgIGlmIChtX3RyeVJlYWRVbmljb2RlQ2hhcmFjdGVyQ2FsbHMuaXNF bXB0eSgpKQogICAgICAgICAgICAgcmV0dXJuOwogCkBAIC00MDc0LDcgKzQwNzIsNyBAQCBjbGFz cyBZYXJyR2VuZXJhdG9yIGZpbmFsIDogcHVibGljIFlhcnJKSVRJbmZvLCBwcml2YXRlIE1hY3Jv QXNzZW1ibGVyIHsKICAgICB7CiAgICAgICAgIFlhcnJDb2RlQmxvY2smIGNvZGVCbG9jayA9IG1f Y29kZUJsb2NrOwogCi0jaWZuZGVmIEpJVF9VTklDT0RFX0VYUFJFU1NJT05TCisjaWYgIUVOQUJM RShZQVJSX0pJVF9VTklDT0RFX0VYUFJFU1NJT05TKQogICAgICAgICBpZiAobV9kZWNvZGVTdXJy b2dhdGVQYWlycykgewogICAgICAgICAgICAgY29kZUJsb2NrLnNldEZhbGxCYWNrV2l0aEZhaWx1 cmVSZWFzb24oSklURmFpbHVyZVJlYXNvbjo6RGVjb2RlU3Vycm9nYXRlUGFpcik7CiAgICAgICAg ICAgICByZXR1cm47CkBAIC00MTQwLDcgKzQxMzgsNyBAQCBjbGFzcyBZYXJyR2VuZXJhdG9yIGZp bmFsIDogcHVibGljIFlhcnJKSVRJbmZvLCBwcml2YXRlIE1hY3JvQXNzZW1ibGVyIHsKICAgICAg ICAgICAgIG1vdmUocmVnVDAsIHN0YWNrUG9pbnRlclJlZ2lzdGVyKTsKICAgICAgICAgfQogCi0j aWZkZWYgSklUX1VOSUNPREVfRVhQUkVTU0lPTlMKKyNpZiBFTkFCTEUoWUFSUl9KSVRfVU5JQ09E RV9FWFBSRVNTSU9OUykKICAgICAgICAgaWYgKG1fZGVjb2RlU3Vycm9nYXRlUGFpcnMpCiAgICAg ICAgICAgICBnZXRFZmZlY3RpdmVBZGRyZXNzKEJhc2VJbmRleChpbnB1dCwgbGVuZ3RoLCBUaW1l c1R3byksIGVuZE9mU3RyaW5nQWRkcmVzcyk7CiAjZW5kaWYKZGlmZiAtLWdpdCBhL1NvdXJjZS9X VEYvd3RmL1BsYXRmb3JtRW5hYmxlLmggYi9Tb3VyY2UvV1RGL3d0Zi9QbGF0Zm9ybUVuYWJsZS5o CmluZGV4IGQ4Njg4ZGNlYjYwOWJlMGU3MTIzZTU0MTk5ZDYyZjMyMWM4YWM4ZTUuLjVjMTRkMTRj MTQ4MmNlZTRjNTQwNTRlZmUxODM2NzhkNTY4N2ZlMTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYv d3RmL1BsYXRmb3JtRW5hYmxlLmgKKysrIGIvU291cmNlL1dURi93dGYvUGxhdGZvcm1FbmFibGUu aApAQCAtNzUxLDYgKzc1MSwxMCBAQAogI2RlZmluZSBFTkFCTEVfWUFSUl9KSVRfQkFDS1JFRkVS RU5DRVMgMQogI2VuZGlmCiAKKyNpZiBDUFUoQVJNNjQpIHx8IENQVShYODZfNjQpCisjZGVmaW5l IEVOQUJMRV9ZQVJSX0pJVF9VTklDT0RFX0VYUFJFU1NJT05TIDEKKyNlbmRpZgorCiAvKiBJZiBl aXRoZXIgdGhlIEpJVCBvciB0aGUgUmVnRXhwIEpJVCBpcyBlbmFibGVkLCB0aGVuIHRoZSBBc3Nl bWJsZXIgbXVzdCBiZQogICAgZW5hYmxlZCBhcyB3ZWxsOiAqLwogI2lmIEVOQUJMRShKSVQpIHx8 IEVOQUJMRShZQVJSX0pJVCkgfHwgIUVOQUJMRShDX0xPT1ApCg==