201889 2019-09-17 16:36:58 -0700 Follow-up after String.codePointAt optimization 2019-09-17 17:31:56 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 ysuzuki ysuzuki ews-watchlist keith_miller mark.lam msaboff saam tzagallo webkit-bug-importer oldest_to_newest 1571735 0 ysuzuki 2019-09-17 16:36:58 -0700 Follow-up after String.codePointAt optimization 1571736 1 379006 ysuzuki 2019-09-17 16:38:32 -0700 Created attachment 379006 Patch 1571737 2 webkit-bug-importer 2019-09-17 16:39:23 -0700 <rdar://problem/55459325> 1571738 3 379006 ysuzuki 2019-09-17 16:41:15 -0700 Comment on attachment 379006 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=379006&action=review > Source/JavaScriptCore/ChangeLog:11 > + 2. Check BadType in String.codePointAt, String.charAt, and String.charCodeAt. For now, I'm just fixing these three things. It would be profitable to see the other things, but it involves more changes (like, check whether it accepts UntypedUse etc.). 1571754 4 ysuzuki 2019-09-17 17:31:56 -0700 Committed r250004: <https://trac.webkit.org/changeset/250004> 379006 2019-09-17 16:38:32 -0700 2019-09-17 16:47:48 -0700 Patch bug-201889-20190917163831.patch text/plain 13891 ysuzuki U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ5OTg1CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCAy NWQ4YmQzNzc1OTA2NmI1YzI5N2U0NmUwMjhhZmUxNTcyOTBjN2ZhLi5hMjlmMDEyOWU1NDc5NGY4 YjcxNzgwYmJiZDRmNzgzYWJkYmI5MTA1IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxOCBAQAorMjAxOS0wOS0xNyAgWXVzdWtlIFN1enVraSAgPHlzdXp1a2lAYXBwbGUuY29t PgorCisgICAgICAgIEZvbGxvdy11cCBhZnRlciBTdHJpbmcuY29kZVBvaW50QXQgb3B0aW1pemF0 aW9uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDE4 ODkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBGb2xs b3ctdXAgYWZ0ZXIgc3RyaW5nLmNvZGVQb2ludEF0IERGRyAvIEZUTCBvcHRpbWl6YXRpb25zLAor CisgICAgICAgIDEuIEdyYWNlZnVsbHkgYWNjZXB0IGFyZ3VtZW50cyBtb3JlIHRoYW4gZXhwZWN0 ZWQgZm9yIGludHJpbnNpY3MKKyAgICAgICAgMi4gQ2hlY2sgQmFkVHlwZSBpbiBTdHJpbmcuY29k ZVBvaW50QXQsIFN0cmluZy5jaGFyQXQsIGFuZCBTdHJpbmcuY2hhckNvZGVBdC4KKworICAgICAg ICAqIGRmZy9ERkdCeXRlQ29kZVBhcnNlci5jcHA6CisgICAgICAgIChKU0M6OkRGRzo6Qnl0ZUNv ZGVQYXJzZXI6OmhhbmRsZUludHJpbnNpY0NhbGwpOgorCiAyMDE5LTA5LTE3ICBZdXN1a2UgU3V6 dWtpICA8eXN1enVraUBhcHBsZS5jb20+CiAKICAgICAgICAgW0pTQ10gQ2hlY2tBcnJheStOb25B cnJheSBpcyBub3QgZmlsdGVyaW5nIG91dCBBcnJheSBpbiBBSQpkaWZmIC0tZ2l0IGEvU291cmNl L0phdmFTY3JpcHRDb3JlL2RmZy9ERkdCeXRlQ29kZVBhcnNlci5jcHAgYi9Tb3VyY2UvSmF2YVNj cmlwdENvcmUvZGZnL0RGR0J5dGVDb2RlUGFyc2VyLmNwcAppbmRleCBhZDYzZDMxYmYzMWI1YzIx MjJiYmFkMTgyN2RmMmM4MWQ3NDYxZGNiLi5jMGEzZjc2MWU2YWYwMWY0ZTE2NzUzY2U5NTJjZWI5 YjRiOTE1YzMxIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0J5dGVD b2RlUGFyc2VyLmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0J5dGVDb2Rl UGFyc2VyLmNwcApAQCAtMjQ2MCw5ICsyNDYwLDYgQEAgYm9vbCBCeXRlQ29kZVBhcnNlcjo6aGFu ZGxlSW50cmluc2ljQ2FsbChOb2RlKiBjYWxsZWUsIFZpcnR1YWxSZWdpc3RlciByZXN1bHQsIEkK ICAgICAgICAgfQogICAgICAgICAgICAgCiAgICAgICAgIGNhc2UgQXJyYXlQb3BJbnRyaW5zaWM6 IHsKLSAgICAgICAgICAgIGlmIChhcmd1bWVudENvdW50SW5jbHVkaW5nVGhpcyAhPSAxKQotICAg ICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKLSAgICAgICAgICAgIAogICAgICAgICAgICAgQXJy YXlNb2RlIGFycmF5TW9kZSA9IGdldEFycmF5TW9kZShBcnJheTo6V3JpdGUpOwogICAgICAgICAg ICAgaWYgKCFhcnJheU1vZGUuaXNKU0FycmF5KCkpCiAgICAgICAgICAgICAgICAgcmV0dXJuIGZh bHNlOwpAQCAtMjU5NCwxMCArMjU5MSwxMCBAQCBib29sIEJ5dGVDb2RlUGFyc2VyOjpoYW5kbGVJ bnRyaW5zaWNDYWxsKE5vZGUqIGNhbGxlZSwgVmlydHVhbFJlZ2lzdGVyIHJlc3VsdCwgSQogICAg ICAgICB9CiAKICAgICAgICAgY2FzZSBDaGFyQ29kZUF0SW50cmluc2ljOiB7Ci0gICAgICAgICAg ICBpZiAoYXJndW1lbnRDb3VudEluY2x1ZGluZ1RoaXMgIT0gMikKKyAgICAgICAgICAgIGlmIChh cmd1bWVudENvdW50SW5jbHVkaW5nVGhpcyA8IDIpCiAgICAgICAgICAgICAgICAgcmV0dXJuIGZh bHNlOwogCi0gICAgICAgICAgICBpZiAobV9pbmxpbmVTdGFja1RvcC0+bV9leGl0UHJvZmlsZS5o YXNFeGl0U2l0ZShtX2N1cnJlbnRJbmRleCwgVW5jb3VudGFibGUpKQorICAgICAgICAgICAgaWYg KG1faW5saW5lU3RhY2tUb3AtPm1fZXhpdFByb2ZpbGUuaGFzRXhpdFNpdGUobV9jdXJyZW50SW5k ZXgsIFVuY291bnRhYmxlKSB8fCBtX2lubGluZVN0YWNrVG9wLT5tX2V4aXRQcm9maWxlLmhhc0V4 aXRTaXRlKG1fY3VycmVudEluZGV4LCBCYWRUeXBlKSkKICAgICAgICAgICAgICAgICByZXR1cm4g ZmFsc2U7CiAKICAgICAgICAgICAgIGluc2VydENoZWNrcygpOwpAQCAtMjYxMywxMCArMjYxMCwx MCBAQCBib29sIEJ5dGVDb2RlUGFyc2VyOjpoYW5kbGVJbnRyaW5zaWNDYWxsKE5vZGUqIGNhbGxl ZSwgVmlydHVhbFJlZ2lzdGVyIHJlc3VsdCwgSQogICAgICAgICAgICAgaWYgKCFpczY0Qml0KCkp CiAgICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwogCi0gICAgICAgICAgICBpZiAoYXJndW1l bnRDb3VudEluY2x1ZGluZ1RoaXMgIT0gMikKKyAgICAgICAgICAgIGlmIChhcmd1bWVudENvdW50 SW5jbHVkaW5nVGhpcyA8IDIpCiAgICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwogCi0gICAg ICAgICAgICBpZiAobV9pbmxpbmVTdGFja1RvcC0+bV9leGl0UHJvZmlsZS5oYXNFeGl0U2l0ZSht X2N1cnJlbnRJbmRleCwgVW5jb3VudGFibGUpKQorICAgICAgICAgICAgaWYgKG1faW5saW5lU3Rh Y2tUb3AtPm1fZXhpdFByb2ZpbGUuaGFzRXhpdFNpdGUobV9jdXJyZW50SW5kZXgsIFVuY291bnRh YmxlKSB8fCBtX2lubGluZVN0YWNrVG9wLT5tX2V4aXRQcm9maWxlLmhhc0V4aXRTaXRlKG1fY3Vy cmVudEluZGV4LCBCYWRUeXBlKSkKICAgICAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAg ICAgICAgICAgIGluc2VydENoZWNrcygpOwpAQCAtMjYyOSw3ICsyNjI2LDEwIEBAIGJvb2wgQnl0 ZUNvZGVQYXJzZXI6OmhhbmRsZUludHJpbnNpY0NhbGwoTm9kZSogY2FsbGVlLCBWaXJ0dWFsUmVn aXN0ZXIgcmVzdWx0LCBJCiAgICAgICAgIH0KIAogICAgICAgICBjYXNlIENoYXJBdEludHJpbnNp YzogewotICAgICAgICAgICAgaWYgKGFyZ3VtZW50Q291bnRJbmNsdWRpbmdUaGlzICE9IDIpCisg ICAgICAgICAgICBpZiAoYXJndW1lbnRDb3VudEluY2x1ZGluZ1RoaXMgPCAyKQorICAgICAgICAg ICAgICAgIHJldHVybiBmYWxzZTsKKworICAgICAgICAgICAgaWYgKG1faW5saW5lU3RhY2tUb3At Pm1fZXhpdFByb2ZpbGUuaGFzRXhpdFNpdGUobV9jdXJyZW50SW5kZXgsIEJhZFR5cGUpKQogICAg ICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKIAogICAgICAgICAgICAgLy8gRklYTUU6IFN0cmlu ZyNjaGFyQXQgcmV0dXJucyBlbXB0eSBzdHJpbmcgd2hlbiBpbmRleCBpcyBvdXQtb2YtYm91bmRz LCBhbmQgdGhpcyBkb2VzIG5vdCBicmVhayB0aGUgQUkncyBjbGFpbS4KQEAgLTI2NjgsNyArMjY2 OCw3IEBAIGJvb2wgQnl0ZUNvZGVQYXJzZXI6OmhhbmRsZUludHJpbnNpY0NhbGwoTm9kZSogY2Fs bGVlLCBWaXJ0dWFsUmVnaXN0ZXIgcmVzdWx0LCBJCiAgICAgICAgIH0KIAogICAgICAgICBjYXNl IFJlZ0V4cEV4ZWNJbnRyaW5zaWM6IHsKLSAgICAgICAgICAgIGlmIChhcmd1bWVudENvdW50SW5j bHVkaW5nVGhpcyAhPSAyKQorICAgICAgICAgICAgaWYgKGFyZ3VtZW50Q291bnRJbmNsdWRpbmdU aGlzIDwgMikKICAgICAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgICAgICAgICAKICAg ICAgICAgICAgIGluc2VydENoZWNrcygpOwpAQCAtMjY4MCw3ICsyNjgwLDcgQEAgYm9vbCBCeXRl Q29kZVBhcnNlcjo6aGFuZGxlSW50cmluc2ljQ2FsbChOb2RlKiBjYWxsZWUsIFZpcnR1YWxSZWdp c3RlciByZXN1bHQsIEkKICAgICAgICAgICAgIAogICAgICAgICBjYXNlIFJlZ0V4cFRlc3RJbnRy aW5zaWM6CiAgICAgICAgIGNhc2UgUmVnRXhwVGVzdEZhc3RJbnRyaW5zaWM6IHsKLSAgICAgICAg ICAgIGlmIChhcmd1bWVudENvdW50SW5jbHVkaW5nVGhpcyAhPSAyKQorICAgICAgICAgICAgaWYg KGFyZ3VtZW50Q291bnRJbmNsdWRpbmdUaGlzIDwgMikKICAgICAgICAgICAgICAgICByZXR1cm4g ZmFsc2U7CiAKICAgICAgICAgICAgIGlmIChpbnRyaW5zaWMgPT0gUmVnRXhwVGVzdEludHJpbnNp YykgewpAQCAtMjc0OCw3ICsyNzQ4LDcgQEAgYm9vbCBCeXRlQ29kZVBhcnNlcjo6aGFuZGxlSW50 cmluc2ljQ2FsbChOb2RlKiBjYWxsZWUsIFZpcnR1YWxSZWdpc3RlciByZXN1bHQsIEkKICAgICAg ICAgfQogCiAgICAgICAgIGNhc2UgT2JqZWN0R2V0UHJvdG90eXBlT2ZJbnRyaW5zaWM6IHsKLSAg ICAgICAgICAgIGlmIChhcmd1bWVudENvdW50SW5jbHVkaW5nVGhpcyAhPSAyKQorICAgICAgICAg ICAgaWYgKGFyZ3VtZW50Q291bnRJbmNsdWRpbmdUaGlzIDwgMikKICAgICAgICAgICAgICAgICBy ZXR1cm4gZmFsc2U7CiAKICAgICAgICAgICAgIGluc2VydENoZWNrcygpOwpAQCAtMjc3NSw3ICsy Nzc1LDcgQEAgYm9vbCBCeXRlQ29kZVBhcnNlcjo6aGFuZGxlSW50cmluc2ljQ2FsbChOb2RlKiBj YWxsZWUsIFZpcnR1YWxSZWdpc3RlciByZXN1bHQsIEkKICAgICAgICAgfQogCiAgICAgICAgIGNh c2UgUmVmbGVjdEdldFByb3RvdHlwZU9mSW50cmluc2ljOiB7Ci0gICAgICAgICAgICBpZiAoYXJn dW1lbnRDb3VudEluY2x1ZGluZ1RoaXMgIT0gMikKKyAgICAgICAgICAgIGlmIChhcmd1bWVudENv dW50SW5jbHVkaW5nVGhpcyA8IDIpCiAgICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAg ICAgICAgICAgICBpbnNlcnRDaGVja3MoKTsKQEAgLTI3OTksNyArMjc5OSw3IEBAIGJvb2wgQnl0 ZUNvZGVQYXJzZXI6OmhhbmRsZUludHJpbnNpY0NhbGwoTm9kZSogY2FsbGVlLCBWaXJ0dWFsUmVn aXN0ZXIgcmVzdWx0LCBJCiAgICAgICAgIH0KIAogICAgICAgICBjYXNlIFN0cmluZ1Byb3RvdHlw ZVJlcGxhY2VJbnRyaW5zaWM6IHsKLSAgICAgICAgICAgIGlmIChhcmd1bWVudENvdW50SW5jbHVk aW5nVGhpcyAhPSAzKQorICAgICAgICAgICAgaWYgKGFyZ3VtZW50Q291bnRJbmNsdWRpbmdUaGlz IDwgMykKICAgICAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAgICAgICAgICAgIC8vIERv bid0IGlubGluZSBpbnRyaW5zaWMgaWYgd2UgZXhpdGVkIGR1ZSB0byAic2VhcmNoIiBub3QgYmVp bmcgYSBSZWdFeHAgb3IgU3RyaW5nIG9iamVjdC4KQEAgLTI4NTEsNyArMjg1MSw3IEBAIGJvb2wg Qnl0ZUNvZGVQYXJzZXI6OmhhbmRsZUludHJpbnNpY0NhbGwoTm9kZSogY2FsbGVlLCBWaXJ0dWFs UmVnaXN0ZXIgcmVzdWx0LCBJCiAgICAgICAgIH0KICAgICAgICAgICAgIAogICAgICAgICBjYXNl IFN0cmluZ1Byb3RvdHlwZVJlcGxhY2VSZWdFeHBJbnRyaW5zaWM6IHsKLSAgICAgICAgICAgIGlm IChhcmd1bWVudENvdW50SW5jbHVkaW5nVGhpcyAhPSAzKQorICAgICAgICAgICAgaWYgKGFyZ3Vt ZW50Q291bnRJbmNsdWRpbmdUaGlzIDwgMykKICAgICAgICAgICAgICAgICByZXR1cm4gZmFsc2U7 CiAgICAgICAgICAgICAKICAgICAgICAgICAgIGluc2VydENoZWNrcygpOwpAQCAtMjg4Nyw3ICsy ODg3LDcgQEAgYm9vbCBCeXRlQ29kZVBhcnNlcjo6aGFuZGxlSW50cmluc2ljQ2FsbChOb2RlKiBj YWxsZWUsIFZpcnR1YWxSZWdpc3RlciByZXN1bHQsIEkKICAgICAgICAgICAgIHJldHVybiB0cnVl OwogICAgICAgICB9CiAgICAgICAgIGNhc2UgSU11bEludHJpbnNpYzogewotICAgICAgICAgICAg aWYgKGFyZ3VtZW50Q291bnRJbmNsdWRpbmdUaGlzICE9IDMpCisgICAgICAgICAgICBpZiAoYXJn dW1lbnRDb3VudEluY2x1ZGluZ1RoaXMgPCAzKQogICAgICAgICAgICAgICAgIHJldHVybiBmYWxz ZTsKICAgICAgICAgICAgIGluc2VydENoZWNrcygpOwogICAgICAgICAgICAgVmlydHVhbFJlZ2lz dGVyIGxlZnRPcGVyYW5kID0gdmlydHVhbFJlZ2lzdGVyRm9yQXJndW1lbnQoMSwgcmVnaXN0ZXJP ZmZzZXQpOwpAQCAtMjg5OSw4ICsyODk5LDYgQEAgYm9vbCBCeXRlQ29kZVBhcnNlcjo6aGFuZGxl SW50cmluc2ljQ2FsbChOb2RlKiBjYWxsZWUsIFZpcnR1YWxSZWdpc3RlciByZXN1bHQsIEkKICAg ICAgICAgfQogCiAgICAgICAgIGNhc2UgUmFuZG9tSW50cmluc2ljOiB7Ci0gICAgICAgICAgICBp ZiAoYXJndW1lbnRDb3VudEluY2x1ZGluZ1RoaXMgIT0gMSkKLSAgICAgICAgICAgICAgICByZXR1 cm4gZmFsc2U7CiAgICAgICAgICAgICBpbnNlcnRDaGVja3MoKTsKICAgICAgICAgICAgIHNldFJl c3VsdChhZGRUb0dyYXBoKEFyaXRoUmFuZG9tKSk7CiAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsK QEAgLTI5NTMsNyArMjk1MSw3IEBAIGJvb2wgQnl0ZUNvZGVQYXJzZXI6OmhhbmRsZUludHJpbnNp Y0NhbGwoTm9kZSogY2FsbGVlLCBWaXJ0dWFsUmVnaXN0ZXIgcmVzdWx0LCBJCiAgICAgICAgIH0K ICAgICAgICAgICAgIAogICAgICAgICBjYXNlIEZpYXRJbnQ1MkludHJpbnNpYzogewotICAgICAg ICAgICAgaWYgKGFyZ3VtZW50Q291bnRJbmNsdWRpbmdUaGlzICE9IDIpCisgICAgICAgICAgICBp ZiAoYXJndW1lbnRDb3VudEluY2x1ZGluZ1RoaXMgPCAyKQogICAgICAgICAgICAgICAgIHJldHVy biBmYWxzZTsKICAgICAgICAgICAgIGluc2VydENoZWNrcygpOwogICAgICAgICAgICAgVmlydHVh bFJlZ2lzdGVyIG9wZXJhbmQgPSB2aXJ0dWFsUmVnaXN0ZXJGb3JBcmd1bWVudCgxLCByZWdpc3Rl ck9mZnNldCk7CkBAIC0yOTY1LDcgKzI5NjMsNyBAQCBib29sIEJ5dGVDb2RlUGFyc2VyOjpoYW5k bGVJbnRyaW5zaWNDYWxsKE5vZGUqIGNhbGxlZSwgVmlydHVhbFJlZ2lzdGVyIHJlc3VsdCwgSQog ICAgICAgICB9CiAKICAgICAgICAgY2FzZSBKU01hcEdldEludHJpbnNpYzogewotICAgICAgICAg ICAgaWYgKGFyZ3VtZW50Q291bnRJbmNsdWRpbmdUaGlzICE9IDIpCisgICAgICAgICAgICBpZiAo YXJndW1lbnRDb3VudEluY2x1ZGluZ1RoaXMgPCAyKQogICAgICAgICAgICAgICAgIHJldHVybiBm YWxzZTsKIAogICAgICAgICAgICAgaW5zZXJ0Q2hlY2tzKCk7CkBAIC0yOTgxLDcgKzI5NzksNyBA QCBib29sIEJ5dGVDb2RlUGFyc2VyOjpoYW5kbGVJbnRyaW5zaWNDYWxsKE5vZGUqIGNhbGxlZSwg VmlydHVhbFJlZ2lzdGVyIHJlc3VsdCwgSQogCiAgICAgICAgIGNhc2UgSlNTZXRIYXNJbnRyaW5z aWM6CiAgICAgICAgIGNhc2UgSlNNYXBIYXNJbnRyaW5zaWM6IHsKLSAgICAgICAgICAgIGlmIChh cmd1bWVudENvdW50SW5jbHVkaW5nVGhpcyAhPSAyKQorICAgICAgICAgICAgaWYgKGFyZ3VtZW50 Q291bnRJbmNsdWRpbmdUaGlzIDwgMikKICAgICAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CiAK ICAgICAgICAgICAgIGluc2VydENoZWNrcygpOwpAQCAtMzAwNSw3ICszMDAzLDcgQEAgYm9vbCBC eXRlQ29kZVBhcnNlcjo6aGFuZGxlSW50cmluc2ljQ2FsbChOb2RlKiBjYWxsZWUsIFZpcnR1YWxS ZWdpc3RlciByZXN1bHQsIEkKICAgICAgICAgfQogCiAgICAgICAgIGNhc2UgSlNTZXRBZGRJbnRy aW5zaWM6IHsKLSAgICAgICAgICAgIGlmIChhcmd1bWVudENvdW50SW5jbHVkaW5nVGhpcyAhPSAy KQorICAgICAgICAgICAgaWYgKGFyZ3VtZW50Q291bnRJbmNsdWRpbmdUaGlzIDwgMikKICAgICAg ICAgICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAgICAgICAgICAgIGluc2VydENoZWNrcygpOwpA QCAtMzAxOSw3ICszMDE3LDcgQEAgYm9vbCBCeXRlQ29kZVBhcnNlcjo6aGFuZGxlSW50cmluc2lj Q2FsbChOb2RlKiBjYWxsZWUsIFZpcnR1YWxSZWdpc3RlciByZXN1bHQsIEkKICAgICAgICAgfQog CiAgICAgICAgIGNhc2UgSlNNYXBTZXRJbnRyaW5zaWM6IHsKLSAgICAgICAgICAgIGlmIChhcmd1 bWVudENvdW50SW5jbHVkaW5nVGhpcyAhPSAzKQorICAgICAgICAgICAgaWYgKGFyZ3VtZW50Q291 bnRJbmNsdWRpbmdUaGlzIDwgMykKICAgICAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAg ICAgICAgICAgIGluc2VydENoZWNrcygpOwpAQCAtMzA4Niw3ICszMDg0LDcgQEAgYm9vbCBCeXRl Q29kZVBhcnNlcjo6aGFuZGxlSW50cmluc2ljQ2FsbChOb2RlKiBjYWxsZWUsIFZpcnR1YWxSZWdp c3RlciByZXN1bHQsIEkKICAgICAgICAgfQogCiAgICAgICAgIGNhc2UgSlNXZWFrTWFwR2V0SW50 cmluc2ljOiB7Ci0gICAgICAgICAgICBpZiAoYXJndW1lbnRDb3VudEluY2x1ZGluZ1RoaXMgIT0g MikKKyAgICAgICAgICAgIGlmIChhcmd1bWVudENvdW50SW5jbHVkaW5nVGhpcyA8IDIpCiAgICAg ICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAgICAgICAgICAgICBpZiAobV9pbmxpbmVTdGFj a1RvcC0+bV9leGl0UHJvZmlsZS5oYXNFeGl0U2l0ZShtX2N1cnJlbnRJbmRleCwgQmFkVHlwZSkp CkBAIC0zMTA1LDcgKzMxMDMsNyBAQCBib29sIEJ5dGVDb2RlUGFyc2VyOjpoYW5kbGVJbnRyaW5z aWNDYWxsKE5vZGUqIGNhbGxlZSwgVmlydHVhbFJlZ2lzdGVyIHJlc3VsdCwgSQogICAgICAgICB9 CiAKICAgICAgICAgY2FzZSBKU1dlYWtNYXBIYXNJbnRyaW5zaWM6IHsKLSAgICAgICAgICAgIGlm IChhcmd1bWVudENvdW50SW5jbHVkaW5nVGhpcyAhPSAyKQorICAgICAgICAgICAgaWYgKGFyZ3Vt ZW50Q291bnRJbmNsdWRpbmdUaGlzIDwgMikKICAgICAgICAgICAgICAgICByZXR1cm4gZmFsc2U7 CiAKICAgICAgICAgICAgIGlmIChtX2lubGluZVN0YWNrVG9wLT5tX2V4aXRQcm9maWxlLmhhc0V4 aXRTaXRlKG1fY3VycmVudEluZGV4LCBCYWRUeXBlKSkKQEAgLTMxMjUsNyArMzEyMyw3IEBAIGJv b2wgQnl0ZUNvZGVQYXJzZXI6OmhhbmRsZUludHJpbnNpY0NhbGwoTm9kZSogY2FsbGVlLCBWaXJ0 dWFsUmVnaXN0ZXIgcmVzdWx0LCBJCiAgICAgICAgIH0KIAogICAgICAgICBjYXNlIEpTV2Vha1Nl dEhhc0ludHJpbnNpYzogewotICAgICAgICAgICAgaWYgKGFyZ3VtZW50Q291bnRJbmNsdWRpbmdU aGlzICE9IDIpCisgICAgICAgICAgICBpZiAoYXJndW1lbnRDb3VudEluY2x1ZGluZ1RoaXMgPCAy KQogICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKIAogICAgICAgICAgICAgaWYgKG1faW5s aW5lU3RhY2tUb3AtPm1fZXhpdFByb2ZpbGUuaGFzRXhpdFNpdGUobV9jdXJyZW50SW5kZXgsIEJh ZFR5cGUpKQpAQCAtMzE0NSw3ICszMTQzLDcgQEAgYm9vbCBCeXRlQ29kZVBhcnNlcjo6aGFuZGxl SW50cmluc2ljQ2FsbChOb2RlKiBjYWxsZWUsIFZpcnR1YWxSZWdpc3RlciByZXN1bHQsIEkKICAg ICAgICAgfQogCiAgICAgICAgIGNhc2UgSlNXZWFrU2V0QWRkSW50cmluc2ljOiB7Ci0gICAgICAg ICAgICBpZiAoYXJndW1lbnRDb3VudEluY2x1ZGluZ1RoaXMgIT0gMikKKyAgICAgICAgICAgIGlm IChhcmd1bWVudENvdW50SW5jbHVkaW5nVGhpcyA8IDIpCiAgICAgICAgICAgICAgICAgcmV0dXJu IGZhbHNlOwogCiAgICAgICAgICAgICBpZiAobV9pbmxpbmVTdGFja1RvcC0+bV9leGl0UHJvZmls ZS5oYXNFeGl0U2l0ZShtX2N1cnJlbnRJbmRleCwgQmFkVHlwZSkpCkBAIC0zMTYyLDcgKzMxNjAs NyBAQCBib29sIEJ5dGVDb2RlUGFyc2VyOjpoYW5kbGVJbnRyaW5zaWNDYWxsKE5vZGUqIGNhbGxl ZSwgVmlydHVhbFJlZ2lzdGVyIHJlc3VsdCwgSQogICAgICAgICB9CiAKICAgICAgICAgY2FzZSBK U1dlYWtNYXBTZXRJbnRyaW5zaWM6IHsKLSAgICAgICAgICAgIGlmIChhcmd1bWVudENvdW50SW5j bHVkaW5nVGhpcyAhPSAzKQorICAgICAgICAgICAgaWYgKGFyZ3VtZW50Q291bnRJbmNsdWRpbmdU aGlzIDwgMykKICAgICAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAgICAgICAgICAgIGlm IChtX2lubGluZVN0YWNrVG9wLT5tX2V4aXRQcm9maWxlLmhhc0V4aXRTaXRlKG1fY3VycmVudElu ZGV4LCBCYWRUeXBlKSkKQEAgLTMzNjUsNyArMzM2Myw3IEBAIGJvb2wgQnl0ZUNvZGVQYXJzZXI6 OmhhbmRsZUludHJpbnNpY0NhbGwoTm9kZSogY2FsbGVlLCBWaXJ0dWFsUmVnaXN0ZXIgcmVzdWx0 LCBJCiAgICAgICAgIH0KIAogICAgICAgICBjYXNlIEhhc093blByb3BlcnR5SW50cmluc2ljOiB7 Ci0gICAgICAgICAgICBpZiAoYXJndW1lbnRDb3VudEluY2x1ZGluZ1RoaXMgIT0gMikKKyAgICAg ICAgICAgIGlmIChhcmd1bWVudENvdW50SW5jbHVkaW5nVGhpcyA8IDIpCiAgICAgICAgICAgICAg ICAgcmV0dXJuIGZhbHNlOwogCiAgICAgICAgICAgICAvLyBUaGlzIGNhbiBiZSByYWN5LCB0aGF0 J3MgZmluZS4gV2Uga25vdyB0aGF0IG9uY2Ugd2Ugb2JzZXJ2ZSB0aGF0IHRoaXMgaXMgY3JlYXRl ZCwKQEAgLTM0MDMsOSArMzQwMSw2IEBAIGJvb2wgQnl0ZUNvZGVQYXJzZXI6OmhhbmRsZUludHJp bnNpY0NhbGwoTm9kZSogY2FsbGVlLCBWaXJ0dWFsUmVnaXN0ZXIgcmVzdWx0LCBJCiAgICAgICAg IH0KIAogICAgICAgICBjYXNlIFN0cmluZ1Byb3RvdHlwZVRvTG93ZXJDYXNlSW50cmluc2ljOiB7 Ci0gICAgICAgICAgICBpZiAoYXJndW1lbnRDb3VudEluY2x1ZGluZ1RoaXMgIT0gMSkKLSAgICAg ICAgICAgICAgICByZXR1cm4gZmFsc2U7Ci0KICAgICAgICAgICAgIGlmIChtX2lubGluZVN0YWNr VG9wLT5tX2V4aXRQcm9maWxlLmhhc0V4aXRTaXRlKG1fY3VycmVudEluZGV4LCBCYWRUeXBlKSkK ICAgICAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CiAKQEAgLTM0MTcsOSArMzQxMiw2IEBAIGJv b2wgQnl0ZUNvZGVQYXJzZXI6OmhhbmRsZUludHJpbnNpY0NhbGwoTm9kZSogY2FsbGVlLCBWaXJ0 dWFsUmVnaXN0ZXIgcmVzdWx0LCBJCiAgICAgICAgIH0KIAogICAgICAgICBjYXNlIE51bWJlclBy b3RvdHlwZVRvU3RyaW5nSW50cmluc2ljOiB7Ci0gICAgICAgICAgICBpZiAoYXJndW1lbnRDb3Vu dEluY2x1ZGluZ1RoaXMgIT0gMSAmJiBhcmd1bWVudENvdW50SW5jbHVkaW5nVGhpcyAhPSAyKQot ICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKLQogICAgICAgICAgICAgaWYgKG1faW5saW5l U3RhY2tUb3AtPm1fZXhpdFByb2ZpbGUuaGFzRXhpdFNpdGUobV9jdXJyZW50SW5kZXgsIEJhZFR5 cGUpKQogICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKIApkaWZmIC0tZ2l0IGEvSlNUZXN0 cy9DaGFuZ2VMb2cgYi9KU1Rlc3RzL0NoYW5nZUxvZwppbmRleCA5YzY0NDRkODdkODI4OGM3NDgw NTY4ZGQ1NDJlNTI2ZmVjNjE0NTZlLi42NTVjZTQ5NTQ0Y2NkNTQ5YzAyZDFkYWQ5NTA0NzI1ZDZi YzhlMjQxIDEwMDY0NAotLS0gYS9KU1Rlc3RzL0NoYW5nZUxvZworKysgYi9KU1Rlc3RzL0NoYW5n ZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDE5LTA5LTE3ICBZdXN1a2UgU3V6dWtpICA8eXN1enVr aUBhcHBsZS5jb20+CisKKyAgICAgICAgRm9sbG93LXVwIGFmdGVyIFN0cmluZy5jb2RlUG9pbnRB dCBvcHRpbWl6YXRpb24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTIwMTg4OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgICogc3RyZXNzL3N0cmluZy1jaGFyLWF0LWJhZC10eXBlLmpzOiBBZGRlZC4KKyAgICAg ICAgKHNob3VsZEJlKToKKyAgICAgICAgKG9iamVjdC50b1N0cmluZyk6CisgICAgICAgICh0ZXN0 KToKKyAgICAgICAgKiBzdHJlc3Mvc3RyaW5nLWNoYXItY29kZS1hdC1iYWQtdHlwZS5qczogQWRk ZWQuCisgICAgICAgIChzaG91bGRCZSk6CisgICAgICAgIChvYmplY3QudG9TdHJpbmcpOgorICAg ICAgICAodGVzdCk6CisgICAgICAgICogc3RyZXNzL3N0cmluZy1jb2RlLXBvaW50LWF0LWJhZC10 eXBlLmpzOiBBZGRlZC4KKyAgICAgICAgKHNob3VsZEJlKToKKyAgICAgICAgKG9iamVjdC50b1N0 cmluZyk6CisgICAgICAgICh0ZXN0KToKKwogMjAxOS0wOS0xNyAgWXVzdWtlIFN1enVraSAgPHlz dXp1a2lAYXBwbGUuY29tPgogCiAgICAgICAgIFtKU0NdIENoZWNrQXJyYXkrTm9uQXJyYXkgaXMg bm90IGZpbHRlcmluZyBvdXQgQXJyYXkgaW4gQUkKZGlmZiAtLWdpdCBhL0pTVGVzdHMvc3RyZXNz L3N0cmluZy1jaGFyLWF0LWJhZC10eXBlLmpzIGIvSlNUZXN0cy9zdHJlc3Mvc3RyaW5nLWNoYXIt YXQtYmFkLXR5cGUuanMKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uYzcxMzdlNjk2MzljM2FiMzRiYWQ0NDk0OGI2NGUw OTQxMjVmZGMyYQotLS0gL2Rldi9udWxsCisrKyBiL0pTVGVzdHMvc3RyZXNzL3N0cmluZy1jaGFy LWF0LWJhZC10eXBlLmpzCkBAIC0wLDAgKzEsMTcgQEAKK2Z1bmN0aW9uIHNob3VsZEJlKGFjdHVh bCwgZXhwZWN0ZWQpIHsKKyAgICBpZiAoYWN0dWFsICE9PSBleHBlY3RlZCkKKyAgICAgICAgdGhy b3cgbmV3IEVycm9yKCdiYWQgdmFsdWU6ICcgKyBhY3R1YWwpOworfQorCit2YXIgb2JqZWN0ID0g eworICAgIHRvU3RyaW5nKCkgeyByZXR1cm4gIkNvY29hIjsgfQorfTsKK3ZhciBjaGFyQXQgPSBT dHJpbmcucHJvdG90eXBlLmNoYXJBdDsKK2Z1bmN0aW9uIHRlc3Qob2JqZWN0KQoreworICAgIHNo b3VsZEJlKGNoYXJBdC5jYWxsKG9iamVjdCwgMCksIGBDYCk7Cit9Citub0lubGluZSh0ZXN0KTsK KworZm9yICh2YXIgaSA9IDA7IGkgPCAxZTU7ICsraSkKKyAgICB0ZXN0KG9iamVjdCk7CmRpZmYg LS1naXQgYS9KU1Rlc3RzL3N0cmVzcy9zdHJpbmctY2hhci1jb2RlLWF0LWJhZC10eXBlLmpzIGIv SlNUZXN0cy9zdHJlc3Mvc3RyaW5nLWNoYXItY29kZS1hdC1iYWQtdHlwZS5qcwpuZXcgZmlsZSBt b2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw Li43YzE2ZmY1M2E0YzMwZWIyN2ZjZDA4MzRjOGE4ODJjMzdiMDJhNjIyCi0tLSAvZGV2L251bGwK KysrIGIvSlNUZXN0cy9zdHJlc3Mvc3RyaW5nLWNoYXItY29kZS1hdC1iYWQtdHlwZS5qcwpAQCAt MCwwICsxLDE3IEBACitmdW5jdGlvbiBzaG91bGRCZShhY3R1YWwsIGV4cGVjdGVkKSB7CisgICAg aWYgKGFjdHVhbCAhPT0gZXhwZWN0ZWQpCisgICAgICAgIHRocm93IG5ldyBFcnJvcignYmFkIHZh bHVlOiAnICsgYWN0dWFsKTsKK30KKwordmFyIG9iamVjdCA9IHsKKyAgICB0b1N0cmluZygpIHsg cmV0dXJuICJDb2NvYSI7IH0KK307Cit2YXIgY2hhckNvZGVBdCA9IFN0cmluZy5wcm90b3R5cGUu Y2hhckNvZGVBdDsKK2Z1bmN0aW9uIHRlc3Qob2JqZWN0KQoreworICAgIHNob3VsZEJlKGNoYXJD b2RlQXQuY2FsbChvYmplY3QsIDApLCA2Nyk7Cit9Citub0lubGluZSh0ZXN0KTsKKworZm9yICh2 YXIgaSA9IDA7IGkgPCAxZTU7ICsraSkKKyAgICB0ZXN0KG9iamVjdCk7CmRpZmYgLS1naXQgYS9K U1Rlc3RzL3N0cmVzcy9zdHJpbmctY29kZS1wb2ludC1hdC1iYWQtdHlwZS5qcyBiL0pTVGVzdHMv c3RyZXNzL3N0cmluZy1jb2RlLXBvaW50LWF0LWJhZC10eXBlLmpzCm5ldyBmaWxlIG1vZGUgMTAw NjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjdiYTY5 OWUxZDM5ZjY0ZDY3OTA3OTZjMjcyMTY5ZGI2MWMzZTE0M2UKLS0tIC9kZXYvbnVsbAorKysgYi9K U1Rlc3RzL3N0cmVzcy9zdHJpbmctY29kZS1wb2ludC1hdC1iYWQtdHlwZS5qcwpAQCAtMCwwICsx LDE3IEBACitmdW5jdGlvbiBzaG91bGRCZShhY3R1YWwsIGV4cGVjdGVkKSB7CisgICAgaWYgKGFj dHVhbCAhPT0gZXhwZWN0ZWQpCisgICAgICAgIHRocm93IG5ldyBFcnJvcignYmFkIHZhbHVlOiAn ICsgYWN0dWFsKTsKK30KKwordmFyIG9iamVjdCA9IHsKKyAgICB0b1N0cmluZygpIHsgcmV0dXJu ICJDb2NvYSI7IH0KK307Cit2YXIgY29kZVBvaW50QXQgPSBTdHJpbmcucHJvdG90eXBlLmNvZGVQ b2ludEF0OworZnVuY3Rpb24gdGVzdChvYmplY3QpCit7CisgICAgc2hvdWxkQmUoY29kZVBvaW50 QXQuY2FsbChvYmplY3QsIDApLCA2Nyk7Cit9Citub0lubGluZSh0ZXN0KTsKKworZm9yICh2YXIg aSA9IDA7IGkgPCAxZTU7ICsraSkKKyAgICB0ZXN0KG9iamVjdCk7Cg==