233346 2021-11-18 17:10:03 -0800 Remove allocation in JSON::Value::parseJSON 2021-11-19 07:58:24 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 achristensen achristensen benjamin cdumez cmarcelo ews-watchlist webkit-bug-importer ysuzuki oldest_to_newest 1816701 0 achristensen 2021-11-18 17:10:03 -0800 Remove allocation in JSON::Value::parseJSON 1816702 1 444762 achristensen 2021-11-18 17:11:35 -0800 Created attachment 444762 Patch 1816759 2 444783 achristensen 2021-11-18 23:07:12 -0800 Created attachment 444783 Patch 1816776 3 444783 ysuzuki 2021-11-19 01:17:18 -0800 Comment on attachment 444783 Patch r=me 1816867 4 ews-feeder 2021-11-19 07:57:46 -0800 Committed r286062 (244449@main): <https://commits.webkit.org/244449@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 444783. 1816868 5 webkit-bug-importer 2021-11-19 07:58:24 -0800 <rdar://problem/85603378> 444762 2021-11-18 17:11:35 -0800 2021-11-18 23:07:09 -0800 Patch bug-233346-20211118171134.patch text/plain 7117 achristensen U3VidmVyc2lvbiBSZXZpc2lvbjogMjg1OTgwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IGI1NGZkNzA1NjZiNTQxYTk4MGI4NjBi OTMwYmM4ZTNhYTI1ZDJmZGMuLjk1YmRhMjU4ODViNGY1MDNiYmI0NWVhN2QwNWM3OGZkMDIwOGZl YzcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMjEtMTEtMTggIEFsZXggQ2hyaXN0ZW5zZW4gIDxh Y2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KKworICAgICAgICBSZW1vdmUgYWxsb2NhdGlvbiBpbiBK U09OOjpWYWx1ZTo6cGFyc2VKU09OCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0yMzMzNDYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBQYXJzZSB0aGUgY2hhcmFjdGVycyBhcyBMYXRpbjEgY2hhcmFjdGVycyBp ZiB3ZSBoYXZlIGFuIDggYml0IHN0cmluZyByYXRoZXIgdGhhbiBjb252ZXJ0aW5nIHRoZW0gdG8g VVRGLTE2IGp1c3QgdG8gYmUgcGFyc2VkLgorCisgICAgICAgICogd3RmL0pTT05WYWx1ZXMuY3Bw OgorICAgICAgICAoV1RGOjpKU09OSW1wbDo6VmFsdWU6OnBhcnNlSlNPTik6CisKIDIwMjEtMTEt MTcgIEpvaG4gV2lsYW5kZXIgIDx3aWxhbmRlckBhcHBsZS5jb20+CiAKICAgICAgICAgUENNOiBB ZGQgY2FwYWJpbGl0eSBmb3IgY2xpY2sgZGVzdGluYXRpb24gdG8gZmlyZSB0cmlnZ2VyaW5nIGV2 ZW50IHdpdGhvdXQgY3Jvc3Mtc2l0ZSByZXF1ZXN0cyB0byB0aGUgY2xpY2sgc291cmNlCmRpZmYg LS1naXQgYS9Tb3VyY2UvV1RGL3d0Zi9KU09OVmFsdWVzLmNwcCBiL1NvdXJjZS9XVEYvd3RmL0pT T05WYWx1ZXMuY3BwCmluZGV4IDlkNjljMWI3ZDQ2MWMyMmU5MWEwMTJkZGM3ZjY0NWI2MGU2YTYy NDcuLmYzOTJmNTA0MDg2MTFjOTBkZTM3NDJkNzFiMzczNDQwZGYxNjU4MDAgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XVEYvd3RmL0pTT05WYWx1ZXMuY3BwCisrKyBiL1NvdXJjZS9XVEYvd3RmL0pTT05W YWx1ZXMuY3BwCkBAIC02MSw3ICs2MSw4IEBAIGNvbnN0IGNoYXIqIGNvbnN0IG51bGxUb2tlbiA9 ICJudWxsIjsKIGNvbnN0IGNoYXIqIGNvbnN0IHRydWVUb2tlbiA9ICJ0cnVlIjsKIGNvbnN0IGNo YXIqIGNvbnN0IGZhbHNlVG9rZW4gPSAiZmFsc2UiOwogCi1ib29sIHBhcnNlQ29uc3RUb2tlbihj b25zdCBVQ2hhciogc3RhcnQsIGNvbnN0IFVDaGFyKiBlbmQsIGNvbnN0IFVDaGFyKiogdG9rZW5F bmQsIGNvbnN0IGNoYXIqIHRva2VuKQordGVtcGxhdGU8dHlwZW5hbWUgQ29kZVVuaXQ+Citib29s IHBhcnNlQ29uc3RUb2tlbihjb25zdCBDb2RlVW5pdCogc3RhcnQsIGNvbnN0IENvZGVVbml0KiBl bmQsIGNvbnN0IENvZGVVbml0KiogdG9rZW5FbmQsIGNvbnN0IGNoYXIqIHRva2VuKQogewogICAg IHdoaWxlIChzdGFydCA8IGVuZCAmJiAqdG9rZW4gIT0gJ1wwJyAmJiAqc3RhcnQrKyA9PSAqdG9r ZW4rKykgeyB9CiAKQEAgLTcyLDcgKzczLDggQEAgYm9vbCBwYXJzZUNvbnN0VG9rZW4oY29uc3Qg VUNoYXIqIHN0YXJ0LCBjb25zdCBVQ2hhciogZW5kLCBjb25zdCBVQ2hhcioqIHRva2VuRW4KICAg ICByZXR1cm4gdHJ1ZTsKIH0KIAotYm9vbCByZWFkSW50KGNvbnN0IFVDaGFyKiBzdGFydCwgY29u c3QgVUNoYXIqIGVuZCwgY29uc3QgVUNoYXIqKiB0b2tlbkVuZCwgYm9vbCBjYW5IYXZlTGVhZGlu Z1plcm9zKQordGVtcGxhdGU8dHlwZW5hbWUgQ29kZVVuaXQ+Citib29sIHJlYWRJbnQoY29uc3Qg Q29kZVVuaXQqIHN0YXJ0LCBjb25zdCBDb2RlVW5pdCogZW5kLCBjb25zdCBDb2RlVW5pdCoqIHRv a2VuRW5kLCBib29sIGNhbkhhdmVMZWFkaW5nWmVyb3MpCiB7CiAgICAgaWYgKHN0YXJ0ID09IGVu ZCkKICAgICAgICAgcmV0dXJuIGZhbHNlOwpAQCAtOTQsMTQgKzk2LDE1IEBAIGJvb2wgcmVhZElu dChjb25zdCBVQ2hhciogc3RhcnQsIGNvbnN0IFVDaGFyKiBlbmQsIGNvbnN0IFVDaGFyKiogdG9r ZW5FbmQsIGJvb2wKICAgICByZXR1cm4gdHJ1ZTsKIH0KIAotYm9vbCBwYXJzZU51bWJlclRva2Vu KGNvbnN0IFVDaGFyKiBzdGFydCwgY29uc3QgVUNoYXIqIGVuZCwgY29uc3QgVUNoYXIqKiB0b2tl bkVuZCkKK3RlbXBsYXRlPHR5cGVuYW1lIENvZGVVbml0PgorYm9vbCBwYXJzZU51bWJlclRva2Vu KGNvbnN0IENvZGVVbml0KiBzdGFydCwgY29uc3QgQ29kZVVuaXQqIGVuZCwgY29uc3QgQ29kZVVu aXQqKiB0b2tlbkVuZCkKIHsKICAgICAvLyBXZSBqdXN0IGdyYWIgdGhlIG51bWJlciBoZXJlLiBX ZSB2YWxpZGF0ZSB0aGUgc2l6ZSBpbiBEZWNvZGVOdW1iZXIuCiAgICAgLy8gQWNjb3JkaW5nIHRv IFJGQyA0NjI3LCBhIHZhbGlkIG51bWJlciBpczogW21pbnVzXSBpbnQgW2ZyYWNdIFtleHBdCiAg ICAgaWYgKHN0YXJ0ID09IGVuZCkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCi0gICAgVUNoYXIg YyA9ICpzdGFydDsKKyAgICBDb2RlVW5pdCBjID0gKnN0YXJ0OwogICAgIGlmICgnLScgPT0gYykK ICAgICAgICAgKytzdGFydDsKIApAQCAtMTQ1LDcgKzE0OCw4IEBAIGJvb2wgcGFyc2VOdW1iZXJU b2tlbihjb25zdCBVQ2hhciogc3RhcnQsIGNvbnN0IFVDaGFyKiBlbmQsIGNvbnN0IFVDaGFyKiog dG9rZW5FCiAgICAgcmV0dXJuIHRydWU7CiB9CiAKLWJvb2wgcmVhZEhleERpZ2l0cyhjb25zdCBV Q2hhciogc3RhcnQsIGNvbnN0IFVDaGFyKiBlbmQsIGNvbnN0IFVDaGFyKiogdG9rZW5FbmQsIGlu dCBkaWdpdHMpCit0ZW1wbGF0ZTx0eXBlbmFtZSBDb2RlVW5pdD4KK2Jvb2wgcmVhZEhleERpZ2l0 cyhjb25zdCBDb2RlVW5pdCogc3RhcnQsIGNvbnN0IENvZGVVbml0KiBlbmQsIGNvbnN0IENvZGVV bml0KiogdG9rZW5FbmQsIGludCBkaWdpdHMpCiB7CiAgICAgaWYgKGVuZCAtIHN0YXJ0IDwgZGln aXRzKQogICAgICAgICByZXR1cm4gZmFsc2U7CkBAIC0xNTksMTAgKzE2MywxMSBAQCBib29sIHJl YWRIZXhEaWdpdHMoY29uc3QgVUNoYXIqIHN0YXJ0LCBjb25zdCBVQ2hhciogZW5kLCBjb25zdCBV Q2hhcioqIHRva2VuRW5kLAogICAgIHJldHVybiB0cnVlOwogfQogCi1ib29sIHBhcnNlU3RyaW5n VG9rZW4oY29uc3QgVUNoYXIqIHN0YXJ0LCBjb25zdCBVQ2hhciogZW5kLCBjb25zdCBVQ2hhcioq IHRva2VuRW5kKQordGVtcGxhdGU8dHlwZW5hbWUgQ29kZVVuaXQ+Citib29sIHBhcnNlU3RyaW5n VG9rZW4oY29uc3QgQ29kZVVuaXQqIHN0YXJ0LCBjb25zdCBDb2RlVW5pdCogZW5kLCBjb25zdCBD b2RlVW5pdCoqIHRva2VuRW5kKQogewogICAgIHdoaWxlIChzdGFydCA8IGVuZCkgewotICAgICAg ICBVQ2hhciBjID0gKnN0YXJ0Kys7CisgICAgICAgIENvZGVVbml0IGMgPSAqc3RhcnQrKzsKICAg ICAgICAgaWYgKCdcXCcgPT0gYyAmJiBzdGFydCA8IGVuZCkgewogICAgICAgICAgICAgYyA9ICpz dGFydCsrOwogICAgICAgICAgICAgLy8gTWFrZSBzdXJlIHRoZSBlc2NhcGVkIGNoYXIgaXMgdmFs aWQuCkBAIC0xOTcsNyArMjAyLDggQEAgYm9vbCBwYXJzZVN0cmluZ1Rva2VuKGNvbnN0IFVDaGFy KiBzdGFydCwgY29uc3QgVUNoYXIqIGVuZCwgY29uc3QgVUNoYXIqKiB0b2tlbkUKICAgICByZXR1 cm4gZmFsc2U7CiB9CiAKLVRva2VuIHBhcnNlVG9rZW4oY29uc3QgVUNoYXIqIHN0YXJ0LCBjb25z dCBVQ2hhciogZW5kLCBjb25zdCBVQ2hhcioqIHRva2VuU3RhcnQsIGNvbnN0IFVDaGFyKiogdG9r ZW5FbmQpCit0ZW1wbGF0ZTx0eXBlbmFtZSBDb2RlVW5pdD4KK1Rva2VuIHBhcnNlVG9rZW4oY29u c3QgQ29kZVVuaXQqIHN0YXJ0LCBjb25zdCBDb2RlVW5pdCogZW5kLCBjb25zdCBDb2RlVW5pdCoq IHRva2VuU3RhcnQsIGNvbnN0IENvZGVVbml0KiogdG9rZW5FbmQpCiB7CiAgICAgd2hpbGUgKHN0 YXJ0IDwgZW5kICYmIGlzU3BhY2VPck5ld2xpbmUoKnN0YXJ0KSkKICAgICAgICAgKytzdGFydDsK QEAgLTI2MSwxMCArMjY3LDExIEBAIFRva2VuIHBhcnNlVG9rZW4oY29uc3QgVUNoYXIqIHN0YXJ0 LCBjb25zdCBVQ2hhciogZW5kLCBjb25zdCBVQ2hhcioqIHRva2VuU3RhcnQsCiAgICAgcmV0dXJu IFRva2VuOjpJbnZhbGlkOwogfQogCi1ib29sIGRlY29kZVN0cmluZyhjb25zdCBVQ2hhciogc3Rh cnQsIGNvbnN0IFVDaGFyKiBlbmQsIFN0cmluZ0J1aWxkZXImIG91dHB1dCkKK3RlbXBsYXRlPHR5 cGVuYW1lIENvZGVVbml0PgorYm9vbCBkZWNvZGVTdHJpbmcoY29uc3QgQ29kZVVuaXQqIHN0YXJ0 LCBjb25zdCBDb2RlVW5pdCogZW5kLCBTdHJpbmdCdWlsZGVyJiBvdXRwdXQpCiB7CiAgICAgd2hp bGUgKHN0YXJ0IDwgZW5kKSB7Ci0gICAgICAgIFVDaGFyIGMgPSAqc3RhcnQrKzsKKyAgICAgICAg Q29kZVVuaXQgYyA9ICpzdGFydCsrOwogICAgICAgICBpZiAoJ1xcJyAhPSBjKSB7CiAgICAgICAg ICAgICBvdXRwdXQuYXBwZW5kKGMpOwogICAgICAgICAgICAgY29udGludWU7CkBAIC0zMTYsNyAr MzIzLDggQEAgYm9vbCBkZWNvZGVTdHJpbmcoY29uc3QgVUNoYXIqIHN0YXJ0LCBjb25zdCBVQ2hh ciogZW5kLCBTdHJpbmdCdWlsZGVyJiBvdXRwdXQpCiAgICAgcmV0dXJuIHRydWU7CiB9CiAKLWJv b2wgZGVjb2RlU3RyaW5nKGNvbnN0IFVDaGFyKiBzdGFydCwgY29uc3QgVUNoYXIqIGVuZCwgU3Ry aW5nJiBvdXRwdXQpCit0ZW1wbGF0ZTx0eXBlbmFtZSBDb2RlVW5pdD4KK2Jvb2wgZGVjb2RlU3Ry aW5nKGNvbnN0IENvZGVVbml0KiBzdGFydCwgY29uc3QgQ29kZVVuaXQqIGVuZCwgU3RyaW5nJiBv dXRwdXQpCiB7CiAgICAgaWYgKHN0YXJ0ID09IGVuZCkgewogICAgICAgICBvdXRwdXQgPSBlbXB0 eVN0cmluZygpOwpAQCAtMzM1LDE0ICszNDMsMTUgQEAgYm9vbCBkZWNvZGVTdHJpbmcoY29uc3Qg VUNoYXIqIHN0YXJ0LCBjb25zdCBVQ2hhciogZW5kLCBTdHJpbmcmIG91dHB1dCkKICAgICByZXR1 cm4gdHJ1ZTsKIH0KIAotUmVmUHRyPEpTT046OlZhbHVlPiBidWlsZFZhbHVlKGNvbnN0IFVDaGFy KiBzdGFydCwgY29uc3QgVUNoYXIqIGVuZCwgY29uc3QgVUNoYXIqKiB2YWx1ZVRva2VuRW5kLCBp bnQgZGVwdGgpCit0ZW1wbGF0ZTx0eXBlbmFtZSBDb2RlVW5pdD4KK1JlZlB0cjxKU09OOjpWYWx1 ZT4gYnVpbGRWYWx1ZShjb25zdCBDb2RlVW5pdCogc3RhcnQsIGNvbnN0IENvZGVVbml0KiBlbmQs IGNvbnN0IENvZGVVbml0KiogdmFsdWVUb2tlbkVuZCwgaW50IGRlcHRoKQogewogICAgIGlmIChk ZXB0aCA+IHN0YWNrTGltaXQpCiAgICAgICAgIHJldHVybiBudWxscHRyOwogCiAgICAgUmVmUHRy PEpTT046OlZhbHVlPiByZXN1bHQ7Ci0gICAgY29uc3QgVUNoYXIqIHRva2VuU3RhcnQ7Ci0gICAg Y29uc3QgVUNoYXIqIHRva2VuRW5kOworICAgIGNvbnN0IENvZGVVbml0KiB0b2tlblN0YXJ0Owor ICAgIGNvbnN0IENvZGVVbml0KiB0b2tlbkVuZDsKICAgICBUb2tlbiB0b2tlbiA9IHBhcnNlVG9r ZW4oc3RhcnQsIGVuZCwgJnRva2VuU3RhcnQsICZ0b2tlbkVuZCk7CiAgICAgc3dpdGNoICh0b2tl bikgewogICAgIGNhc2UgVG9rZW46OkludmFsaWQ6CkBAIC01MDYsMjAgKzUxNSwzMiBAQCBSZWZQ dHI8QXJyYXk+IFZhbHVlOjphc0FycmF5KCkKIAogUmVmUHRyPFZhbHVlPiBWYWx1ZTo6cGFyc2VK U09OKGNvbnN0IFN0cmluZyYganNvbikKIHsKLSAgICAvLyBGSVhNRTogVGhpcyB3aG9sZSBmaWxl IHNob3VsZCBqdXN0IHVzZSBTdHJpbmdWaWV3IGluc3RlYWQgb2YgVUNoYXIvbGVuZ3RoIGFuZCBh dm9pZCB1cGNvbnZlcnRpbmcuCi0gICAgYXV0byBjaGFyYWN0ZXJzID0gU3RyaW5nVmlldyhqc29u KS51cGNvbnZlcnRlZENoYXJhY3RlcnMoKTsKLSAgICBjb25zdCBVQ2hhciogc3RhcnQgPSBjaGFy YWN0ZXJzOwotICAgIGNvbnN0IFVDaGFyKiBlbmQgPSBzdGFydCArIGpzb24ubGVuZ3RoKCk7Ci0g ICAgY29uc3QgVUNoYXIqIHRva2VuRW5kOwotICAgIGF1dG8gcmVzdWx0ID0gYnVpbGRWYWx1ZShz dGFydCwgZW5kLCAmdG9rZW5FbmQsIDApOwotICAgIGlmICghcmVzdWx0KQotICAgICAgICByZXR1 cm4gbnVsbHB0cjsKLQotICAgIGZvciAoY29uc3QgVUNoYXIqIHZhbHVlRW5kID0gdG9rZW5FbmQ7 IHZhbHVlRW5kIDwgZW5kOyArK3ZhbHVlRW5kKSB7Ci0gICAgICAgIGlmICghaXNTcGFjZU9yTmV3 bGluZSgqdmFsdWVFbmQpKQorICAgIGF1dG8gY29udGFpbnNOb25TcGFjZSA9IFtdIChjb25zdCBh dXRvKiBiZWdpbiwgY29uc3QgYXV0byogZW5kKSB7CisgICAgICAgIGlmICghYmVnaW4pCisgICAg ICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgICAgIGZvciAoY29uc3QgYXV0byogaXQgPSBiZWdp bjsgaXQgPCBlbmQ7IGl0KyspIHsKKyAgICAgICAgICAgIGlmICghaXNTcGFjZU9yTmV3bGluZSgq aXQpKQorICAgICAgICAgICAgICAgIHJldHVybiB0cnVlOworICAgICAgICB9CisgICAgICAgIHJl dHVybiBmYWxzZTsKKyAgICB9OworCisgICAgUmVmUHRyPFZhbHVlPiByZXN1bHQ7CisgICAgaWYg KGpzb24uaXM4Qml0KCkpIHsKKyAgICAgICAgY29uc3QgTENoYXIqIHN0YXJ0ID0ganNvbi5jaGFy YWN0ZXJzOCgpOworICAgICAgICBjb25zdCBMQ2hhciogZW5kID0gc3RhcnQgKyBqc29uLmxlbmd0 aCgpOworICAgICAgICBjb25zdCBMQ2hhciogdG9rZW5FbmQgeyBudWxscHRyIH07CisgICAgICAg IHJlc3VsdCA9IGJ1aWxkVmFsdWUoc3RhcnQsIGVuZCwgJnRva2VuRW5kLCAwKTsKKyAgICAgICAg aWYgKGNvbnRhaW5zTm9uU3BhY2UodG9rZW5FbmQsIGVuZCkpCisgICAgICAgICAgICByZXR1cm4g bnVsbHB0cjsKKyAgICB9IGVsc2UgeworICAgICAgICBjb25zdCBVQ2hhciogc3RhcnQgPSBqc29u LmNoYXJhY3RlcnMxNigpOworICAgICAgICBjb25zdCBVQ2hhciogZW5kID0gc3RhcnQgKyBqc29u Lmxlbmd0aCgpOworICAgICAgICBjb25zdCBVQ2hhciogdG9rZW5FbmQgeyBudWxscHRyIH07Cisg ICAgICAgIHJlc3VsdCA9IGJ1aWxkVmFsdWUoc3RhcnQsIGVuZCwgJnRva2VuRW5kLCAwKTsKKyAg ICAgICAgaWYgKGNvbnRhaW5zTm9uU3BhY2UodG9rZW5FbmQsIGVuZCkpCiAgICAgICAgICAgICBy ZXR1cm4gbnVsbHB0cjsKICAgICB9Ci0KICAgICByZXR1cm4gcmVzdWx0OwogfQogCg== 444783 2021-11-18 23:07:12 -0800 2021-11-19 07:57:51 -0800 Patch bug-233346-20211118230711.patch text/plain 6943 achristensen U3VidmVyc2lvbiBSZXZpc2lvbjogMjg2MDQxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IGM0ODk1NWI5NzBkNDAxZmY1MTg0ODBh NWM0NmM3ODAxMWU5YzVlODAuLmVkNjgzNjY2YjE5MWZiZDNiOGIwMDA2OGRiMjEyNGJiOGEzOTYz ZDEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMjEtMTEtMTggIEFsZXggQ2hyaXN0ZW5zZW4gIDxh Y2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KKworICAgICAgICBSZW1vdmUgYWxsb2NhdGlvbiBpbiBK U09OOjpWYWx1ZTo6cGFyc2VKU09OCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0yMzMzNDYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBQYXJzZSB0aGUgY2hhcmFjdGVycyBhcyBMYXRpbjEgY2hhcmFjdGVycyBp ZiB3ZSBoYXZlIGFuIDggYml0IHN0cmluZyByYXRoZXIgdGhhbiBjb252ZXJ0aW5nIHRoZW0gdG8g VVRGLTE2IGp1c3QgdG8gYmUgcGFyc2VkLgorCisgICAgICAgICogd3RmL0pTT05WYWx1ZXMuY3Bw OgorICAgICAgICAoV1RGOjpKU09OSW1wbDo6VmFsdWU6OnBhcnNlSlNPTik6CisKIDIwMjEtMTEt MTggIEFudG9pbmUgUXVpbnQgIDxncmFvdXRzQHdlYmtpdC5vcmc+CiAKICAgICAgICAgW01vZGVs XSBhZGQgc3VwcG9ydCBmb3IgZ2V0dGluZyBhbmQgc2V0dGluZyB0aGUgY2FtZXJhCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV1RGL3d0Zi9KU09OVmFsdWVzLmNwcCBiL1NvdXJjZS9XVEYvd3RmL0pTT05W YWx1ZXMuY3BwCmluZGV4IDlkNjljMWI3ZDQ2MWMyMmU5MWEwMTJkZGM3ZjY0NWI2MGU2YTYyNDcu LjUzZDU2Y2M3MzIyYTQyZjc2Y2Y0YTA5NWIwZmQyZTMyYjQxODEyMjEgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XVEYvd3RmL0pTT05WYWx1ZXMuY3BwCisrKyBiL1NvdXJjZS9XVEYvd3RmL0pTT05WYWx1 ZXMuY3BwCkBAIC02MSw3ICs2MSw4IEBAIGNvbnN0IGNoYXIqIGNvbnN0IG51bGxUb2tlbiA9ICJu dWxsIjsKIGNvbnN0IGNoYXIqIGNvbnN0IHRydWVUb2tlbiA9ICJ0cnVlIjsKIGNvbnN0IGNoYXIq IGNvbnN0IGZhbHNlVG9rZW4gPSAiZmFsc2UiOwogCi1ib29sIHBhcnNlQ29uc3RUb2tlbihjb25z dCBVQ2hhciogc3RhcnQsIGNvbnN0IFVDaGFyKiBlbmQsIGNvbnN0IFVDaGFyKiogdG9rZW5FbmQs IGNvbnN0IGNoYXIqIHRva2VuKQordGVtcGxhdGU8dHlwZW5hbWUgQ29kZVVuaXQ+Citib29sIHBh cnNlQ29uc3RUb2tlbihjb25zdCBDb2RlVW5pdCogc3RhcnQsIGNvbnN0IENvZGVVbml0KiBlbmQs IGNvbnN0IENvZGVVbml0KiogdG9rZW5FbmQsIGNvbnN0IGNoYXIqIHRva2VuKQogewogICAgIHdo aWxlIChzdGFydCA8IGVuZCAmJiAqdG9rZW4gIT0gJ1wwJyAmJiAqc3RhcnQrKyA9PSAqdG9rZW4r KykgeyB9CiAKQEAgLTcyLDcgKzczLDggQEAgYm9vbCBwYXJzZUNvbnN0VG9rZW4oY29uc3QgVUNo YXIqIHN0YXJ0LCBjb25zdCBVQ2hhciogZW5kLCBjb25zdCBVQ2hhcioqIHRva2VuRW4KICAgICBy ZXR1cm4gdHJ1ZTsKIH0KIAotYm9vbCByZWFkSW50KGNvbnN0IFVDaGFyKiBzdGFydCwgY29uc3Qg VUNoYXIqIGVuZCwgY29uc3QgVUNoYXIqKiB0b2tlbkVuZCwgYm9vbCBjYW5IYXZlTGVhZGluZ1pl cm9zKQordGVtcGxhdGU8dHlwZW5hbWUgQ29kZVVuaXQ+Citib29sIHJlYWRJbnQoY29uc3QgQ29k ZVVuaXQqIHN0YXJ0LCBjb25zdCBDb2RlVW5pdCogZW5kLCBjb25zdCBDb2RlVW5pdCoqIHRva2Vu RW5kLCBib29sIGNhbkhhdmVMZWFkaW5nWmVyb3MpCiB7CiAgICAgaWYgKHN0YXJ0ID09IGVuZCkK ICAgICAgICAgcmV0dXJuIGZhbHNlOwpAQCAtOTQsMTQgKzk2LDE1IEBAIGJvb2wgcmVhZEludChj b25zdCBVQ2hhciogc3RhcnQsIGNvbnN0IFVDaGFyKiBlbmQsIGNvbnN0IFVDaGFyKiogdG9rZW5F bmQsIGJvb2wKICAgICByZXR1cm4gdHJ1ZTsKIH0KIAotYm9vbCBwYXJzZU51bWJlclRva2VuKGNv bnN0IFVDaGFyKiBzdGFydCwgY29uc3QgVUNoYXIqIGVuZCwgY29uc3QgVUNoYXIqKiB0b2tlbkVu ZCkKK3RlbXBsYXRlPHR5cGVuYW1lIENvZGVVbml0PgorYm9vbCBwYXJzZU51bWJlclRva2VuKGNv bnN0IENvZGVVbml0KiBzdGFydCwgY29uc3QgQ29kZVVuaXQqIGVuZCwgY29uc3QgQ29kZVVuaXQq KiB0b2tlbkVuZCkKIHsKICAgICAvLyBXZSBqdXN0IGdyYWIgdGhlIG51bWJlciBoZXJlLiBXZSB2 YWxpZGF0ZSB0aGUgc2l6ZSBpbiBEZWNvZGVOdW1iZXIuCiAgICAgLy8gQWNjb3JkaW5nIHRvIFJG QyA0NjI3LCBhIHZhbGlkIG51bWJlciBpczogW21pbnVzXSBpbnQgW2ZyYWNdIFtleHBdCiAgICAg aWYgKHN0YXJ0ID09IGVuZCkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCi0gICAgVUNoYXIgYyA9 ICpzdGFydDsKKyAgICBDb2RlVW5pdCBjID0gKnN0YXJ0OwogICAgIGlmICgnLScgPT0gYykKICAg ICAgICAgKytzdGFydDsKIApAQCAtMTQ1LDcgKzE0OCw4IEBAIGJvb2wgcGFyc2VOdW1iZXJUb2tl bihjb25zdCBVQ2hhciogc3RhcnQsIGNvbnN0IFVDaGFyKiBlbmQsIGNvbnN0IFVDaGFyKiogdG9r ZW5FCiAgICAgcmV0dXJuIHRydWU7CiB9CiAKLWJvb2wgcmVhZEhleERpZ2l0cyhjb25zdCBVQ2hh ciogc3RhcnQsIGNvbnN0IFVDaGFyKiBlbmQsIGNvbnN0IFVDaGFyKiogdG9rZW5FbmQsIGludCBk aWdpdHMpCit0ZW1wbGF0ZTx0eXBlbmFtZSBDb2RlVW5pdD4KK2Jvb2wgcmVhZEhleERpZ2l0cyhj b25zdCBDb2RlVW5pdCogc3RhcnQsIGNvbnN0IENvZGVVbml0KiBlbmQsIGNvbnN0IENvZGVVbml0 KiogdG9rZW5FbmQsIGludCBkaWdpdHMpCiB7CiAgICAgaWYgKGVuZCAtIHN0YXJ0IDwgZGlnaXRz KQogICAgICAgICByZXR1cm4gZmFsc2U7CkBAIC0xNTksMTAgKzE2MywxMSBAQCBib29sIHJlYWRI ZXhEaWdpdHMoY29uc3QgVUNoYXIqIHN0YXJ0LCBjb25zdCBVQ2hhciogZW5kLCBjb25zdCBVQ2hh cioqIHRva2VuRW5kLAogICAgIHJldHVybiB0cnVlOwogfQogCi1ib29sIHBhcnNlU3RyaW5nVG9r ZW4oY29uc3QgVUNoYXIqIHN0YXJ0LCBjb25zdCBVQ2hhciogZW5kLCBjb25zdCBVQ2hhcioqIHRv a2VuRW5kKQordGVtcGxhdGU8dHlwZW5hbWUgQ29kZVVuaXQ+Citib29sIHBhcnNlU3RyaW5nVG9r ZW4oY29uc3QgQ29kZVVuaXQqIHN0YXJ0LCBjb25zdCBDb2RlVW5pdCogZW5kLCBjb25zdCBDb2Rl VW5pdCoqIHRva2VuRW5kKQogewogICAgIHdoaWxlIChzdGFydCA8IGVuZCkgewotICAgICAgICBV Q2hhciBjID0gKnN0YXJ0Kys7CisgICAgICAgIENvZGVVbml0IGMgPSAqc3RhcnQrKzsKICAgICAg ICAgaWYgKCdcXCcgPT0gYyAmJiBzdGFydCA8IGVuZCkgewogICAgICAgICAgICAgYyA9ICpzdGFy dCsrOwogICAgICAgICAgICAgLy8gTWFrZSBzdXJlIHRoZSBlc2NhcGVkIGNoYXIgaXMgdmFsaWQu CkBAIC0xOTcsNyArMjAyLDggQEAgYm9vbCBwYXJzZVN0cmluZ1Rva2VuKGNvbnN0IFVDaGFyKiBz dGFydCwgY29uc3QgVUNoYXIqIGVuZCwgY29uc3QgVUNoYXIqKiB0b2tlbkUKICAgICByZXR1cm4g ZmFsc2U7CiB9CiAKLVRva2VuIHBhcnNlVG9rZW4oY29uc3QgVUNoYXIqIHN0YXJ0LCBjb25zdCBV Q2hhciogZW5kLCBjb25zdCBVQ2hhcioqIHRva2VuU3RhcnQsIGNvbnN0IFVDaGFyKiogdG9rZW5F bmQpCit0ZW1wbGF0ZTx0eXBlbmFtZSBDb2RlVW5pdD4KK1Rva2VuIHBhcnNlVG9rZW4oY29uc3Qg Q29kZVVuaXQqIHN0YXJ0LCBjb25zdCBDb2RlVW5pdCogZW5kLCBjb25zdCBDb2RlVW5pdCoqIHRv a2VuU3RhcnQsIGNvbnN0IENvZGVVbml0KiogdG9rZW5FbmQpCiB7CiAgICAgd2hpbGUgKHN0YXJ0 IDwgZW5kICYmIGlzU3BhY2VPck5ld2xpbmUoKnN0YXJ0KSkKICAgICAgICAgKytzdGFydDsKQEAg LTI2MSw3ICsyNjcsOCBAQCBUb2tlbiBwYXJzZVRva2VuKGNvbnN0IFVDaGFyKiBzdGFydCwgY29u c3QgVUNoYXIqIGVuZCwgY29uc3QgVUNoYXIqKiB0b2tlblN0YXJ0LAogICAgIHJldHVybiBUb2tl bjo6SW52YWxpZDsKIH0KIAotYm9vbCBkZWNvZGVTdHJpbmcoY29uc3QgVUNoYXIqIHN0YXJ0LCBj b25zdCBVQ2hhciogZW5kLCBTdHJpbmdCdWlsZGVyJiBvdXRwdXQpCit0ZW1wbGF0ZTx0eXBlbmFt ZSBDb2RlVW5pdD4KK2Jvb2wgZGVjb2RlU3RyaW5nKGNvbnN0IENvZGVVbml0KiBzdGFydCwgY29u c3QgQ29kZVVuaXQqIGVuZCwgU3RyaW5nQnVpbGRlciYgb3V0cHV0KQogewogICAgIHdoaWxlIChz dGFydCA8IGVuZCkgewogICAgICAgICBVQ2hhciBjID0gKnN0YXJ0Kys7CkBAIC0zMTYsNyArMzIz LDggQEAgYm9vbCBkZWNvZGVTdHJpbmcoY29uc3QgVUNoYXIqIHN0YXJ0LCBjb25zdCBVQ2hhciog ZW5kLCBTdHJpbmdCdWlsZGVyJiBvdXRwdXQpCiAgICAgcmV0dXJuIHRydWU7CiB9CiAKLWJvb2wg ZGVjb2RlU3RyaW5nKGNvbnN0IFVDaGFyKiBzdGFydCwgY29uc3QgVUNoYXIqIGVuZCwgU3RyaW5n JiBvdXRwdXQpCit0ZW1wbGF0ZTx0eXBlbmFtZSBDb2RlVW5pdD4KK2Jvb2wgZGVjb2RlU3RyaW5n KGNvbnN0IENvZGVVbml0KiBzdGFydCwgY29uc3QgQ29kZVVuaXQqIGVuZCwgU3RyaW5nJiBvdXRw dXQpCiB7CiAgICAgaWYgKHN0YXJ0ID09IGVuZCkgewogICAgICAgICBvdXRwdXQgPSBlbXB0eVN0 cmluZygpOwpAQCAtMzM1LDE0ICszNDMsMTUgQEAgYm9vbCBkZWNvZGVTdHJpbmcoY29uc3QgVUNo YXIqIHN0YXJ0LCBjb25zdCBVQ2hhciogZW5kLCBTdHJpbmcmIG91dHB1dCkKICAgICByZXR1cm4g dHJ1ZTsKIH0KIAotUmVmUHRyPEpTT046OlZhbHVlPiBidWlsZFZhbHVlKGNvbnN0IFVDaGFyKiBz dGFydCwgY29uc3QgVUNoYXIqIGVuZCwgY29uc3QgVUNoYXIqKiB2YWx1ZVRva2VuRW5kLCBpbnQg ZGVwdGgpCit0ZW1wbGF0ZTx0eXBlbmFtZSBDb2RlVW5pdD4KK1JlZlB0cjxKU09OOjpWYWx1ZT4g YnVpbGRWYWx1ZShjb25zdCBDb2RlVW5pdCogc3RhcnQsIGNvbnN0IENvZGVVbml0KiBlbmQsIGNv bnN0IENvZGVVbml0KiogdmFsdWVUb2tlbkVuZCwgaW50IGRlcHRoKQogewogICAgIGlmIChkZXB0 aCA+IHN0YWNrTGltaXQpCiAgICAgICAgIHJldHVybiBudWxscHRyOwogCiAgICAgUmVmUHRyPEpT T046OlZhbHVlPiByZXN1bHQ7Ci0gICAgY29uc3QgVUNoYXIqIHRva2VuU3RhcnQ7Ci0gICAgY29u c3QgVUNoYXIqIHRva2VuRW5kOworICAgIGNvbnN0IENvZGVVbml0KiB0b2tlblN0YXJ0OworICAg IGNvbnN0IENvZGVVbml0KiB0b2tlbkVuZDsKICAgICBUb2tlbiB0b2tlbiA9IHBhcnNlVG9rZW4o c3RhcnQsIGVuZCwgJnRva2VuU3RhcnQsICZ0b2tlbkVuZCk7CiAgICAgc3dpdGNoICh0b2tlbikg ewogICAgIGNhc2UgVG9rZW46OkludmFsaWQ6CkBAIC01MDYsMjAgKzUxNSwzMiBAQCBSZWZQdHI8 QXJyYXk+IFZhbHVlOjphc0FycmF5KCkKIAogUmVmUHRyPFZhbHVlPiBWYWx1ZTo6cGFyc2VKU09O KGNvbnN0IFN0cmluZyYganNvbikKIHsKLSAgICAvLyBGSVhNRTogVGhpcyB3aG9sZSBmaWxlIHNo b3VsZCBqdXN0IHVzZSBTdHJpbmdWaWV3IGluc3RlYWQgb2YgVUNoYXIvbGVuZ3RoIGFuZCBhdm9p ZCB1cGNvbnZlcnRpbmcuCi0gICAgYXV0byBjaGFyYWN0ZXJzID0gU3RyaW5nVmlldyhqc29uKS51 cGNvbnZlcnRlZENoYXJhY3RlcnMoKTsKLSAgICBjb25zdCBVQ2hhciogc3RhcnQgPSBjaGFyYWN0 ZXJzOwotICAgIGNvbnN0IFVDaGFyKiBlbmQgPSBzdGFydCArIGpzb24ubGVuZ3RoKCk7Ci0gICAg Y29uc3QgVUNoYXIqIHRva2VuRW5kOwotICAgIGF1dG8gcmVzdWx0ID0gYnVpbGRWYWx1ZShzdGFy dCwgZW5kLCAmdG9rZW5FbmQsIDApOwotICAgIGlmICghcmVzdWx0KQotICAgICAgICByZXR1cm4g bnVsbHB0cjsKLQotICAgIGZvciAoY29uc3QgVUNoYXIqIHZhbHVlRW5kID0gdG9rZW5FbmQ7IHZh bHVlRW5kIDwgZW5kOyArK3ZhbHVlRW5kKSB7Ci0gICAgICAgIGlmICghaXNTcGFjZU9yTmV3bGlu ZSgqdmFsdWVFbmQpKQorICAgIGF1dG8gY29udGFpbnNOb25TcGFjZSA9IFtdIChjb25zdCBhdXRv KiBiZWdpbiwgY29uc3QgYXV0byogZW5kKSB7CisgICAgICAgIGlmICghYmVnaW4pCisgICAgICAg ICAgICByZXR1cm4gZmFsc2U7CisgICAgICAgIGZvciAoY29uc3QgYXV0byogaXQgPSBiZWdpbjsg aXQgPCBlbmQ7IGl0KyspIHsKKyAgICAgICAgICAgIGlmICghaXNTcGFjZU9yTmV3bGluZSgqaXQp KQorICAgICAgICAgICAgICAgIHJldHVybiB0cnVlOworICAgICAgICB9CisgICAgICAgIHJldHVy biBmYWxzZTsKKyAgICB9OworCisgICAgUmVmUHRyPFZhbHVlPiByZXN1bHQ7CisgICAgaWYgKGpz b24uaXM4Qml0KCkpIHsKKyAgICAgICAgY29uc3QgTENoYXIqIHN0YXJ0ID0ganNvbi5jaGFyYWN0 ZXJzOCgpOworICAgICAgICBjb25zdCBMQ2hhciogZW5kID0gc3RhcnQgKyBqc29uLmxlbmd0aCgp OworICAgICAgICBjb25zdCBMQ2hhciogdG9rZW5FbmQgeyBudWxscHRyIH07CisgICAgICAgIHJl c3VsdCA9IGJ1aWxkVmFsdWUoc3RhcnQsIGVuZCwgJnRva2VuRW5kLCAwKTsKKyAgICAgICAgaWYg KGNvbnRhaW5zTm9uU3BhY2UodG9rZW5FbmQsIGVuZCkpCisgICAgICAgICAgICByZXR1cm4gbnVs bHB0cjsKKyAgICB9IGVsc2UgeworICAgICAgICBjb25zdCBVQ2hhciogc3RhcnQgPSBqc29uLmNo YXJhY3RlcnMxNigpOworICAgICAgICBjb25zdCBVQ2hhciogZW5kID0gc3RhcnQgKyBqc29uLmxl bmd0aCgpOworICAgICAgICBjb25zdCBVQ2hhciogdG9rZW5FbmQgeyBudWxscHRyIH07CisgICAg ICAgIHJlc3VsdCA9IGJ1aWxkVmFsdWUoc3RhcnQsIGVuZCwgJnRva2VuRW5kLCAwKTsKKyAgICAg ICAgaWYgKGNvbnRhaW5zTm9uU3BhY2UodG9rZW5FbmQsIGVuZCkpCiAgICAgICAgICAgICByZXR1 cm4gbnVsbHB0cjsKICAgICB9Ci0KICAgICByZXR1cm4gcmVzdWx0OwogfQogCg==