227786 2021-07-07 18:59:59 -0700 [JSC] Clean up RegExp flag code 2021-07-07 21:49:23 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 ysuzuki ysuzuki ews-watchlist fpizlo keith_miller mark.lam msaboff saam tzagallo webkit-bug-importer oldest_to_newest 1775574 0 ysuzuki 2021-07-07 18:59:59 -0700 [JSC] Clean up RegExp flag code 1775576 1 433108 ysuzuki 2021-07-07 19:02:02 -0700 Created attachment 433108 Patch 1775580 2 433110 ysuzuki 2021-07-07 19:19:45 -0700 Created attachment 433110 Patch 1775604 3 ysuzuki 2021-07-07 21:46:44 -0700 Run JSC tests locally, and succeeded. 1775605 4 ysuzuki 2021-07-07 21:48:37 -0700 Committed r279709 (239501@main): <https://commits.webkit.org/239501@main> 1775606 5 webkit-bug-importer 2021-07-07 21:49:23 -0700 <rdar://problem/80305149> 433108 2021-07-07 19:02:02 -0700 2021-07-07 19:19:43 -0700 Patch bug-227786-20210707190201.patch text/plain 11181 ysuzuki U3VidmVyc2lvbiBSZXZpc2lvbjogMjc5NjkwCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCBm ODFmYmJiZWZiOTE1ODU1MjljZTVhMzRiYWJkMzJlOTNiZTA0NzA4Li42ZDlhYzAzNDMzZjQ1YzU0 NGMwMWRjZmQ2NGE3OTMzNzQ1MzE1NjU3IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyNSBAQAorMjAyMS0wNy0wNyAgWXVzdWtlIFN1enVraSAgPHlzdXp1a2lAYXBwbGUuY29t PgorCisgICAgICAgIFtKU0NdIENsZWFuIHVwIFJlZ0V4cCBmbGFnIGNvZGUKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyNzc4NgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEkgZm91bmQgYSBidWcgaW4gcmVn ZXhwVG9Tb3VyY2VTdHJpbmcgKHVzZWQgZm9yIFJlZ0V4cCdzIGR1bXAgY29kZSksIGFuZCBpdCBt b3RpdmF0ZXMgbWUgdG8gY2xlYW4gdXAKKyAgICAgICAgYWxsIFJlZ0V4cCBmbGFnIGhhbmRsaW5n IGNvZGUuIFdlIGRlZmluZSBSZWdFeHAgZmxhZ3MgYXMgYSBtYWNybyBhbmQgdXBkYXRpbmcgdGhh dCBtYWNybyB1cGRhdGVzIGFsbAorICAgICAgICBSZWdFeHAgZmxhZyBoYW5kbGluZyBjb2RlIHRv by4KKworICAgICAgICAqIHJ1bnRpbWUvUmVnRXhwLmNwcDoKKyAgICAgICAgKEpTQzo6UmVnRXhw RnVuY3Rpb25hbFRlc3RDb2xsZWN0b3I6Om91dHB1dE9uZVRlc3QpOgorICAgICAgICAoSlNDOjpy ZWdleHBUb1NvdXJjZVN0cmluZyk6CisgICAgICAgICogcnVudGltZS9SZWdFeHAuaDoKKyAgICAg ICAgKiBydW50aW1lL1JlZ0V4cFByb3RvdHlwZS5jcHA6CisgICAgICAgIChKU0M6OmZsYWdzU3Ry aW5nKToKKyAgICAgICAgKiB5YXJyL1lhcnJGbGFncy5jcHA6CisgICAgICAgIChKU0M6OllhcnI6 OnBhcnNlRmxhZ3MpOgorICAgICAgICAoSlNDOjpZYXJyOjpmbGFnc1N0cmluZyk6CisgICAgICAg ICogeWFyci9ZYXJyRmxhZ3MuaDoKKwogMjAyMS0wNy0wNyAgWXVzdWtlIFN1enVraSAgPHlzdXp1 a2lAYXBwbGUuY29tPgogCiAgICAgICAgIFtKU0NdIEZpeCBPYmplY3QuYXNzaWduIGZhc3QgcGF0 aCB0byBhY2NlcHQgdW5kZWZpbmVkL251bGwKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0 Q29yZS9ydW50aW1lL1JlZ0V4cC5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9S ZWdFeHAuY3BwCmluZGV4IGVlNTlhOGMwY2RjNWQ4ZDVjODRiYjU1NjU5ODAwZjkwYTRlNDc3ZDcu LjhjMzgyZDQzNjk5ZGE1MjgxZjIzZTBlZWUzMTVlYjUyODVlMzBlN2EgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL1JlZ0V4cC5jcHAKKysrIGIvU291cmNlL0phdmFT Y3JpcHRDb3JlL3J1bnRpbWUvUmVnRXhwLmNwcApAQCAtNTEsMjEgKzUxLDcgQEAgdm9pZCBSZWdF eHBGdW5jdGlvbmFsVGVzdENvbGxlY3Rvcjo6b3V0cHV0T25lVGVzdChSZWdFeHAqIHJlZ0V4cCwg Y29uc3QgU3RyaW5nJgogICAgICAgICBmcHV0YygnLycsIG1fZmlsZSk7CiAgICAgICAgIG91dHB1 dEVzY2FwZWRTdHJpbmcocmVnRXhwLT5wYXR0ZXJuKCksIHRydWUpOwogICAgICAgICBmcHV0Yygn LycsIG1fZmlsZSk7Ci0gICAgICAgIGlmIChyZWdFeHAtPmdsb2JhbCgpKQotICAgICAgICAgICAg ZnB1dGMoJ2cnLCBtX2ZpbGUpOwotICAgICAgICBpZiAocmVnRXhwLT5pZ25vcmVDYXNlKCkpCi0g ICAgICAgICAgICBmcHV0YygnaScsIG1fZmlsZSk7Ci0gICAgICAgIGlmIChyZWdFeHAtPmhhc0lu ZGljZXMoKSkKLSAgICAgICAgICAgIGZwdXRjKCdkJywgbV9maWxlKTsKLSAgICAgICAgaWYgKHJl Z0V4cC0+bXVsdGlsaW5lKCkpCi0gICAgICAgICAgICBmcHV0YygnbScsIG1fZmlsZSk7Ci0gICAg ICAgIGlmIChyZWdFeHAtPmRvdEFsbCgpKQotICAgICAgICAgICAgZnB1dGMoJ3MnLCBtX2ZpbGUp OwotICAgICAgICBpZiAocmVnRXhwLT51bmljb2RlKCkpCi0gICAgICAgICAgICBmcHV0YygndScs IG1fZmlsZSk7Ci0gICAgICAgIGlmIChyZWdFeHAtPnN0aWNreSgpKQotICAgICAgICAgICAgZnB1 dGMoJ3knLCBtX2ZpbGUpOwotICAgICAgICBmcHJpbnRmKG1fZmlsZSwgIlxuIik7CisgICAgICAg IGZwcmludGYobV9maWxlLCAiJXNcbiIsIFlhcnI6OmZsYWdzU3RyaW5nKHJlZ0V4cC0+ZmxhZ3Mo KSkuZGF0YSgpKTsKICAgICB9CiAKICAgICBmcHJpbnRmKG1fZmlsZSwgIiBcIiIpOwpAQCAtNDg0 LDI0ICs0NzAsNyBAQCB2b2lkIFJlZ0V4cDo6bWF0Y2hDb21wYXJlV2l0aEludGVycHJldGVyKGNv bnN0IFN0cmluZyYgcywgaW50IHN0YXJ0T2Zmc2V0LCBpbnQqCiAKIHN0YXRpYyBDU3RyaW5nIHJl Z2V4cFRvU291cmNlU3RyaW5nKGNvbnN0IFJlZ0V4cCogcmVnRXhwKQogewotICAgIGNoYXIgcG9z dGZpeFs3XSA9IHsgJy8nLCAwLCAwLCAwLCAwLCAwLCAwIH07Ci0gICAgaW50IGluZGV4ID0gMTsK LSAgICBpZiAocmVnRXhwLT5nbG9iYWwoKSkKLSAgICAgICAgcG9zdGZpeFtpbmRleCsrXSA9ICdn JzsKLSAgICBpZiAocmVnRXhwLT5pZ25vcmVDYXNlKCkpCi0gICAgICAgIHBvc3RmaXhbaW5kZXgr K10gPSAnaSc7Ci0gICAgaWYgKHJlZ0V4cC0+aGFzSW5kaWNlcygpKQotICAgICAgICBwb3N0Zml4 W2luZGV4XSA9ICdkJzsKLSAgICBpZiAocmVnRXhwLT5tdWx0aWxpbmUoKSkKLSAgICAgICAgcG9z dGZpeFtpbmRleF0gPSAnbSc7Ci0gICAgaWYgKHJlZ0V4cC0+ZG90QWxsKCkpCi0gICAgICAgIHBv c3RmaXhbaW5kZXgrK10gPSAncyc7Ci0gICAgaWYgKHJlZ0V4cC0+dW5pY29kZSgpKQotICAgICAg ICBwb3N0Zml4W2luZGV4KytdID0gJ3UnOwotICAgIGlmIChyZWdFeHAtPnN0aWNreSgpKQotICAg ICAgICBwb3N0Zml4W2luZGV4KytdID0gJ3knOwotCi0gICAgcmV0dXJuIHRvQ1N0cmluZygiLyIs IHJlZ0V4cC0+cGF0dGVybigpLmltcGwoKSwgcG9zdGZpeCk7CisgICAgcmV0dXJuIHRvQ1N0cmlu ZygiLyIsIHJlZ0V4cC0+cGF0dGVybigpLmltcGwoKSwgIi8iLCBZYXJyOjpmbGFnc1N0cmluZyhy ZWdFeHAtPmZsYWdzKCkpLmRhdGEoKSk7CiB9CiAKIHZvaWQgUmVnRXhwOjpkdW1wVG9TdHJlYW0o Y29uc3QgSlNDZWxsKiBjZWxsLCBQcmludFN0cmVhbSYgb3V0KQpkaWZmIC0tZ2l0IGEvU291cmNl L0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvUmVnRXhwLmggYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUv cnVudGltZS9SZWdFeHAuaAppbmRleCA2MGQzNzIwYTcyMTk0MWFmNDAzNDMyNDc0NTMxYmExZDA2 YjBkM2MxLi45ZjUzMmUxMTdlMTAwNTBiNWIxZWI3MjNmMDM4NmJjYTgzODU5ZTJiIDEwMDY0NAot LS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9SZWdFeHAuaAorKysgYi9Tb3VyY2Uv SmF2YVNjcmlwdENvcmUvcnVudGltZS9SZWdFeHAuaApAQCAtNTcsNiArNTcsNyBAQCBjbGFzcyBS ZWdFeHAgZmluYWwgOiBwdWJsaWMgSlNDZWxsIHsKICAgICBzdGF0aWMgc2l6ZV90IGVzdGltYXRl ZFNpemUoSlNDZWxsKiwgVk0mKTsKICAgICBKU19FWFBPUlRfUFJJVkFURSBzdGF0aWMgdm9pZCBk dW1wVG9TdHJlYW0oY29uc3QgSlNDZWxsKiwgUHJpbnRTdHJlYW0mKTsKIAorICAgIE9wdGlvblNl dDxZYXJyOjpGbGFncz4gZmxhZ3MoKSBjb25zdCB7IHJldHVybiBtX2ZsYWdzOyB9CiAgICAgYm9v bCBnbG9iYWwoKSBjb25zdCB7IHJldHVybiBtX2ZsYWdzLmNvbnRhaW5zKFlhcnI6OkZsYWdzOjpH bG9iYWwpOyB9CiAgICAgYm9vbCBpZ25vcmVDYXNlKCkgY29uc3QgeyByZXR1cm4gbV9mbGFncy5j b250YWlucyhZYXJyOjpGbGFnczo6SWdub3JlQ2FzZSk7IH0KICAgICBib29sIG11bHRpbGluZSgp IGNvbnN0IHsgcmV0dXJuIG1fZmxhZ3MuY29udGFpbnMoWWFycjo6RmxhZ3M6Ok11bHRpbGluZSk7 IH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL1JlZ0V4cFByb3Rv dHlwZS5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9SZWdFeHBQcm90b3R5cGUu Y3BwCmluZGV4IGUwMDJjNjQ2YjgwNmVjZGRiY2VkYTkwZTAwY2Y2OGY3NjgxMzgxMDYuLmViZjVm MDZjN2RjN2JkNTA3MGNlYzYyZGE0OGM1M2Y5NzZlZGI4Y2QgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9K YXZhU2NyaXB0Q29yZS9ydW50aW1lL1JlZ0V4cFByb3RvdHlwZS5jcHAKKysrIGIvU291cmNlL0ph dmFTY3JpcHRDb3JlL3J1bnRpbWUvUmVnRXhwUHJvdG90eXBlLmNwcApAQCAtMTYyLDQ5ICsxNjIs MjQgQEAgSlNDX0RFRklORV9IT1NUX0ZVTkNUSU9OKHJlZ0V4cFByb3RvRnVuY0NvbXBpbGUsIChK U0dsb2JhbE9iamVjdCogZ2xvYmFsT2JqZWN0LAogICAgIHJldHVybiBKU1ZhbHVlOjplbmNvZGUo dGhpc1JlZ0V4cCk7CiB9CiAKLXR5cGVkZWYgc3RkOjphcnJheTxjaGFyLCA3ICsgMT4gRmxhZ3NT dHJpbmc7IC8vIDYgZGlmZmVyZW50IGZsYWdzIGFuZCBhIG51bGwgY2hhcmFjdGVyIHRlcm1pbmF0 b3IuCi0KLXN0YXRpYyBpbmxpbmUgRmxhZ3NTdHJpbmcgZmxhZ3NTdHJpbmcoSlNHbG9iYWxPYmpl Y3QqIGdsb2JhbE9iamVjdCwgSlNPYmplY3QqIHJlZ2V4cCkKK3N0YXRpYyBpbmxpbmUgWWFycjo6 RmxhZ3NTdHJpbmcgZmxhZ3NTdHJpbmcoSlNHbG9iYWxPYmplY3QqIGdsb2JhbE9iamVjdCwgSlNP YmplY3QqIHJlZ2V4cCkKIHsKLSAgICBGbGFnc1N0cmluZyBzdHJpbmc7Ci0gICAgc3RyaW5nWzBd ID0gMDsKLQogICAgIFZNJiB2bSA9IGdsb2JhbE9iamVjdC0+dm0oKTsKICAgICBhdXRvIHNjb3Bl ID0gREVDTEFSRV9USFJPV19TQ09QRSh2bSk7CiAKLSAgICBKU1ZhbHVlIGluZGljZXNWYWx1ZSA9 IHJlZ2V4cC0+Z2V0KGdsb2JhbE9iamVjdCwgdm0ucHJvcGVydHlOYW1lcy0+aGFzSW5kaWNlcyk7 Ci0gICAgUkVUVVJOX0lGX0VYQ0VQVElPTihzY29wZSwgc3RyaW5nKTsKLSAgICBKU1ZhbHVlIGds b2JhbFZhbHVlID0gcmVnZXhwLT5nZXQoZ2xvYmFsT2JqZWN0LCB2bS5wcm9wZXJ0eU5hbWVzLT5n bG9iYWwpOwotICAgIFJFVFVSTl9JRl9FWENFUFRJT04oc2NvcGUsIHN0cmluZyk7Ci0gICAgSlNW YWx1ZSBpZ25vcmVDYXNlVmFsdWUgPSByZWdleHAtPmdldChnbG9iYWxPYmplY3QsIHZtLnByb3Bl cnR5TmFtZXMtPmlnbm9yZUNhc2UpOwotICAgIFJFVFVSTl9JRl9FWENFUFRJT04oc2NvcGUsIHN0 cmluZyk7Ci0gICAgSlNWYWx1ZSBtdWx0aWxpbmVWYWx1ZSA9IHJlZ2V4cC0+Z2V0KGdsb2JhbE9i amVjdCwgdm0ucHJvcGVydHlOYW1lcy0+bXVsdGlsaW5lKTsKLSAgICBSRVRVUk5fSUZfRVhDRVBU SU9OKHNjb3BlLCBzdHJpbmcpOwotICAgIEpTVmFsdWUgZG90QWxsVmFsdWUgPSByZWdleHAtPmdl dChnbG9iYWxPYmplY3QsIHZtLnByb3BlcnR5TmFtZXMtPmRvdEFsbCk7Ci0gICAgUkVUVVJOX0lG X0VYQ0VQVElPTihzY29wZSwgc3RyaW5nKTsKLSAgICBKU1ZhbHVlIHVuaWNvZGVWYWx1ZSA9IHJl Z2V4cC0+Z2V0KGdsb2JhbE9iamVjdCwgdm0ucHJvcGVydHlOYW1lcy0+dW5pY29kZSk7Ci0gICAg UkVUVVJOX0lGX0VYQ0VQVElPTihzY29wZSwgc3RyaW5nKTsKLSAgICBKU1ZhbHVlIHN0aWNreVZh bHVlID0gcmVnZXhwLT5nZXQoZ2xvYmFsT2JqZWN0LCB2bS5wcm9wZXJ0eU5hbWVzLT5zdGlja3kp OwotICAgIFJFVFVSTl9JRl9FWENFUFRJT04oc2NvcGUsIHN0cmluZyk7Ci0KLSAgICB1bnNpZ25l ZCBpbmRleCA9IDA7Ci0gICAgaWYgKGluZGljZXNWYWx1ZS50b0Jvb2xlYW4oZ2xvYmFsT2JqZWN0 KSkKLSAgICAgICAgc3RyaW5nW2luZGV4KytdID0gJ2QnOwotICAgIGlmIChnbG9iYWxWYWx1ZS50 b0Jvb2xlYW4oZ2xvYmFsT2JqZWN0KSkKLSAgICAgICAgc3RyaW5nW2luZGV4KytdID0gJ2cnOwot ICAgIGlmIChpZ25vcmVDYXNlVmFsdWUudG9Cb29sZWFuKGdsb2JhbE9iamVjdCkpCi0gICAgICAg IHN0cmluZ1tpbmRleCsrXSA9ICdpJzsKLSAgICBpZiAobXVsdGlsaW5lVmFsdWUudG9Cb29sZWFu KGdsb2JhbE9iamVjdCkpCi0gICAgICAgIHN0cmluZ1tpbmRleCsrXSA9ICdtJzsKLSAgICBpZiAo ZG90QWxsVmFsdWUudG9Cb29sZWFuKGdsb2JhbE9iamVjdCkpCi0gICAgICAgIHN0cmluZ1tpbmRl eCsrXSA9ICdzJzsKLSAgICBpZiAodW5pY29kZVZhbHVlLnRvQm9vbGVhbihnbG9iYWxPYmplY3Qp KQotICAgICAgICBzdHJpbmdbaW5kZXgrK10gPSAndSc7Ci0gICAgaWYgKHN0aWNreVZhbHVlLnRv Qm9vbGVhbihnbG9iYWxPYmplY3QpKQotICAgICAgICBzdHJpbmdbaW5kZXgrK10gPSAneSc7Ci0g ICAgQVNTRVJUKGluZGV4IDwgc3RyaW5nLnNpemUoKSk7Ci0gICAgc3RyaW5nW2luZGV4XSA9IDA7 Ci0gICAgcmV0dXJuIHN0cmluZzsKKyAgICBPcHRpb25TZXQ8WWFycjo6RmxhZ3M+IGZsYWdzOwor CisjZGVmaW5lIEpTQ19SRVRSSUVWRV9SRUdFWFBfRkxBRyhrZXksIG5hbWUsIGxvd2VyQ2FzZU5h bWUsIGluZGV4KSBcCisgICAgSlNWYWx1ZSBsb3dlckNhc2VOYW1lIyNWYWx1ZSA9IHJlZ2V4cC0+ Z2V0KGdsb2JhbE9iamVjdCwgdm0ucHJvcGVydHlOYW1lcy0+bG93ZXJDYXNlTmFtZSk7IFwKKyAg ICBSRVRVUk5fSUZfRVhDRVBUSU9OKHNjb3BlLCB7IH0pOyBcCisgICAgaWYgKGxvd2VyQ2FzZU5h bWUjI1ZhbHVlLnRvQm9vbGVhbihnbG9iYWxPYmplY3QpKSBcCisgICAgICAgIGZsYWdzLmFkZChZ YXJyOjpGbGFnczo6bmFtZSk7CisKKyAgICBKU0NfUkVHRVhQX0ZMQUdTKEpTQ19SRVRSSUVWRV9S RUdFWFBfRkxBRykKKworI3VuZGVmIEpTQ19SRVRSSUVWRV9SRUdFWFBfRkxBRworCisgICAgcmV0 dXJuIFlhcnI6OmZsYWdzU3RyaW5nKGZsYWdzKTsKIH0KIAogSlNDX0RFRklORV9IT1NUX0ZVTkNU SU9OKHJlZ0V4cFByb3RvRnVuY1RvU3RyaW5nLCAoSlNHbG9iYWxPYmplY3QqIGdsb2JhbE9iamVj dCwgQ2FsbEZyYW1lKiBjYWxsRnJhbWUpKQpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRD b3JlL3lhcnIvWWFyckZsYWdzLmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS95YXJyL1lhcnJG bGFncy5jcHAKaW5kZXggNWMxNmIyYWYxM2IwZDE5ZTFkNDljOWZlZjMzYjA0NWJlNmZhYWM4OS4u ZGFjZmI5NjU0MjcyMGI3MTc0M2ExMGNhYjEzZTVmMzc2ZWRjN2IxNCAxMDA2NDQKLS0tIGEvU291 cmNlL0phdmFTY3JpcHRDb3JlL3lhcnIvWWFyckZsYWdzLmNwcAorKysgYi9Tb3VyY2UvSmF2YVNj cmlwdENvcmUveWFyci9ZYXJyRmxhZ3MuY3BwCkBAIC0zNiw0NyArMzYsMTYgQEAgc3RkOjpvcHRp b25hbDxPcHRpb25TZXQ8RmxhZ3M+PiBwYXJzZUZsYWdzKFN0cmluZ1ZpZXcgc3RyaW5nKQogICAg IE9wdGlvblNldDxGbGFncz4gZmxhZ3M7CiAgICAgZm9yIChhdXRvIGNoYXJhY3RlciA6IHN0cmlu Zy5jb2RlVW5pdHMoKSkgewogICAgICAgICBzd2l0Y2ggKGNoYXJhY3RlcikgewotICAgICAgICBj YXNlICdkJzoKLSAgICAgICAgICAgIGlmIChmbGFncy5jb250YWlucyhGbGFnczo6SGFzSW5kaWNl cykpCi0gICAgICAgICAgICAgICAgcmV0dXJuIHN0ZDo6bnVsbG9wdDsKLSAgICAgICAgICAgIGZs YWdzLmFkZChGbGFnczo6SGFzSW5kaWNlcyk7CisjZGVmaW5lIEpTQ19IQU5ETEVfUkVHRVhQX0ZM QUcoa2V5LCBuYW1lLCBsb3dlckNhc2VOYW1lLCBfKSBcCisgICAgICAgIGNhc2Uga2V5OiBcCisg ICAgICAgICAgICBpZiAoZmxhZ3MuY29udGFpbnMoRmxhZ3M6Om5hbWUpKSBcCisgICAgICAgICAg ICAgICAgcmV0dXJuIHN0ZDo6bnVsbG9wdDsgXAorICAgICAgICAgICAgZmxhZ3MuYWRkKEZsYWdz OjpuYW1lKTsgXAogICAgICAgICAgICAgYnJlYWs7CiAKLSAgICAgICAgY2FzZSAnZyc6Ci0gICAg ICAgICAgICBpZiAoZmxhZ3MuY29udGFpbnMoRmxhZ3M6Okdsb2JhbCkpCi0gICAgICAgICAgICAg ICAgcmV0dXJuIHN0ZDo6bnVsbG9wdDsKLSAgICAgICAgICAgIGZsYWdzLmFkZChGbGFnczo6R2xv YmFsKTsKLSAgICAgICAgICAgIGJyZWFrOwotCi0gICAgICAgIGNhc2UgJ2knOgotICAgICAgICAg ICAgaWYgKGZsYWdzLmNvbnRhaW5zKEZsYWdzOjpJZ25vcmVDYXNlKSkKLSAgICAgICAgICAgICAg ICByZXR1cm4gc3RkOjpudWxsb3B0OwotICAgICAgICAgICAgZmxhZ3MuYWRkKEZsYWdzOjpJZ25v cmVDYXNlKTsKLSAgICAgICAgICAgIGJyZWFrOwotCi0gICAgICAgIGNhc2UgJ20nOgotICAgICAg ICAgICAgaWYgKGZsYWdzLmNvbnRhaW5zKEZsYWdzOjpNdWx0aWxpbmUpKQotICAgICAgICAgICAg ICAgIHJldHVybiBzdGQ6Om51bGxvcHQ7Ci0gICAgICAgICAgICBmbGFncy5hZGQoRmxhZ3M6Ok11 bHRpbGluZSk7Ci0gICAgICAgICAgICBicmVhazsKKyAgICAgICAgSlNDX1JFR0VYUF9GTEFHUyhK U0NfSEFORExFX1JFR0VYUF9GTEFHKQogCi0gICAgICAgIGNhc2UgJ3MnOgotICAgICAgICAgICAg aWYgKGZsYWdzLmNvbnRhaW5zKEZsYWdzOjpEb3RBbGwpKQotICAgICAgICAgICAgICAgIHJldHVy biBzdGQ6Om51bGxvcHQ7Ci0gICAgICAgICAgICBmbGFncy5hZGQoRmxhZ3M6OkRvdEFsbCk7Ci0g ICAgICAgICAgICBicmVhazsKLSAgICAgICAgICAgIAotICAgICAgICBjYXNlICd1JzoKLSAgICAg ICAgICAgIGlmIChmbGFncy5jb250YWlucyhGbGFnczo6VW5pY29kZSkpCi0gICAgICAgICAgICAg ICAgcmV0dXJuIHN0ZDo6bnVsbG9wdDsKLSAgICAgICAgICAgIGZsYWdzLmFkZChGbGFnczo6VW5p Y29kZSk7Ci0gICAgICAgICAgICBicmVhazsKLSAgICAgICAgICAgICAgICAKLSAgICAgICAgY2Fz ZSAneSc6Ci0gICAgICAgICAgICBpZiAoZmxhZ3MuY29udGFpbnMoRmxhZ3M6OlN0aWNreSkpCi0g ICAgICAgICAgICAgICAgcmV0dXJuIHN0ZDo6bnVsbG9wdDsKLSAgICAgICAgICAgIGZsYWdzLmFk ZChGbGFnczo6U3RpY2t5KTsKLSAgICAgICAgICAgIGJyZWFrOworI3VuZGVmIEpTQ19IQU5ETEVf UkVHRVhQX0ZMQUcKIAogICAgICAgICBkZWZhdWx0OgogICAgICAgICAgICAgcmV0dXJuIHN0ZDo6 bnVsbG9wdDsKQEAgLTg2LDQgKzU1LDI0IEBAIHN0ZDo6b3B0aW9uYWw8T3B0aW9uU2V0PEZsYWdz Pj4gcGFyc2VGbGFncyhTdHJpbmdWaWV3IHN0cmluZykKICAgICByZXR1cm4gc3RkOjptYWtlX29w dGlvbmFsKGZsYWdzKTsKIH0KIAorRmxhZ3NTdHJpbmcgZmxhZ3NTdHJpbmcoT3B0aW9uU2V0PEZs YWdzPiBmbGFncykKK3sKKyAgICBGbGFnc1N0cmluZyBzdHJpbmc7CisgICAgdW5zaWduZWQgaW5k ZXggPSAwOworCisjZGVmaW5lIEpTQ19XUklURV9SRUdFWFBfRkxBRyhrZXksIG5hbWUsIGxvd2Vy Q2FzZU5hbWUsIF8pIFwKKyAgICBkbyB7IFwKKyAgICAgICAgaWYgKGZsYWdzLmNvbnRhaW5zKEZs YWdzOjpuYW1lKSkgXAorICAgICAgICAgICAgc3RyaW5nW2luZGV4KytdID0ga2V5OyBcCisgICAg fSB3aGlsZSAoMCk7CisKKyAgICBKU0NfUkVHRVhQX0ZMQUdTKEpTQ19XUklURV9SRUdFWFBfRkxB RykKKworI3VuZGVmIEpTQ19XUklURV9SRUdFWFBfRkxBRworCisgICAgQVNTRVJUKGluZGV4IDwg c3RyaW5nLnNpemUoKSk7CisgICAgc3RyaW5nW2luZGV4XSA9IDA7CisgICAgcmV0dXJuIHN0cmlu ZzsKK30KKwogfSB9IC8vIG5hbWVzcGFjZSBKU0M6OllhcnIKZGlmZiAtLWdpdCBhL1NvdXJjZS9K YXZhU2NyaXB0Q29yZS95YXJyL1lhcnJGbGFncy5oIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3lh cnIvWWFyckZsYWdzLmgKaW5kZXggZWM4MDU1ZmNiMTY5OWYyZDQwYTk2YmM5NWNmY2ViOTQ1YTEx YjExNS4uMzI5Njc2MDQ3MGRlM2QwMWQ3ZWY4ZjM0YWRlYTdmMmM0N2ZkZmUyMCAxMDA2NDQKLS0t IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3lhcnIvWWFyckZsYWdzLmgKKysrIGIvU291cmNlL0ph dmFTY3JpcHRDb3JlL3lhcnIvWWFyckZsYWdzLmgKQEAgLTMwLDE3ICszMCwyOSBAQAogCiBuYW1l c3BhY2UgSlNDIHsgbmFtZXNwYWNlIFlhcnIgewogCisvLyBGbGFncyBtdXN0IGJlIG9yZGVyZWQg aW4gYWxwaGFiZXQgb3JkZXJpbmcuCisjZGVmaW5lIEpTQ19SRUdFWFBfRkxBR1MobWFjcm8pIFwK KyAgICBtYWNybygnZCcsIEhhc0luZGljZXMsIGhhc0luZGljZXMsIDApIFwKKyAgICBtYWNybygn ZycsIEdsb2JhbCwgZ2xvYmFsLCAxKSBcCisgICAgbWFjcm8oJ2knLCBJZ25vcmVDYXNlLCBpZ25v cmVDYXNlLCAyKSBcCisgICAgbWFjcm8oJ20nLCBNdWx0aWxpbmUsIG11bHRpbGluZSwgMykgXAor ICAgIG1hY3JvKCdzJywgRG90QWxsLCBkb3RBbGwsIDQpIFwKKyAgICBtYWNybygndScsIFVuaWNv ZGUsIHVuaWNvZGUsIDUpIFwKKyAgICBtYWNybygneScsIFN0aWNreSwgc3RpY2t5LCA2KSBcCisK KyNkZWZpbmUgSlNDX0NPVU5UX1JFR0VYUF9GTEFHKGtleSwgbmFtZSwgbG93ZXJDYXNlTmFtZSwg aW5kZXgpICsgMQorc3RhdGljIGNvbnN0ZXhwciB1bnNpZ25lZCBudW1iZXJPZkZsYWdzID0gMCBK U0NfUkVHRVhQX0ZMQUdTKEpTQ19DT1VOVF9SRUdFWFBfRkxBRyk7CisjdW5kZWYgSlNDX0NPVU5U X1JFR0VYUF9GTEFHCisKIGVudW0gY2xhc3MgRmxhZ3MgOiB1aW50OF90IHsKLSAgICBHbG9iYWwg PSAxIDw8IDAsCi0gICAgSWdub3JlQ2FzZSA9IDEgPDwgMSwKLSAgICBNdWx0aWxpbmUgPSAxIDw8 IDIsCi0gICAgU3RpY2t5ID0gMSA8PCAzLAotICAgIFVuaWNvZGUgPSAxIDw8IDQsCi0gICAgRG90 QWxsID0gMSA8PCA1LAotICAgIEhhc0luZGljZXMgPSAxIDw8IDYsCi0gICAgRGVsZXRlZFZhbHVl ID0gMSA8PCA3CisjZGVmaW5lIEpTQ19ERUZJTkVfUkVHRVhQX0ZMQUcoa2V5LCBuYW1lLCBsb3dl ckNhc2VOYW1lLCBpbmRleCkgbmFtZSA9IDEgPDwgaW5kZXgsCisgICAgSlNDX1JFR0VYUF9GTEFH UyhKU0NfREVGSU5FX1JFR0VYUF9GTEFHKQorI3VuZGVmIEpTQ19ERUZJTkVfUkVHRVhQX0ZMQUcK KyAgICBEZWxldGVkVmFsdWUgPSAxIDw8IG51bWJlck9mRmxhZ3MsCiB9OwogCiBKU19FWFBPUlRf UFJJVkFURSBzdGQ6Om9wdGlvbmFsPE9wdGlvblNldDxGbGFncz4+IHBhcnNlRmxhZ3MoU3RyaW5n Vmlldyk7Cit1c2luZyBGbGFnc1N0cmluZyA9IHN0ZDo6YXJyYXk8Y2hhciwgWWFycjo6bnVtYmVy T2ZGbGFncyArIDE+OyAvLyBudW1iZXJPZkZsYWdzICsgbnVsbC10ZXJtaW5hdG9yCitGbGFnc1N0 cmluZyBmbGFnc1N0cmluZyhPcHRpb25TZXQ8RmxhZ3M+KTsKIAogfSB9IC8vIG5hbWVzcGFjZSBK U0M6OllhcnIK 433110 2021-07-07 19:19:45 -0700 2021-07-07 19:29:59 -0700 Patch bug-227786-20210707191944.patch text/plain 11870 ysuzuki U3VidmVyc2lvbiBSZXZpc2lvbjogMjc5NzA1CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCBm ODFmYmJiZWZiOTE1ODU1MjljZTVhMzRiYWJkMzJlOTNiZTA0NzA4Li42ZDlhYzAzNDMzZjQ1YzU0 NGMwMWRjZmQ2NGE3OTMzNzQ1MzE1NjU3IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyNSBAQAorMjAyMS0wNy0wNyAgWXVzdWtlIFN1enVraSAgPHlzdXp1a2lAYXBwbGUuY29t PgorCisgICAgICAgIFtKU0NdIENsZWFuIHVwIFJlZ0V4cCBmbGFnIGNvZGUKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyNzc4NgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEkgZm91bmQgYSBidWcgaW4gcmVn ZXhwVG9Tb3VyY2VTdHJpbmcgKHVzZWQgZm9yIFJlZ0V4cCdzIGR1bXAgY29kZSksIGFuZCBpdCBt b3RpdmF0ZXMgbWUgdG8gY2xlYW4gdXAKKyAgICAgICAgYWxsIFJlZ0V4cCBmbGFnIGhhbmRsaW5n IGNvZGUuIFdlIGRlZmluZSBSZWdFeHAgZmxhZ3MgYXMgYSBtYWNybyBhbmQgdXBkYXRpbmcgdGhh dCBtYWNybyB1cGRhdGVzIGFsbAorICAgICAgICBSZWdFeHAgZmxhZyBoYW5kbGluZyBjb2RlIHRv by4KKworICAgICAgICAqIHJ1bnRpbWUvUmVnRXhwLmNwcDoKKyAgICAgICAgKEpTQzo6UmVnRXhw RnVuY3Rpb25hbFRlc3RDb2xsZWN0b3I6Om91dHB1dE9uZVRlc3QpOgorICAgICAgICAoSlNDOjpy ZWdleHBUb1NvdXJjZVN0cmluZyk6CisgICAgICAgICogcnVudGltZS9SZWdFeHAuaDoKKyAgICAg ICAgKiBydW50aW1lL1JlZ0V4cFByb3RvdHlwZS5jcHA6CisgICAgICAgIChKU0M6OmZsYWdzU3Ry aW5nKToKKyAgICAgICAgKiB5YXJyL1lhcnJGbGFncy5jcHA6CisgICAgICAgIChKU0M6OllhcnI6 OnBhcnNlRmxhZ3MpOgorICAgICAgICAoSlNDOjpZYXJyOjpmbGFnc1N0cmluZyk6CisgICAgICAg ICogeWFyci9ZYXJyRmxhZ3MuaDoKKwogMjAyMS0wNy0wNyAgWXVzdWtlIFN1enVraSAgPHlzdXp1 a2lAYXBwbGUuY29tPgogCiAgICAgICAgIFtKU0NdIEZpeCBPYmplY3QuYXNzaWduIGZhc3QgcGF0 aCB0byBhY2NlcHQgdW5kZWZpbmVkL251bGwKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0 Q29yZS9ydW50aW1lL1JlZ0V4cC5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9S ZWdFeHAuY3BwCmluZGV4IGVlNTlhOGMwY2RjNWQ4ZDVjODRiYjU1NjU5ODAwZjkwYTRlNDc3ZDcu LjhjMzgyZDQzNjk5ZGE1MjgxZjIzZTBlZWUzMTVlYjUyODVlMzBlN2EgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL1JlZ0V4cC5jcHAKKysrIGIvU291cmNlL0phdmFT Y3JpcHRDb3JlL3J1bnRpbWUvUmVnRXhwLmNwcApAQCAtNTEsMjEgKzUxLDcgQEAgdm9pZCBSZWdF eHBGdW5jdGlvbmFsVGVzdENvbGxlY3Rvcjo6b3V0cHV0T25lVGVzdChSZWdFeHAqIHJlZ0V4cCwg Y29uc3QgU3RyaW5nJgogICAgICAgICBmcHV0YygnLycsIG1fZmlsZSk7CiAgICAgICAgIG91dHB1 dEVzY2FwZWRTdHJpbmcocmVnRXhwLT5wYXR0ZXJuKCksIHRydWUpOwogICAgICAgICBmcHV0Yygn LycsIG1fZmlsZSk7Ci0gICAgICAgIGlmIChyZWdFeHAtPmdsb2JhbCgpKQotICAgICAgICAgICAg ZnB1dGMoJ2cnLCBtX2ZpbGUpOwotICAgICAgICBpZiAocmVnRXhwLT5pZ25vcmVDYXNlKCkpCi0g ICAgICAgICAgICBmcHV0YygnaScsIG1fZmlsZSk7Ci0gICAgICAgIGlmIChyZWdFeHAtPmhhc0lu ZGljZXMoKSkKLSAgICAgICAgICAgIGZwdXRjKCdkJywgbV9maWxlKTsKLSAgICAgICAgaWYgKHJl Z0V4cC0+bXVsdGlsaW5lKCkpCi0gICAgICAgICAgICBmcHV0YygnbScsIG1fZmlsZSk7Ci0gICAg ICAgIGlmIChyZWdFeHAtPmRvdEFsbCgpKQotICAgICAgICAgICAgZnB1dGMoJ3MnLCBtX2ZpbGUp OwotICAgICAgICBpZiAocmVnRXhwLT51bmljb2RlKCkpCi0gICAgICAgICAgICBmcHV0YygndScs IG1fZmlsZSk7Ci0gICAgICAgIGlmIChyZWdFeHAtPnN0aWNreSgpKQotICAgICAgICAgICAgZnB1 dGMoJ3knLCBtX2ZpbGUpOwotICAgICAgICBmcHJpbnRmKG1fZmlsZSwgIlxuIik7CisgICAgICAg IGZwcmludGYobV9maWxlLCAiJXNcbiIsIFlhcnI6OmZsYWdzU3RyaW5nKHJlZ0V4cC0+ZmxhZ3Mo KSkuZGF0YSgpKTsKICAgICB9CiAKICAgICBmcHJpbnRmKG1fZmlsZSwgIiBcIiIpOwpAQCAtNDg0 LDI0ICs0NzAsNyBAQCB2b2lkIFJlZ0V4cDo6bWF0Y2hDb21wYXJlV2l0aEludGVycHJldGVyKGNv bnN0IFN0cmluZyYgcywgaW50IHN0YXJ0T2Zmc2V0LCBpbnQqCiAKIHN0YXRpYyBDU3RyaW5nIHJl Z2V4cFRvU291cmNlU3RyaW5nKGNvbnN0IFJlZ0V4cCogcmVnRXhwKQogewotICAgIGNoYXIgcG9z dGZpeFs3XSA9IHsgJy8nLCAwLCAwLCAwLCAwLCAwLCAwIH07Ci0gICAgaW50IGluZGV4ID0gMTsK LSAgICBpZiAocmVnRXhwLT5nbG9iYWwoKSkKLSAgICAgICAgcG9zdGZpeFtpbmRleCsrXSA9ICdn JzsKLSAgICBpZiAocmVnRXhwLT5pZ25vcmVDYXNlKCkpCi0gICAgICAgIHBvc3RmaXhbaW5kZXgr K10gPSAnaSc7Ci0gICAgaWYgKHJlZ0V4cC0+aGFzSW5kaWNlcygpKQotICAgICAgICBwb3N0Zml4 W2luZGV4XSA9ICdkJzsKLSAgICBpZiAocmVnRXhwLT5tdWx0aWxpbmUoKSkKLSAgICAgICAgcG9z dGZpeFtpbmRleF0gPSAnbSc7Ci0gICAgaWYgKHJlZ0V4cC0+ZG90QWxsKCkpCi0gICAgICAgIHBv c3RmaXhbaW5kZXgrK10gPSAncyc7Ci0gICAgaWYgKHJlZ0V4cC0+dW5pY29kZSgpKQotICAgICAg ICBwb3N0Zml4W2luZGV4KytdID0gJ3UnOwotICAgIGlmIChyZWdFeHAtPnN0aWNreSgpKQotICAg ICAgICBwb3N0Zml4W2luZGV4KytdID0gJ3knOwotCi0gICAgcmV0dXJuIHRvQ1N0cmluZygiLyIs IHJlZ0V4cC0+cGF0dGVybigpLmltcGwoKSwgcG9zdGZpeCk7CisgICAgcmV0dXJuIHRvQ1N0cmlu ZygiLyIsIHJlZ0V4cC0+cGF0dGVybigpLmltcGwoKSwgIi8iLCBZYXJyOjpmbGFnc1N0cmluZyhy ZWdFeHAtPmZsYWdzKCkpLmRhdGEoKSk7CiB9CiAKIHZvaWQgUmVnRXhwOjpkdW1wVG9TdHJlYW0o Y29uc3QgSlNDZWxsKiBjZWxsLCBQcmludFN0cmVhbSYgb3V0KQpkaWZmIC0tZ2l0IGEvU291cmNl L0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvUmVnRXhwLmggYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUv cnVudGltZS9SZWdFeHAuaAppbmRleCA2MGQzNzIwYTcyMTk0MWFmNDAzNDMyNDc0NTMxYmExZDA2 YjBkM2MxLi40ZTM3ZDlmZjdmNmY5MDkzMGVmZjdkMzdhMWUxMWMxNzA5YWM0YzgyIDEwMDY0NAot LS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9SZWdFeHAuaAorKysgYi9Tb3VyY2Uv SmF2YVNjcmlwdENvcmUvcnVudGltZS9SZWdFeHAuaApAQCAtNTcsMTQgKzU3LDExIEBAIGNsYXNz IFJlZ0V4cCBmaW5hbCA6IHB1YmxpYyBKU0NlbGwgewogICAgIHN0YXRpYyBzaXplX3QgZXN0aW1h dGVkU2l6ZShKU0NlbGwqLCBWTSYpOwogICAgIEpTX0VYUE9SVF9QUklWQVRFIHN0YXRpYyB2b2lk IGR1bXBUb1N0cmVhbShjb25zdCBKU0NlbGwqLCBQcmludFN0cmVhbSYpOwogCi0gICAgYm9vbCBn bG9iYWwoKSBjb25zdCB7IHJldHVybiBtX2ZsYWdzLmNvbnRhaW5zKFlhcnI6OkZsYWdzOjpHbG9i YWwpOyB9Ci0gICAgYm9vbCBpZ25vcmVDYXNlKCkgY29uc3QgeyByZXR1cm4gbV9mbGFncy5jb250 YWlucyhZYXJyOjpGbGFnczo6SWdub3JlQ2FzZSk7IH0KLSAgICBib29sIG11bHRpbGluZSgpIGNv bnN0IHsgcmV0dXJuIG1fZmxhZ3MuY29udGFpbnMoWWFycjo6RmxhZ3M6Ok11bHRpbGluZSk7IH0K LSAgICBib29sIHN0aWNreSgpIGNvbnN0IHsgcmV0dXJuIG1fZmxhZ3MuY29udGFpbnMoWWFycjo6 RmxhZ3M6OlN0aWNreSk7IH0KKyAgICBPcHRpb25TZXQ8WWFycjo6RmxhZ3M+IGZsYWdzKCkgY29u c3QgeyByZXR1cm4gbV9mbGFnczsgfQorI2RlZmluZSBKU0NfREVGSU5FX1JFR0VYUF9GTEFHX0FD Q0VTU09SKGtleSwgbmFtZSwgbG93ZXJDYXNlTmFtZSwgaW5kZXgpIGJvb2wgbG93ZXJDYXNlTmFt ZSgpIGNvbnN0IHsgcmV0dXJuIG1fZmxhZ3MuY29udGFpbnMoWWFycjo6RmxhZ3M6Om5hbWUpOyB9 CisgICAgSlNDX1JFR0VYUF9GTEFHUyhKU0NfREVGSU5FX1JFR0VYUF9GTEFHX0FDQ0VTU09SKQor I3VuZGVmIEpTQ19ERUZJTkVfUkVHRVhQX0ZMQUdfQUNDRVNTT1IKICAgICBib29sIGdsb2JhbE9y U3RpY2t5KCkgY29uc3QgeyByZXR1cm4gZ2xvYmFsKCkgfHwgc3RpY2t5KCk7IH0KLSAgICBib29s IHVuaWNvZGUoKSBjb25zdCB7IHJldHVybiBtX2ZsYWdzLmNvbnRhaW5zKFlhcnI6OkZsYWdzOjpV bmljb2RlKTsgfQotICAgIGJvb2wgZG90QWxsKCkgY29uc3QgeyByZXR1cm4gbV9mbGFncy5jb250 YWlucyhZYXJyOjpGbGFnczo6RG90QWxsKTsgfQotICAgIGJvb2wgaGFzSW5kaWNlcygpIGNvbnN0 IHsgcmV0dXJuIG1fZmxhZ3MuY29udGFpbnMoWWFycjo6RmxhZ3M6Okhhc0luZGljZXMpOyB9CiAK ICAgICBjb25zdCBTdHJpbmcmIHBhdHRlcm4oKSBjb25zdCB7IHJldHVybiBtX3BhdHRlcm5TdHJp bmc7IH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvUmVnRXhw UHJvdG90eXBlLmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL1JlZ0V4cFByb3Rv dHlwZS5jcHAKaW5kZXggZTAwMmM2NDZiODA2ZWNkZGJjZWRhOTBlMDBjZjY4Zjc2ODEzODEwNi4u ZWJmNWYwNmM3ZGM3YmQ1MDcwY2VjNjJkYTQ4YzUzZjk3NmVkYjhjZCAxMDA2NDQKLS0tIGEvU291 cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvUmVnRXhwUHJvdG90eXBlLmNwcAorKysgYi9Tb3Vy Y2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9SZWdFeHBQcm90b3R5cGUuY3BwCkBAIC0xNjIsNDkg KzE2MiwyNCBAQCBKU0NfREVGSU5FX0hPU1RfRlVOQ1RJT04ocmVnRXhwUHJvdG9GdW5jQ29tcGls ZSwgKEpTR2xvYmFsT2JqZWN0KiBnbG9iYWxPYmplY3QsCiAgICAgcmV0dXJuIEpTVmFsdWU6OmVu Y29kZSh0aGlzUmVnRXhwKTsKIH0KIAotdHlwZWRlZiBzdGQ6OmFycmF5PGNoYXIsIDcgKyAxPiBG bGFnc1N0cmluZzsgLy8gNiBkaWZmZXJlbnQgZmxhZ3MgYW5kIGEgbnVsbCBjaGFyYWN0ZXIgdGVy bWluYXRvci4KLQotc3RhdGljIGlubGluZSBGbGFnc1N0cmluZyBmbGFnc1N0cmluZyhKU0dsb2Jh bE9iamVjdCogZ2xvYmFsT2JqZWN0LCBKU09iamVjdCogcmVnZXhwKQorc3RhdGljIGlubGluZSBZ YXJyOjpGbGFnc1N0cmluZyBmbGFnc1N0cmluZyhKU0dsb2JhbE9iamVjdCogZ2xvYmFsT2JqZWN0 LCBKU09iamVjdCogcmVnZXhwKQogewotICAgIEZsYWdzU3RyaW5nIHN0cmluZzsKLSAgICBzdHJp bmdbMF0gPSAwOwotCiAgICAgVk0mIHZtID0gZ2xvYmFsT2JqZWN0LT52bSgpOwogICAgIGF1dG8g c2NvcGUgPSBERUNMQVJFX1RIUk9XX1NDT1BFKHZtKTsKIAotICAgIEpTVmFsdWUgaW5kaWNlc1Zh bHVlID0gcmVnZXhwLT5nZXQoZ2xvYmFsT2JqZWN0LCB2bS5wcm9wZXJ0eU5hbWVzLT5oYXNJbmRp Y2VzKTsKLSAgICBSRVRVUk5fSUZfRVhDRVBUSU9OKHNjb3BlLCBzdHJpbmcpOwotICAgIEpTVmFs dWUgZ2xvYmFsVmFsdWUgPSByZWdleHAtPmdldChnbG9iYWxPYmplY3QsIHZtLnByb3BlcnR5TmFt ZXMtPmdsb2JhbCk7Ci0gICAgUkVUVVJOX0lGX0VYQ0VQVElPTihzY29wZSwgc3RyaW5nKTsKLSAg ICBKU1ZhbHVlIGlnbm9yZUNhc2VWYWx1ZSA9IHJlZ2V4cC0+Z2V0KGdsb2JhbE9iamVjdCwgdm0u cHJvcGVydHlOYW1lcy0+aWdub3JlQ2FzZSk7Ci0gICAgUkVUVVJOX0lGX0VYQ0VQVElPTihzY29w ZSwgc3RyaW5nKTsKLSAgICBKU1ZhbHVlIG11bHRpbGluZVZhbHVlID0gcmVnZXhwLT5nZXQoZ2xv YmFsT2JqZWN0LCB2bS5wcm9wZXJ0eU5hbWVzLT5tdWx0aWxpbmUpOwotICAgIFJFVFVSTl9JRl9F WENFUFRJT04oc2NvcGUsIHN0cmluZyk7Ci0gICAgSlNWYWx1ZSBkb3RBbGxWYWx1ZSA9IHJlZ2V4 cC0+Z2V0KGdsb2JhbE9iamVjdCwgdm0ucHJvcGVydHlOYW1lcy0+ZG90QWxsKTsKLSAgICBSRVRV Uk5fSUZfRVhDRVBUSU9OKHNjb3BlLCBzdHJpbmcpOwotICAgIEpTVmFsdWUgdW5pY29kZVZhbHVl ID0gcmVnZXhwLT5nZXQoZ2xvYmFsT2JqZWN0LCB2bS5wcm9wZXJ0eU5hbWVzLT51bmljb2RlKTsK LSAgICBSRVRVUk5fSUZfRVhDRVBUSU9OKHNjb3BlLCBzdHJpbmcpOwotICAgIEpTVmFsdWUgc3Rp Y2t5VmFsdWUgPSByZWdleHAtPmdldChnbG9iYWxPYmplY3QsIHZtLnByb3BlcnR5TmFtZXMtPnN0 aWNreSk7Ci0gICAgUkVUVVJOX0lGX0VYQ0VQVElPTihzY29wZSwgc3RyaW5nKTsKLQotICAgIHVu c2lnbmVkIGluZGV4ID0gMDsKLSAgICBpZiAoaW5kaWNlc1ZhbHVlLnRvQm9vbGVhbihnbG9iYWxP YmplY3QpKQotICAgICAgICBzdHJpbmdbaW5kZXgrK10gPSAnZCc7Ci0gICAgaWYgKGdsb2JhbFZh bHVlLnRvQm9vbGVhbihnbG9iYWxPYmplY3QpKQotICAgICAgICBzdHJpbmdbaW5kZXgrK10gPSAn Zyc7Ci0gICAgaWYgKGlnbm9yZUNhc2VWYWx1ZS50b0Jvb2xlYW4oZ2xvYmFsT2JqZWN0KSkKLSAg ICAgICAgc3RyaW5nW2luZGV4KytdID0gJ2knOwotICAgIGlmIChtdWx0aWxpbmVWYWx1ZS50b0Jv b2xlYW4oZ2xvYmFsT2JqZWN0KSkKLSAgICAgICAgc3RyaW5nW2luZGV4KytdID0gJ20nOwotICAg IGlmIChkb3RBbGxWYWx1ZS50b0Jvb2xlYW4oZ2xvYmFsT2JqZWN0KSkKLSAgICAgICAgc3RyaW5n W2luZGV4KytdID0gJ3MnOwotICAgIGlmICh1bmljb2RlVmFsdWUudG9Cb29sZWFuKGdsb2JhbE9i amVjdCkpCi0gICAgICAgIHN0cmluZ1tpbmRleCsrXSA9ICd1JzsKLSAgICBpZiAoc3RpY2t5VmFs dWUudG9Cb29sZWFuKGdsb2JhbE9iamVjdCkpCi0gICAgICAgIHN0cmluZ1tpbmRleCsrXSA9ICd5 JzsKLSAgICBBU1NFUlQoaW5kZXggPCBzdHJpbmcuc2l6ZSgpKTsKLSAgICBzdHJpbmdbaW5kZXhd ID0gMDsKLSAgICByZXR1cm4gc3RyaW5nOworICAgIE9wdGlvblNldDxZYXJyOjpGbGFncz4gZmxh Z3M7CisKKyNkZWZpbmUgSlNDX1JFVFJJRVZFX1JFR0VYUF9GTEFHKGtleSwgbmFtZSwgbG93ZXJD YXNlTmFtZSwgaW5kZXgpIFwKKyAgICBKU1ZhbHVlIGxvd2VyQ2FzZU5hbWUjI1ZhbHVlID0gcmVn ZXhwLT5nZXQoZ2xvYmFsT2JqZWN0LCB2bS5wcm9wZXJ0eU5hbWVzLT5sb3dlckNhc2VOYW1lKTsg XAorICAgIFJFVFVSTl9JRl9FWENFUFRJT04oc2NvcGUsIHsgfSk7IFwKKyAgICBpZiAobG93ZXJD YXNlTmFtZSMjVmFsdWUudG9Cb29sZWFuKGdsb2JhbE9iamVjdCkpIFwKKyAgICAgICAgZmxhZ3Mu YWRkKFlhcnI6OkZsYWdzOjpuYW1lKTsKKworICAgIEpTQ19SRUdFWFBfRkxBR1MoSlNDX1JFVFJJ RVZFX1JFR0VYUF9GTEFHKQorCisjdW5kZWYgSlNDX1JFVFJJRVZFX1JFR0VYUF9GTEFHCisKKyAg ICByZXR1cm4gWWFycjo6ZmxhZ3NTdHJpbmcoZmxhZ3MpOwogfQogCiBKU0NfREVGSU5FX0hPU1Rf RlVOQ1RJT04ocmVnRXhwUHJvdG9GdW5jVG9TdHJpbmcsIChKU0dsb2JhbE9iamVjdCogZ2xvYmFs T2JqZWN0LCBDYWxsRnJhbWUqIGNhbGxGcmFtZSkpCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNj cmlwdENvcmUveWFyci9ZYXJyRmxhZ3MuY3BwIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3lhcnIv WWFyckZsYWdzLmNwcAppbmRleCA1YzE2YjJhZjEzYjBkMTllMWQ0OWM5ZmVmMzNiMDQ1YmU2ZmFh Yzg5Li5kYWNmYjk2NTQyNzIwYjcxNzQzYTEwY2FiMTNlNWYzNzZlZGM3YjE0IDEwMDY0NAotLS0g YS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUveWFyci9ZYXJyRmxhZ3MuY3BwCisrKyBiL1NvdXJjZS9K YXZhU2NyaXB0Q29yZS95YXJyL1lhcnJGbGFncy5jcHAKQEAgLTM2LDQ3ICszNiwxNiBAQCBzdGQ6 Om9wdGlvbmFsPE9wdGlvblNldDxGbGFncz4+IHBhcnNlRmxhZ3MoU3RyaW5nVmlldyBzdHJpbmcp CiAgICAgT3B0aW9uU2V0PEZsYWdzPiBmbGFnczsKICAgICBmb3IgKGF1dG8gY2hhcmFjdGVyIDog c3RyaW5nLmNvZGVVbml0cygpKSB7CiAgICAgICAgIHN3aXRjaCAoY2hhcmFjdGVyKSB7Ci0gICAg ICAgIGNhc2UgJ2QnOgotICAgICAgICAgICAgaWYgKGZsYWdzLmNvbnRhaW5zKEZsYWdzOjpIYXNJ bmRpY2VzKSkKLSAgICAgICAgICAgICAgICByZXR1cm4gc3RkOjpudWxsb3B0OwotICAgICAgICAg ICAgZmxhZ3MuYWRkKEZsYWdzOjpIYXNJbmRpY2VzKTsKKyNkZWZpbmUgSlNDX0hBTkRMRV9SRUdF WFBfRkxBRyhrZXksIG5hbWUsIGxvd2VyQ2FzZU5hbWUsIF8pIFwKKyAgICAgICAgY2FzZSBrZXk6 IFwKKyAgICAgICAgICAgIGlmIChmbGFncy5jb250YWlucyhGbGFnczo6bmFtZSkpIFwKKyAgICAg ICAgICAgICAgICByZXR1cm4gc3RkOjpudWxsb3B0OyBcCisgICAgICAgICAgICBmbGFncy5hZGQo RmxhZ3M6Om5hbWUpOyBcCiAgICAgICAgICAgICBicmVhazsKIAotICAgICAgICBjYXNlICdnJzoK LSAgICAgICAgICAgIGlmIChmbGFncy5jb250YWlucyhGbGFnczo6R2xvYmFsKSkKLSAgICAgICAg ICAgICAgICByZXR1cm4gc3RkOjpudWxsb3B0OwotICAgICAgICAgICAgZmxhZ3MuYWRkKEZsYWdz OjpHbG9iYWwpOwotICAgICAgICAgICAgYnJlYWs7Ci0KLSAgICAgICAgY2FzZSAnaSc6Ci0gICAg ICAgICAgICBpZiAoZmxhZ3MuY29udGFpbnMoRmxhZ3M6Oklnbm9yZUNhc2UpKQotICAgICAgICAg ICAgICAgIHJldHVybiBzdGQ6Om51bGxvcHQ7Ci0gICAgICAgICAgICBmbGFncy5hZGQoRmxhZ3M6 Oklnbm9yZUNhc2UpOwotICAgICAgICAgICAgYnJlYWs7Ci0KLSAgICAgICAgY2FzZSAnbSc6Ci0g ICAgICAgICAgICBpZiAoZmxhZ3MuY29udGFpbnMoRmxhZ3M6Ok11bHRpbGluZSkpCi0gICAgICAg ICAgICAgICAgcmV0dXJuIHN0ZDo6bnVsbG9wdDsKLSAgICAgICAgICAgIGZsYWdzLmFkZChGbGFn czo6TXVsdGlsaW5lKTsKLSAgICAgICAgICAgIGJyZWFrOworICAgICAgICBKU0NfUkVHRVhQX0ZM QUdTKEpTQ19IQU5ETEVfUkVHRVhQX0ZMQUcpCiAKLSAgICAgICAgY2FzZSAncyc6Ci0gICAgICAg ICAgICBpZiAoZmxhZ3MuY29udGFpbnMoRmxhZ3M6OkRvdEFsbCkpCi0gICAgICAgICAgICAgICAg cmV0dXJuIHN0ZDo6bnVsbG9wdDsKLSAgICAgICAgICAgIGZsYWdzLmFkZChGbGFnczo6RG90QWxs KTsKLSAgICAgICAgICAgIGJyZWFrOwotICAgICAgICAgICAgCi0gICAgICAgIGNhc2UgJ3UnOgot ICAgICAgICAgICAgaWYgKGZsYWdzLmNvbnRhaW5zKEZsYWdzOjpVbmljb2RlKSkKLSAgICAgICAg ICAgICAgICByZXR1cm4gc3RkOjpudWxsb3B0OwotICAgICAgICAgICAgZmxhZ3MuYWRkKEZsYWdz OjpVbmljb2RlKTsKLSAgICAgICAgICAgIGJyZWFrOwotICAgICAgICAgICAgICAgIAotICAgICAg ICBjYXNlICd5JzoKLSAgICAgICAgICAgIGlmIChmbGFncy5jb250YWlucyhGbGFnczo6U3RpY2t5 KSkKLSAgICAgICAgICAgICAgICByZXR1cm4gc3RkOjpudWxsb3B0OwotICAgICAgICAgICAgZmxh Z3MuYWRkKEZsYWdzOjpTdGlja3kpOwotICAgICAgICAgICAgYnJlYWs7CisjdW5kZWYgSlNDX0hB TkRMRV9SRUdFWFBfRkxBRwogCiAgICAgICAgIGRlZmF1bHQ6CiAgICAgICAgICAgICByZXR1cm4g c3RkOjpudWxsb3B0OwpAQCAtODYsNCArNTUsMjQgQEAgc3RkOjpvcHRpb25hbDxPcHRpb25TZXQ8 RmxhZ3M+PiBwYXJzZUZsYWdzKFN0cmluZ1ZpZXcgc3RyaW5nKQogICAgIHJldHVybiBzdGQ6Om1h a2Vfb3B0aW9uYWwoZmxhZ3MpOwogfQogCitGbGFnc1N0cmluZyBmbGFnc1N0cmluZyhPcHRpb25T ZXQ8RmxhZ3M+IGZsYWdzKQoreworICAgIEZsYWdzU3RyaW5nIHN0cmluZzsKKyAgICB1bnNpZ25l ZCBpbmRleCA9IDA7CisKKyNkZWZpbmUgSlNDX1dSSVRFX1JFR0VYUF9GTEFHKGtleSwgbmFtZSwg bG93ZXJDYXNlTmFtZSwgXykgXAorICAgIGRvIHsgXAorICAgICAgICBpZiAoZmxhZ3MuY29udGFp bnMoRmxhZ3M6Om5hbWUpKSBcCisgICAgICAgICAgICBzdHJpbmdbaW5kZXgrK10gPSBrZXk7IFwK KyAgICB9IHdoaWxlICgwKTsKKworICAgIEpTQ19SRUdFWFBfRkxBR1MoSlNDX1dSSVRFX1JFR0VY UF9GTEFHKQorCisjdW5kZWYgSlNDX1dSSVRFX1JFR0VYUF9GTEFHCisKKyAgICBBU1NFUlQoaW5k ZXggPCBzdHJpbmcuc2l6ZSgpKTsKKyAgICBzdHJpbmdbaW5kZXhdID0gMDsKKyAgICByZXR1cm4g c3RyaW5nOworfQorCiB9IH0gLy8gbmFtZXNwYWNlIEpTQzo6WWFycgpkaWZmIC0tZ2l0IGEvU291 cmNlL0phdmFTY3JpcHRDb3JlL3lhcnIvWWFyckZsYWdzLmggYi9Tb3VyY2UvSmF2YVNjcmlwdENv cmUveWFyci9ZYXJyRmxhZ3MuaAppbmRleCBlYzgwNTVmY2IxNjk5ZjJkNDBhOTZiYzk1Y2ZjZWI5 NDVhMTFiMTE1Li4zMjk2NzYwNDcwZGUzZDAxZDdlZjhmMzRhZGVhN2YyYzQ3ZmRmZTIwIDEwMDY0 NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUveWFyci9ZYXJyRmxhZ3MuaAorKysgYi9Tb3Vy Y2UvSmF2YVNjcmlwdENvcmUveWFyci9ZYXJyRmxhZ3MuaApAQCAtMzAsMTcgKzMwLDI5IEBACiAK IG5hbWVzcGFjZSBKU0MgeyBuYW1lc3BhY2UgWWFyciB7CiAKKy8vIEZsYWdzIG11c3QgYmUgb3Jk ZXJlZCBpbiBhbHBoYWJldCBvcmRlcmluZy4KKyNkZWZpbmUgSlNDX1JFR0VYUF9GTEFHUyhtYWNy bykgXAorICAgIG1hY3JvKCdkJywgSGFzSW5kaWNlcywgaGFzSW5kaWNlcywgMCkgXAorICAgIG1h Y3JvKCdnJywgR2xvYmFsLCBnbG9iYWwsIDEpIFwKKyAgICBtYWNybygnaScsIElnbm9yZUNhc2Us IGlnbm9yZUNhc2UsIDIpIFwKKyAgICBtYWNybygnbScsIE11bHRpbGluZSwgbXVsdGlsaW5lLCAz KSBcCisgICAgbWFjcm8oJ3MnLCBEb3RBbGwsIGRvdEFsbCwgNCkgXAorICAgIG1hY3JvKCd1Jywg VW5pY29kZSwgdW5pY29kZSwgNSkgXAorICAgIG1hY3JvKCd5JywgU3RpY2t5LCBzdGlja3ksIDYp IFwKKworI2RlZmluZSBKU0NfQ09VTlRfUkVHRVhQX0ZMQUcoa2V5LCBuYW1lLCBsb3dlckNhc2VO YW1lLCBpbmRleCkgKyAxCitzdGF0aWMgY29uc3RleHByIHVuc2lnbmVkIG51bWJlck9mRmxhZ3Mg PSAwIEpTQ19SRUdFWFBfRkxBR1MoSlNDX0NPVU5UX1JFR0VYUF9GTEFHKTsKKyN1bmRlZiBKU0Nf Q09VTlRfUkVHRVhQX0ZMQUcKKwogZW51bSBjbGFzcyBGbGFncyA6IHVpbnQ4X3QgewotICAgIEds b2JhbCA9IDEgPDwgMCwKLSAgICBJZ25vcmVDYXNlID0gMSA8PCAxLAotICAgIE11bHRpbGluZSA9 IDEgPDwgMiwKLSAgICBTdGlja3kgPSAxIDw8IDMsCi0gICAgVW5pY29kZSA9IDEgPDwgNCwKLSAg ICBEb3RBbGwgPSAxIDw8IDUsCi0gICAgSGFzSW5kaWNlcyA9IDEgPDwgNiwKLSAgICBEZWxldGVk VmFsdWUgPSAxIDw8IDcKKyNkZWZpbmUgSlNDX0RFRklORV9SRUdFWFBfRkxBRyhrZXksIG5hbWUs IGxvd2VyQ2FzZU5hbWUsIGluZGV4KSBuYW1lID0gMSA8PCBpbmRleCwKKyAgICBKU0NfUkVHRVhQ X0ZMQUdTKEpTQ19ERUZJTkVfUkVHRVhQX0ZMQUcpCisjdW5kZWYgSlNDX0RFRklORV9SRUdFWFBf RkxBRworICAgIERlbGV0ZWRWYWx1ZSA9IDEgPDwgbnVtYmVyT2ZGbGFncywKIH07CiAKIEpTX0VY UE9SVF9QUklWQVRFIHN0ZDo6b3B0aW9uYWw8T3B0aW9uU2V0PEZsYWdzPj4gcGFyc2VGbGFncyhT dHJpbmdWaWV3KTsKK3VzaW5nIEZsYWdzU3RyaW5nID0gc3RkOjphcnJheTxjaGFyLCBZYXJyOjpu dW1iZXJPZkZsYWdzICsgMT47IC8vIG51bWJlck9mRmxhZ3MgKyBudWxsLXRlcm1pbmF0b3IKK0Zs YWdzU3RyaW5nIGZsYWdzU3RyaW5nKE9wdGlvblNldDxGbGFncz4pOwogCiB9IH0gLy8gbmFtZXNw YWNlIEpTQzo6WWFycgo=