225560 2021-05-08 12:23:57 -0700 Rename toIntegralType to parseInteger and prepare to use it to replace all our integer-parsing functions 2021-05-08 18:00:17 -0700 1 1 1 Unclassified WebKit Web Template Framework WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 darin darin benjamin cdumez cmarcelo ews-watchlist sam webkit-bug-importer oldest_to_newest 1758201 0 darin 2021-05-08 12:23:57 -0700 Rename toIntegralType to parseInteger and prepare to use it to replace all our integer-parsing functions 1758203 1 428091 darin 2021-05-08 12:33:38 -0700 Created attachment 428091 Patch 1758245 2 ews-feeder 2021-05-08 17:59:35 -0700 Committed r277234 (237503@main): <https://commits.webkit.org/237503@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 428091. 1758246 3 webkit-bug-importer 2021-05-08 18:00:17 -0700 <rdar://problem/77702373> 428091 2021-05-08 12:33:38 -0700 2021-05-08 17:59:37 -0700 Patch bug-225560-20210508123337.patch text/plain 15271 darin U3VidmVyc2lvbiBSZXZpc2lvbjogMjc3MjMwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IDI4NGJjZTZhZGMzMWU5ZDg3NWI4ZWI4 YmMzYzU0NGU5OTM2NzgwODYuLmI1ZjhhZWY2MTRiMzQzMmQzNGZjMzFjNDcxM2JmNDhjZmI0NDUy MDMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsNDAgQEAKKzIwMjEtMDUtMDggIERhcmluIEFkbGVyICA8ZGFyaW5A YXBwbGUuY29tPgorCisgICAgICAgIFJlbmFtZSB0b0ludGVncmFsVHlwZSB0byBwYXJzZUludGVn ZXIgYW5kIHByZXBhcmUgdG8gdXNlIGl0IHRvIHJlcGxhY2UgYWxsIG91ciBpbnRlZ2VyLXBhcnNp bmcgZnVuY3Rpb25zCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0yMjU1NjAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBJIGhhdmUgYSBtdWNoIGxhcmdlciBwYXRjaCB0aGF0IHJlcGxhY2VzIGFsbCB0aGUgbWFu eSB0b0ludCBmdW5jdGlvbnMgd2l0aCB0aGVzZSBwYXJzZUludGVnZXIKKyAgICAgICAgZnVuY3Rp b24gdGVtcGxhdGVzLiBUaGUgcGFyc2VJbnRlZ2VyIG9uZXMgdGFrZSBTdHJpbmdWaWV3LCB3aGlj aCBtZWFucyB3ZSBjYW4gcGFzcyBhbG1vc3QgYW55CisgICAgICAgIHR5cGUgb2Ygc3RyaW5nIG9y IGNoYXJhY3Rlci9sZW5ndGggcGFpciBpbmNsdWRpbmcgYSBzdWJzdHJpbmcgd2l0aG91dCBhbGxv Y2F0aW5nIGEgbmV3IHN0cmluZywKKyAgICAgICAgcmV0dXJuIE9wdGlvbmFsIHJhdGhlciB0aGFu IHVzaW5nIGFuIG91dCBhcmd1bWVudCB0byByZXBvcnQgZmFpbHVyZSwgdGFrZSB0aGUgaW50ZWdl ciB0eXBlIGFzCisgICAgICAgIGEgdGVtcGxhdGUgcGFyYW1ldGVyIHNvIGNhbiBiZSB1c2VkIGZv ciBwcmVjaXNlbHkgdGhlIGRlc2lyZWQgdHlwZSBhdCBlYWNoIGNhbGwgc2l0ZSwgYW5kIG1ha2UK KyAgICAgICAgdGhlICJhbGxvdyB0cmFpbGluZyBqdW5rIiBmZWF0dXJlIGV4cGxpY2l0LCByYXRo ZXIgdGhhbiBpbXBsaWNpdGx5IGluY2x1ZGluZyBpdCBpbiB0aGUgc2hvcnRlc3QKKyAgICAgICAg bmFtZWQgZnVuY3Rpb25zLCB3aGljaCBJIGhvcGUgd2lsbCBkaXNjb3VyYWdlIHBlb3BsZSBmcm9t IHVzaW5nIHRoYXQganVuay1pZ25vcmluZyBtb2RlCisgICAgICAgIHdoZW4gaXQncyBub3QgZGVz aXJhYmxlLgorCisgICAgICAgIEFsc28gaW5jbHVkZXMgYWRvcHRpb24gb2YgcGFyc2VJbnRlZ2Vy IHdpdGhpbiBXVEYgaXRzZWxmLCBvdXRzaWRlIHRoZSBzdHJpbmcgY2xhc3Nlcy4KKworICAgICAg ICBNeSBwbGFuIGlzIHRvIGxhbmQgdGhlIHJlc3Qgb2YgYWRvcHRpb24gb2YgdGhpcyBpbiBjaHVu a3Mgc28gd2UgY2FuIHJldmlldyBjYXJlZnVsbHkgYW5kIHNwb3QKKyAgICAgICAgbWlzdGFrZXMg YXMgd2UgZ28uIFRoZW4gcmV0dXJuIHRvIGZpbGVzIGxpa2UgV1RGU3RyaW5nLmggYW5kIHJlbW92 ZSB0aGUgbWFueSBvbGQgZnVuY3Rpb25zCisgICAgICAgIHRoaXMgcmVwbGFjZXMsIGluY2x1ZGlu ZyB0aGUgU3RyaW5nOjp0b0ludCBhbmQgY2hhcmFjdGVyc1RvSW50IGZhbWlsaWVzIG9mIGZ1bmN0 aW9ucy4KKworICAgICAgICAqIHd0Zi9VUkwuY3BwOgorICAgICAgICAoV1RGOjpVUkw6OnBvcnQg Y29uc3QpOiBVc2UgcGFyc2VJbnRlZ2VyPHVpbnQxNl90Pi4KKyAgICAgICAgKFdURjo6VVJMOjpz ZXRIb3N0QW5kUG9ydCk6IERpdHRvLgorCisgICAgICAgICogd3RmL3RleHQvU3RyaW5nVG9JbnRl Z2VyQ29udmVyc2lvbi5oOiBSZWZhY3RvcmVkIHRoZSBleGlzdGluZyBjb2RlIHRvIHRpZ2h0ZW4g dGhpbmdzIHVwCisgICAgICAgIGEgYml0LCBhbmQgZ290IHJpZCBvZiBvdmVybG9hZHMgdGhhdCB0 YWtlIHBvaW50ZXIgYW5kIGxlbmd0aCBhbmQgdGhlIHRoZSBnZW5lcmljICJhbnkgc3RyaW5nCisg ICAgICAgIHR5cGUiIGZlYXR1cmUsIHNpbmNlIFN0cmluZ1ZpZXcgYWxyZWFkeSB3b3JrcyB3ZWxs IGZvciB0aGF0LiBSZW5hbWVkIHRvSW50ZWdyYWxUeXBlIHRvCisgICAgICAgIHBhcnNlSW50ZWdl ciwgbGVhdmluZyB0aGUgb2xkIG5hbWUgYmVoaW5kIHRvIGVhc2UgdGhlIHRyYW5zaXRpb24gd2hp bGUgYWRvcHRpbmcgcGFyc2VJbnRlZ2VyLgorCisgICAgICAgICogd3RmL3RleHQvV1RGU3RyaW5n LmNwcDoKKyAgICAgICAgKFdURjo6dG9Eb3VibGVUeXBlKTogVXNlIHRoZSBUcmFpbGluZ0p1bmtQ b2xpY3kgZW51bWVyYXRpb24gZnJvbSB0aGUKKyAgICAgICAgU3RyaW5nVG9JbnRlZ2VyQ29udmVy c2lvbi5oIGhlYWRlci4KKyAgICAgICAgKFdURjo6Y2hhcmFjdGVyc1RvRG91YmxlKTogRGl0dG8u CisgICAgICAgIChXVEY6OmNoYXJhY3RlcnNUb0Zsb2F0KTogRGl0dG8uCisKIDIwMjEtMDUtMDgg IERpZWdvIFBpbm8gR2FyY2lhICA8ZHBpbm9AaWdhbGlhLmNvbT4KIAogICAgICAgICBbR0xJQl0g UkVHUkVTU0lPTihyMjc3MTU4KSBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL3hoci9G b3JtRGF0YS1hcHBlbmQuaHRtbCBpcyBjcmFzaGluZwpkaWZmIC0tZ2l0IGEvU291cmNlL1dURi93 dGYvVVJMLmNwcCBiL1NvdXJjZS9XVEYvd3RmL1VSTC5jcHAKaW5kZXggMDlhOTZiYmU2MGJjYTFi NGU4ODk2ODViOGYzMzg4ZTdlNjJjZThkYy4uYTVkNzRhZmVhZWNlZWE3Y2RkZjdiYjE3OWQ0MjNk OWRmYzk1MmMwZCAxMDA2NDQKLS0tIGEvU291cmNlL1dURi93dGYvVVJMLmNwcAorKysgYi9Tb3Vy Y2UvV1RGL3d0Zi9VUkwuY3BwCkBAIC0zOCw2ICszOCw3IEBACiAjaW5jbHVkZSA8d3RmL3RleHQv Q1N0cmluZy5oPgogI2luY2x1ZGUgPHd0Zi90ZXh0L1N0cmluZ0J1aWxkZXIuaD4KICNpbmNsdWRl IDx3dGYvdGV4dC9TdHJpbmdIYXNoLmg+CisjaW5jbHVkZSA8d3RmL3RleHQvU3RyaW5nVG9JbnRl Z2VyQ29udmVyc2lvbi5oPgogI2luY2x1ZGUgPHd0Zi90ZXh0L1RleHRTdHJlYW0uaD4KIAogbmFt ZXNwYWNlIFdURiB7CkBAIC0xMzMsNyArMTM0LDcgQEAgU3RyaW5nVmlldyBVUkw6Omhvc3QoKSBj b25zdAogCiBPcHRpb25hbDx1aW50MTZfdD4gVVJMOjpwb3J0KCkgY29uc3QKIHsKLSAgICByZXR1 cm4gbV9wb3J0TGVuZ3RoID8gcGFyc2VVSW50MTYoU3RyaW5nVmlldyhtX3N0cmluZykuc3Vic3Ry aW5nKG1faG9zdEVuZCArIDEsIG1fcG9ydExlbmd0aCAtIDEpKSA6IFdURjo6bnVsbG9wdDsKKyAg ICByZXR1cm4gbV9wb3J0TGVuZ3RoID8gcGFyc2VJbnRlZ2VyPHVpbnQxNl90PihTdHJpbmdWaWV3 KG1fc3RyaW5nKS5zdWJzdHJpbmcobV9ob3N0RW5kICsgMSwgbV9wb3J0TGVuZ3RoIC0gMSkpIDog V1RGOjpudWxsb3B0OwogfQogCiBTdHJpbmcgVVJMOjpob3N0QW5kUG9ydCgpIGNvbnN0CkBAIC01 MDMsNyArNTA0LDcgQEAgdm9pZCBVUkw6OnNldEhvc3RBbmRQb3J0KFN0cmluZ1ZpZXcgaG9zdEFu ZFBvcnQpCiAgICAgICAgIC8vIE11bHRpcGxlIGNvbG9ucyBhcmUgYWNjZXB0YWJsZSBvbmx5IGlu IGNhc2Ugb2YgSVB2Ni4KICAgICAgICAgaWYgKGhvc3ROYW1lLmNvbnRhaW5zKCc6JykgJiYgIWhv c3ROYW1lLnN0YXJ0c1dpdGgoJ1snKSkKICAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgaWYg KCFwYXJzZVVJbnQxNihwb3J0U3RyaW5nKSkKKyAgICAgICAgaWYgKCFwYXJzZUludGVnZXI8dWlu dDE2X3Q+KHBvcnRTdHJpbmcpKQogICAgICAgICAgICAgcG9ydFN0cmluZyA9IHsgfTsKICAgICB9 CiAgICAgaWYgKGhvc3ROYW1lLmlzRW1wdHkoKSkgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dURi93 dGYvdGV4dC9TdHJpbmdUb0ludGVnZXJDb252ZXJzaW9uLmggYi9Tb3VyY2UvV1RGL3d0Zi90ZXh0 L1N0cmluZ1RvSW50ZWdlckNvbnZlcnNpb24uaAppbmRleCA0MDlhMzllOTMxZjY4MDgyOTJkY2E0 YzAyY2Q5MTM2MThkMmQ5YmI4Li5mMGIzZWVmNDE5NWEzMjBiZWMyNTA2Yjc0ZGM5ODU3ZWQ0YmQ4 MzA3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV1RGL3d0Zi90ZXh0L1N0cmluZ1RvSW50ZWdlckNvbnZl cnNpb24uaAorKysgYi9Tb3VyY2UvV1RGL3d0Zi90ZXh0L1N0cmluZ1RvSW50ZWdlckNvbnZlcnNp b24uaApAQCAtMSw1ICsxLDUgQEAKIC8qCi0gKiBDb3B5cmlnaHQgKEMpIDIwMTgtMjAxOSBBcHBs ZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKiBDb3B5cmlnaHQgKEMpIDIwMTgtMjAyMSBB cHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAgKgogICogUmVkaXN0cmlidXRpb24gYW5k IHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CiAgKiBtb2Rp ZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRp dGlvbnMKQEAgLTI1LDQ2ICsyNSwzNSBAQAogCiAjcHJhZ21hIG9uY2UKIAotI2luY2x1ZGUgPHVu aWNvZGUvdXR5cGVzLmg+Ci0jaW5jbHVkZSA8d3RmL0FTQ0lJQ1R5cGUuaD4KICNpbmNsdWRlIDx3 dGYvQ2hlY2tlZEFyaXRobWV0aWMuaD4KKyNpbmNsdWRlIDx3dGYvdGV4dC9TdHJpbmdWaWV3Lmg+ CiAKIG5hbWVzcGFjZSBXVEYgewogCi1pbmxpbmUgYm9vbCBpc0NoYXJhY3RlckFsbG93ZWRJbkJh c2UoVUNoYXIgYywgaW50IGJhc2UpCi17Ci0gICAgaWYgKGMgPiAweDdGKQotICAgICAgICByZXR1 cm4gZmFsc2U7Ci0gICAgaWYgKGlzQVNDSUlEaWdpdChjKSkKLSAgICAgICAgcmV0dXJuIGMgLSAn MCcgPCBiYXNlOwotICAgIGlmIChpc0FTQ0lJQWxwaGEoYykpIHsKLSAgICAgICAgaWYgKGJhc2Ug PiAzNikKLSAgICAgICAgICAgIGJhc2UgPSAzNjsKLSAgICAgICAgcmV0dXJuIChjID49ICdhJyAm JiBjIDwgJ2EnICsgYmFzZSAtIDEwKQotICAgICAgICAgICAgfHwgKGMgPj0gJ0EnICYmIGMgPCAn QScgKyBiYXNlIC0gMTApOwotICAgIH0KLSAgICByZXR1cm4gZmFsc2U7Ci19CisvLyBUaGUgcGFy c2VJbnRlZ2VyIGZ1bmN0aW9uIHRlbXBsYXRlIGFsbG93cyBsZWFkaW5nIGFuZCB0cmFpbGluZyBz cGFjZXMgYXMgZGVmaW5lZCBieSBpc0FTQ0lJU3BhY2UsIGFuZCwgYWZ0ZXIgdGhlIGxlYWRpbmcg c3BhY2VzLCBhbGxvd3MgYSBzaW5nbGUgbGVhZGluZyAiKyIuCisvLyBUaGUgcGFyc2VJbnRlZ2Vy QWxsb3dpbmdUcmFpbGluZ0p1bmsgZnVuY3Rpb24gdGVtcGxhdGUgaXMgbGlrZSBwYXJzZUludGVn ZXIsIGJ1dCBhbGxvd3MgYW55IGNoYXJhY3RlcnMgYWZ0ZXIgdGhlIGludGVnZXIuCiAKLXRlbXBs YXRlPHR5cGVuYW1lIEludGVncmFsVHlwZSwgdHlwZW5hbWUgQ2hhcmFjdGVyVHlwZT4KLWlubGlu ZSBJbnRlZ3JhbFR5cGUgdG9JbnRlZ3JhbFR5cGUoY29uc3QgQ2hhcmFjdGVyVHlwZSogZGF0YSwg c2l6ZV90IGxlbmd0aCwgYm9vbCogb2ssIGludCBiYXNlID0gMTApCi17Ci0gICAgc3RhdGljIGNv bnN0ZXhwciBib29sIGlzU2lnbmVkID0gc3RkOjpudW1lcmljX2xpbWl0czxJbnRlZ3JhbFR5cGU+ Ojppc19zaWduZWQ7CisvLyBGSVhNRTogU2hvdWxkIHdlIGFkZCBhIHZlcnNpb24gdGhhdCBkb2Vz IG5vdCBhbGxvdyAiKyI/CisvLyBGSVhNRTogU2hvdWxkIHdlIGFkZCBhIHZlcnNpb24gdGhhdCBh bGxvd3Mgb3RoZXIgZGVmaW5pdGlvbnMgb2Ygc3BhY2VzLCBsaWtlIGlzSFRNTFNwYWNlIG9yIGlz SFRUUFNwYWNlPworLy8gRklYTUU6IFNob3VsZCB3ZSBhZGQgYSB2ZXJzaW9uIHRoYXQgZG9lcyBu b3QgYWxsb3cgbGVhZGluZyBhbmQgdHJhaWxpbmcgc3BhY2VzPwogCi0gICAgQ2hlY2tlZDxJbnRl Z3JhbFR5cGUsIFJlY29yZE92ZXJmbG93PiB2YWx1ZTsKLSAgICBib29sIGlzT2sgPSBmYWxzZTsK LSAgICBib29sIGlzTmVnYXRpdmUgPSBmYWxzZTsKK3RlbXBsYXRlPHR5cGVuYW1lIEludGVncmFs VHlwZT4gT3B0aW9uYWw8SW50ZWdyYWxUeXBlPiBwYXJzZUludGVnZXIoU3RyaW5nVmlldywgdWlu dDhfdCBiYXNlID0gMTApOwordGVtcGxhdGU8dHlwZW5hbWUgSW50ZWdyYWxUeXBlPiBPcHRpb25h bDxJbnRlZ3JhbFR5cGU+IHBhcnNlSW50ZWdlckFsbG93aW5nVHJhaWxpbmdKdW5rKFN0cmluZ1Zp ZXcsIHVpbnQ4X3QgYmFzZSA9IDEwKTsKIAorZW51bSBjbGFzcyBUcmFpbGluZ0p1bmtQb2xpY3kg eyBEaXNhbGxvdywgQWxsb3cgfTsKKwordGVtcGxhdGU8dHlwZW5hbWUgSW50ZWdyYWxUeXBlLCB0 eXBlbmFtZSBDaGFyYWN0ZXJUeXBlPiBPcHRpb25hbDxJbnRlZ3JhbFR5cGU+IHBhcnNlSW50ZWdl cihjb25zdCBDaGFyYWN0ZXJUeXBlKiBkYXRhLCBzaXplX3QgbGVuZ3RoLCB1aW50OF90IGJhc2Us IFRyYWlsaW5nSnVua1BvbGljeSBwb2xpY3kpCit7CiAgICAgaWYgKCFkYXRhKQotICAgICAgICBn b3RvIGJ5ZTsKKyAgICAgICAgcmV0dXJuIFdURjo6bnVsbG9wdDsKIAotICAgIC8vIHNraXAgbGVh ZGluZyB3aGl0ZXNwYWNlCi0gICAgd2hpbGUgKGxlbmd0aCAmJiBpc1NwYWNlT3JOZXdsaW5lKCpk YXRhKSkgeworICAgIHdoaWxlIChsZW5ndGggJiYgaXNBU0NJSVNwYWNlKCpkYXRhKSkgewogICAg ICAgICAtLWxlbmd0aDsKICAgICAgICAgKytkYXRhOwogICAgIH0KIAotICAgIGlmIChpc1NpZ25l ZCAmJiBsZW5ndGggJiYgKmRhdGEgPT0gJy0nKSB7CisgICAgYm9vbCBpc05lZ2F0aXZlID0gZmFs c2U7CisgICAgaWYgKHN0ZDo6aXNfc2lnbmVkX3Y8SW50ZWdyYWxUeXBlPiAmJiBsZW5ndGggJiYg KmRhdGEgPT0gJy0nKSB7CiAgICAgICAgIC0tbGVuZ3RoOwogICAgICAgICArK2RhdGE7CiAgICAg ICAgIGlzTmVnYXRpdmUgPSB0cnVlOwpAQCAtNzMsNzMgKzYyLDgzIEBAIGlubGluZSBJbnRlZ3Jh bFR5cGUgdG9JbnRlZ3JhbFR5cGUoY29uc3QgQ2hhcmFjdGVyVHlwZSogZGF0YSwgc2l6ZV90IGxl bmd0aCwgYm9vCiAgICAgICAgICsrZGF0YTsKICAgICB9CiAKLSAgICBpZiAoIWxlbmd0aCB8fCAh aXNDaGFyYWN0ZXJBbGxvd2VkSW5CYXNlKCpkYXRhLCBiYXNlKSkKLSAgICAgICAgZ290byBieWU7 CisgICAgYXV0byBpc0NoYXJhY3RlckFsbG93ZWRJbkJhc2UgPSBbXSAoYXV0byBjaGFyYWN0ZXIs IGF1dG8gYmFzZSkgeworICAgICAgICBpZiAoaXNBU0NJSURpZ2l0KGNoYXJhY3RlcikpCisgICAg ICAgICAgICByZXR1cm4gY2hhcmFjdGVyIC0gJzAnIDwgYmFzZTsKKyAgICAgICAgcmV0dXJuIHRv QVNDSUlMb3dlclVuY2hlY2tlZChjaGFyYWN0ZXIpID49ICdhJyAmJiB0b0FTQ0lJTG93ZXJVbmNo ZWNrZWQoY2hhcmFjdGVyKSA8ICdhJyArIHN0ZDo6bWluKGJhc2UgLSAxMCwgMjYpOworICAgIH07 CiAKLSAgICB3aGlsZSAobGVuZ3RoICYmIGlzQ2hhcmFjdGVyQWxsb3dlZEluQmFzZSgqZGF0YSwg YmFzZSkpIHsKLSAgICAgICAgLS1sZW5ndGg7Ci0gICAgICAgIEludGVncmFsVHlwZSBkaWdpdFZh bHVlOwotICAgICAgICBhdXRvIGMgPSAqZGF0YTsKLSAgICAgICAgaWYgKGlzQVNDSUlEaWdpdChj KSkKLSAgICAgICAgICAgIGRpZ2l0VmFsdWUgPSBjIC0gJzAnOwotICAgICAgICBlbHNlIGlmIChj ID49ICdhJykKLSAgICAgICAgICAgIGRpZ2l0VmFsdWUgPSBjIC0gJ2EnICsgMTA7Ci0gICAgICAg IGVsc2UKLSAgICAgICAgICAgIGRpZ2l0VmFsdWUgPSBjIC0gJ0EnICsgMTA7CisgICAgaWYgKCEo bGVuZ3RoICYmIGlzQ2hhcmFjdGVyQWxsb3dlZEluQmFzZSgqZGF0YSwgYmFzZSkpKQorICAgICAg ICByZXR1cm4gV1RGOjpudWxsb3B0OwogCisgICAgQ2hlY2tlZDxJbnRlZ3JhbFR5cGUsIFJlY29y ZE92ZXJmbG93PiB2YWx1ZTsKKyAgICBkbyB7CisgICAgICAgIEludGVncmFsVHlwZSBkaWdpdFZh bHVlID0gaXNBU0NJSURpZ2l0KCpkYXRhKSA/ICpkYXRhIC0gJzAnIDogdG9BU0NJSUxvd2VyVW5j aGVja2VkKCpkYXRhKSAtICdhJyArIDEwOwogICAgICAgICB2YWx1ZSAqPSBzdGF0aWNfY2FzdDxJ bnRlZ3JhbFR5cGU+KGJhc2UpOwogICAgICAgICBpZiAoaXNOZWdhdGl2ZSkKICAgICAgICAgICAg IHZhbHVlIC09IGRpZ2l0VmFsdWU7CiAgICAgICAgIGVsc2UKICAgICAgICAgICAgIHZhbHVlICs9 IGRpZ2l0VmFsdWU7Ci0gICAgICAgICsrZGF0YTsKLSAgICB9CisgICAgfSB3aGlsZSAoLS1sZW5n dGggJiYgaXNDaGFyYWN0ZXJBbGxvd2VkSW5CYXNlKCorK2RhdGEsIGJhc2UpKTsKIAogICAgIGlm IChVTkxJS0VMWSh2YWx1ZS5oYXNPdmVyZmxvd2VkKCkpKQotICAgICAgICBnb3RvIGJ5ZTsKKyAg ICAgICAgcmV0dXJuIFdURjo6bnVsbG9wdDsKIAotICAgIC8vIHNraXAgdHJhaWxpbmcgc3BhY2UK LSAgICB3aGlsZSAobGVuZ3RoICYmIGlzU3BhY2VPck5ld2xpbmUoKmRhdGEpKSB7Ci0gICAgICAg IC0tbGVuZ3RoOwotICAgICAgICArK2RhdGE7CisgICAgaWYgKHBvbGljeSA9PSBUcmFpbGluZ0p1 bmtQb2xpY3k6OkRpc2FsbG93KSB7CisgICAgICAgIHdoaWxlIChsZW5ndGggJiYgaXNBU0NJSVNw YWNlKCpkYXRhKSkgeworICAgICAgICAgICAgLS1sZW5ndGg7CisgICAgICAgICAgICArK2RhdGE7 CisgICAgICAgIH0KKyAgICAgICAgaWYgKGxlbmd0aCkKKyAgICAgICAgICAgIHJldHVybiBXVEY6 Om51bGxvcHQ7CiAgICAgfQogCi0gICAgaWYgKCFsZW5ndGgpCi0gICAgICAgIGlzT2sgPSB0cnVl OwotYnllOgorICAgIHJldHVybiB2YWx1ZS51bnNhZmVHZXQoKTsKK30KKwordGVtcGxhdGU8dHlw ZW5hbWUgSW50ZWdyYWxUeXBlPiBPcHRpb25hbDxJbnRlZ3JhbFR5cGU+IHBhcnNlSW50ZWdlcihT dHJpbmdWaWV3IHN0cmluZywgdWludDhfdCBiYXNlKQoreworICAgIGlmIChzdHJpbmcuaXM4Qml0 KCkpCisgICAgICAgIHJldHVybiBwYXJzZUludGVnZXI8SW50ZWdyYWxUeXBlPihzdHJpbmcuY2hh cmFjdGVyczgoKSwgc3RyaW5nLmxlbmd0aCgpLCBiYXNlLCBUcmFpbGluZ0p1bmtQb2xpY3k6OkRp c2FsbG93KTsKKyAgICByZXR1cm4gcGFyc2VJbnRlZ2VyPEludGVncmFsVHlwZT4oc3RyaW5nLmNo YXJhY3RlcnMxNigpLCBzdHJpbmcubGVuZ3RoKCksIGJhc2UsIFRyYWlsaW5nSnVua1BvbGljeTo6 RGlzYWxsb3cpOworfQorCit0ZW1wbGF0ZTx0eXBlbmFtZSBJbnRlZ3JhbFR5cGU+IE9wdGlvbmFs PEludGVncmFsVHlwZT4gcGFyc2VJbnRlZ2VyQWxsb3dpbmdUcmFpbGluZ0p1bmsoU3RyaW5nVmll dyBzdHJpbmcsIHVpbnQ4X3QgYmFzZSkKK3sKKyAgICBpZiAoc3RyaW5nLmlzOEJpdCgpKQorICAg ICAgICByZXR1cm4gcGFyc2VJbnRlZ2VyPEludGVncmFsVHlwZT4oc3RyaW5nLmNoYXJhY3RlcnM4 KCksIHN0cmluZy5sZW5ndGgoKSwgYmFzZSwgVHJhaWxpbmdKdW5rUG9saWN5OjpBbGxvdyk7Cisg ICAgcmV0dXJuIHBhcnNlSW50ZWdlcjxJbnRlZ3JhbFR5cGU+KHN0cmluZy5jaGFyYWN0ZXJzMTYo KSwgc3RyaW5nLmxlbmd0aCgpLCBiYXNlLCBUcmFpbGluZ0p1bmtQb2xpY3k6OkFsbG93KTsKK30K KworLy8gRklYTUU6IERlcHJlY2F0ZWQuIFJlbW92ZSB0b0ludGVncmFsVHlwZSBlbnRpcmVseSBv bmNlIHdlIGdldCBtb3ZlIGFsbCBjYWxsZXJzIHRvIHBhcnNlSW50ZWdlci4KK3RlbXBsYXRlPHR5 cGVuYW1lIEludGVncmFsVHlwZSwgdHlwZW5hbWUgU3RyaW5nT3JTdHJpbmdWaWV3PiBJbnRlZ3Jh bFR5cGUgdG9JbnRlZ3JhbFR5cGUoY29uc3QgU3RyaW5nT3JTdHJpbmdWaWV3JiBzdHJpbmdWaWV3 LCBib29sKiBvaywgaW50IGJhc2UgPSAxMCkKK3sKKyAgICBhdXRvIHJlc3VsdCA9IHBhcnNlSW50 ZWdlcjxJbnRlZ3JhbFR5cGU+KHN0cmluZ1ZpZXcsIGJhc2UpOwogICAgIGlmIChvaykKLSAgICAg ICAgKm9rID0gaXNPazsKLSAgICByZXR1cm4gaXNPayA/IHZhbHVlLnVuc2FmZUdldCgpIDogMDsK KyAgICAgICAgKm9rID0gcmVzdWx0Lmhhc1ZhbHVlKCk7CisgICAgcmV0dXJuIHJlc3VsdC52YWx1 ZU9yKDApOwogfQogCi10ZW1wbGF0ZTx0eXBlbmFtZSBJbnRlZ3JhbFR5cGUsIHR5cGVuYW1lIFN0 cmluZ09yU3RyaW5nVmlldz4KLWlubGluZSBJbnRlZ3JhbFR5cGUgdG9JbnRlZ3JhbFR5cGUoY29u c3QgU3RyaW5nT3JTdHJpbmdWaWV3JiBzdHJpbmdWaWV3LCBib29sKiBvaywgaW50IGJhc2UgPSAx MCkKKy8vIEZJWE1FOiBEZXByZWNhdGVkLiBSZW1vdmUgdG9JbnRlZ3JhbFR5cGUgZW50aXJlbHkg b25jZSB3ZSBnZXQgbW92ZSBhbGwgY2FsbGVycyB0byBwYXJzZUludGVnZXIuCit0ZW1wbGF0ZTx0 eXBlbmFtZSBJbnRlZ3JhbFR5cGUsIHR5cGVuYW1lIENoYXJhY3RlclR5cGU+IEludGVncmFsVHlw ZSB0b0ludGVncmFsVHlwZShjb25zdCBDaGFyYWN0ZXJUeXBlKiBkYXRhLCB1bnNpZ25lZCBsZW5n dGgsIGJvb2wqIG9rLCBpbnQgYmFzZSA9IDEwKQogewotICAgIGlmIChzdHJpbmdWaWV3LmlzOEJp dCgpKQotICAgICAgICByZXR1cm4gdG9JbnRlZ3JhbFR5cGU8SW50ZWdyYWxUeXBlLCBMQ2hhcj4o c3RyaW5nVmlldy5jaGFyYWN0ZXJzOCgpLCBzdHJpbmdWaWV3Lmxlbmd0aCgpLCBvaywgYmFzZSk7 Ci0gICAgcmV0dXJuIHRvSW50ZWdyYWxUeXBlPEludGVncmFsVHlwZSwgVUNoYXI+KHN0cmluZ1Zp ZXcuY2hhcmFjdGVyczE2KCksIHN0cmluZ1ZpZXcubGVuZ3RoKCksIG9rLCBiYXNlKTsKKyAgICBy ZXR1cm4gdG9JbnRlZ3JhbFR5cGU8SW50ZWdyYWxUeXBlPihTdHJpbmdWaWV3IHsgZGF0YSwgbGVu Z3RoIH0sIG9rLCBiYXNlKTsKIH0KIAotdGVtcGxhdGU8dHlwZW5hbWUgSW50ZWdyYWxUeXBlLCB0 eXBlbmFtZSBDaGFyYWN0ZXJUeXBlPgotaW5saW5lIE9wdGlvbmFsPEludGVncmFsVHlwZT4gdG9J bnRlZ3JhbFR5cGUoY29uc3QgQ2hhcmFjdGVyVHlwZSogZGF0YSwgc2l6ZV90IGxlbmd0aCwgaW50 IGJhc2UgPSAxMCkKKy8vIEZJWE1FOiBEZXByZWNhdGVkLiBSZW1vdmUgdG9JbnRlZ3JhbFR5cGUg ZW50aXJlbHkgb25jZSB3ZSBnZXQgbW92ZSBhbGwgY2FsbGVycyB0byBwYXJzZUludGVnZXIuCit0 ZW1wbGF0ZTx0eXBlbmFtZSBJbnRlZ3JhbFR5cGUsIHR5cGVuYW1lIFN0cmluZ09yU3RyaW5nVmll dz4gT3B0aW9uYWw8SW50ZWdyYWxUeXBlPiB0b0ludGVncmFsVHlwZShjb25zdCBTdHJpbmdPclN0 cmluZ1ZpZXcmIHN0cmluZ1ZpZXcsIGludCBiYXNlID0gMTApCiB7Ci0gICAgYm9vbCBvayA9IGZh bHNlOwotICAgIEludGVncmFsVHlwZSB2YWx1ZSA9IHRvSW50ZWdyYWxUeXBlPEludGVncmFsVHlw ZT4oZGF0YSwgbGVuZ3RoLCAmb2ssIGJhc2UpOwotICAgIGlmICghb2spCi0gICAgICAgIHJldHVy biBXVEY6Om51bGxvcHQ7Ci0gICAgcmV0dXJuIHZhbHVlOworICAgIHJldHVybiBwYXJzZUludGVn ZXI8SW50ZWdyYWxUeXBlPihzdHJpbmdWaWV3LCBiYXNlKTsKIH0KIAotdGVtcGxhdGU8dHlwZW5h bWUgSW50ZWdyYWxUeXBlLCB0eXBlbmFtZSBTdHJpbmdPclN0cmluZ1ZpZXc+Ci1pbmxpbmUgT3B0 aW9uYWw8SW50ZWdyYWxUeXBlPiB0b0ludGVncmFsVHlwZShjb25zdCBTdHJpbmdPclN0cmluZ1Zp ZXcmIHN0cmluZ1ZpZXcsIGludCBiYXNlID0gMTApCisvLyBGSVhNRTogRGVwcmVjYXRlZC4gUmVt b3ZlIHRvSW50ZWdyYWxUeXBlIGVudGlyZWx5IG9uY2Ugd2UgZ2V0IG1vdmUgYWxsIGNhbGxlcnMg dG8gcGFyc2VJbnRlZ2VyLgordGVtcGxhdGU8dHlwZW5hbWUgSW50ZWdyYWxUeXBlLCB0eXBlbmFt ZSBDaGFyYWN0ZXJUeXBlPiBPcHRpb25hbDxJbnRlZ3JhbFR5cGU+IHRvSW50ZWdyYWxUeXBlKGNv bnN0IENoYXJhY3RlclR5cGUqIGRhdGEsIHVuc2lnbmVkIGxlbmd0aCwgaW50IGJhc2UgPSAxMCkK IHsKLSAgICBib29sIG9rID0gZmFsc2U7Ci0gICAgSW50ZWdyYWxUeXBlIHZhbHVlID0gdG9JbnRl Z3JhbFR5cGU8SW50ZWdyYWxUeXBlPihzdHJpbmdWaWV3LCAmb2ssIGJhc2UpOwotICAgIGlmICgh b2spCi0gICAgICAgIHJldHVybiBXVEY6Om51bGxvcHQ7Ci0gICAgcmV0dXJuIHZhbHVlOworICAg IHJldHVybiBwYXJzZUludGVnZXI8SW50ZWdyYWxUeXBlPihTdHJpbmdWaWV3IHsgZGF0YSwgbGVu Z3RoIH0sIGJhc2UpOwogfQogCiB9CiAKK3VzaW5nIFdURjo6cGFyc2VJbnRlZ2VyOwordXNpbmcg V1RGOjpwYXJzZUludGVnZXJBbGxvd2luZ1RyYWlsaW5nSnVuazsKIHVzaW5nIFdURjo6dG9JbnRl Z3JhbFR5cGU7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL3d0Zi90ZXh0L1dURlN0cmluZy5jcHAg Yi9Tb3VyY2UvV1RGL3d0Zi90ZXh0L1dURlN0cmluZy5jcHAKaW5kZXggMTk5NGNlNGRkZThjOTI1 YWUyMDI2NTg3MDJjODllNzIxNGQwMmIxMi4uMWVkYmM4M2FjM2NhZWY1MWUwMDY0YTc3Y2JkNmZh MjcxYWRlMzA3MCAxMDA2NDQKLS0tIGEvU291cmNlL1dURi93dGYvdGV4dC9XVEZTdHJpbmcuY3Bw CisrKyBiL1NvdXJjZS9XVEYvd3RmL3RleHQvV1RGU3RyaW5nLmNwcApAQCAtMTAxNiw4ICsxMDE2 LDYgQEAgaW50cHRyX3QgY2hhcmFjdGVyc1RvSW50UHRyKGNvbnN0IFVDaGFyKiBkYXRhLCBzaXpl X3QgbGVuZ3RoLCBib29sKiBvaykKICAgICByZXR1cm4gdG9JbnRlZ3JhbFR5cGU8aW50cHRyX3Q+ KGRhdGEsIGxlbmd0aE9mQ2hhcmFjdGVyc0FzSW50ZWdlcjxVQ2hhcj4oZGF0YSwgbGVuZ3RoKSwg b2ssIDEwKTsKIH0KIAotZW51bSBUcmFpbGluZ0p1bmtQb2xpY3kgeyBEaXNhbGxvd1RyYWlsaW5n SnVuaywgQWxsb3dUcmFpbGluZ0p1bmsgfTsKLQogdGVtcGxhdGU8dHlwZW5hbWUgQ2hhcmFjdGVy VHlwZSwgVHJhaWxpbmdKdW5rUG9saWN5IHBvbGljeT4KIHN0YXRpYyBpbmxpbmUgZG91YmxlIHRv RG91YmxlVHlwZShjb25zdCBDaGFyYWN0ZXJUeXBlKiBkYXRhLCBzaXplX3QgbGVuZ3RoLCBib29s KiBvaywgc2l6ZV90JiBwYXJzZWRMZW5ndGgpCiB7CkBAIC0xMDM0LDQ2ICsxMDMyLDQ2IEBAIHN0 YXRpYyBpbmxpbmUgZG91YmxlIHRvRG91YmxlVHlwZShjb25zdCBDaGFyYWN0ZXJUeXBlKiBkYXRh LCBzaXplX3QgbGVuZ3RoLCBib29sCiAKICAgICBwYXJzZWRMZW5ndGggKz0gbGVhZGluZ1NwYWNl c0xlbmd0aDsKICAgICBpZiAob2spCi0gICAgICAgICpvayA9IHBvbGljeSA9PSBBbGxvd1RyYWls aW5nSnVuayB8fCBwYXJzZWRMZW5ndGggPT0gbGVuZ3RoOworICAgICAgICAqb2sgPSBwb2xpY3kg PT0gVHJhaWxpbmdKdW5rUG9saWN5OjpBbGxvdyB8fCBwYXJzZWRMZW5ndGggPT0gbGVuZ3RoOwog ICAgIHJldHVybiBudW1iZXI7CiB9CiAKIGRvdWJsZSBjaGFyYWN0ZXJzVG9Eb3VibGUoY29uc3Qg TENoYXIqIGRhdGEsIHNpemVfdCBsZW5ndGgsIGJvb2wqIG9rKQogewogICAgIHNpemVfdCBwYXJz ZWRMZW5ndGg7Ci0gICAgcmV0dXJuIHRvRG91YmxlVHlwZTxMQ2hhciwgRGlzYWxsb3dUcmFpbGlu Z0p1bms+KGRhdGEsIGxlbmd0aCwgb2ssIHBhcnNlZExlbmd0aCk7CisgICAgcmV0dXJuIHRvRG91 YmxlVHlwZTxMQ2hhciwgVHJhaWxpbmdKdW5rUG9saWN5OjpEaXNhbGxvdz4oZGF0YSwgbGVuZ3Ro LCBvaywgcGFyc2VkTGVuZ3RoKTsKIH0KIAogZG91YmxlIGNoYXJhY3RlcnNUb0RvdWJsZShjb25z dCBVQ2hhciogZGF0YSwgc2l6ZV90IGxlbmd0aCwgYm9vbCogb2spCiB7CiAgICAgc2l6ZV90IHBh cnNlZExlbmd0aDsKLSAgICByZXR1cm4gdG9Eb3VibGVUeXBlPFVDaGFyLCBEaXNhbGxvd1RyYWls aW5nSnVuaz4oZGF0YSwgbGVuZ3RoLCBvaywgcGFyc2VkTGVuZ3RoKTsKKyAgICByZXR1cm4gdG9E b3VibGVUeXBlPFVDaGFyLCBUcmFpbGluZ0p1bmtQb2xpY3k6OkRpc2FsbG93PihkYXRhLCBsZW5n dGgsIG9rLCBwYXJzZWRMZW5ndGgpOwogfQogCiBmbG9hdCBjaGFyYWN0ZXJzVG9GbG9hdChjb25z dCBMQ2hhciogZGF0YSwgc2l6ZV90IGxlbmd0aCwgYm9vbCogb2spCiB7CiAgICAgLy8gRklYTUU6 IFRoaXMgd2lsbCByZXR1cm4gb2sgZXZlbiB3aGVuIHRoZSBzdHJpbmcgZml0cyBpbnRvIGEgZG91 YmxlIGJ1dCBub3QgYSBmbG9hdC4KICAgICBzaXplX3QgcGFyc2VkTGVuZ3RoOwotICAgIHJldHVy biBzdGF0aWNfY2FzdDxmbG9hdD4odG9Eb3VibGVUeXBlPExDaGFyLCBEaXNhbGxvd1RyYWlsaW5n SnVuaz4oZGF0YSwgbGVuZ3RoLCBvaywgcGFyc2VkTGVuZ3RoKSk7CisgICAgcmV0dXJuIHN0YXRp Y19jYXN0PGZsb2F0Pih0b0RvdWJsZVR5cGU8TENoYXIsIFRyYWlsaW5nSnVua1BvbGljeTo6RGlz YWxsb3c+KGRhdGEsIGxlbmd0aCwgb2ssIHBhcnNlZExlbmd0aCkpOwogfQogCiBmbG9hdCBjaGFy YWN0ZXJzVG9GbG9hdChjb25zdCBVQ2hhciogZGF0YSwgc2l6ZV90IGxlbmd0aCwgYm9vbCogb2sp CiB7CiAgICAgLy8gRklYTUU6IFRoaXMgd2lsbCByZXR1cm4gb2sgZXZlbiB3aGVuIHRoZSBzdHJp bmcgZml0cyBpbnRvIGEgZG91YmxlIGJ1dCBub3QgYSBmbG9hdC4KICAgICBzaXplX3QgcGFyc2Vk TGVuZ3RoOwotICAgIHJldHVybiBzdGF0aWNfY2FzdDxmbG9hdD4odG9Eb3VibGVUeXBlPFVDaGFy LCBEaXNhbGxvd1RyYWlsaW5nSnVuaz4oZGF0YSwgbGVuZ3RoLCBvaywgcGFyc2VkTGVuZ3RoKSk7 CisgICAgcmV0dXJuIHN0YXRpY19jYXN0PGZsb2F0Pih0b0RvdWJsZVR5cGU8VUNoYXIsIFRyYWls aW5nSnVua1BvbGljeTo6RGlzYWxsb3c+KGRhdGEsIGxlbmd0aCwgb2ssIHBhcnNlZExlbmd0aCkp OwogfQogCiBmbG9hdCBjaGFyYWN0ZXJzVG9GbG9hdChjb25zdCBMQ2hhciogZGF0YSwgc2l6ZV90 IGxlbmd0aCwgc2l6ZV90JiBwYXJzZWRMZW5ndGgpCiB7CiAgICAgLy8gRklYTUU6IFRoaXMgd2ls bCByZXR1cm4gb2sgZXZlbiB3aGVuIHRoZSBzdHJpbmcgZml0cyBpbnRvIGEgZG91YmxlIGJ1dCBu b3QgYSBmbG9hdC4KLSAgICByZXR1cm4gc3RhdGljX2Nhc3Q8ZmxvYXQ+KHRvRG91YmxlVHlwZTxM Q2hhciwgQWxsb3dUcmFpbGluZ0p1bms+KGRhdGEsIGxlbmd0aCwgbnVsbHB0ciwgcGFyc2VkTGVu Z3RoKSk7CisgICAgcmV0dXJuIHN0YXRpY19jYXN0PGZsb2F0Pih0b0RvdWJsZVR5cGU8TENoYXIs IFRyYWlsaW5nSnVua1BvbGljeTo6QWxsb3c+KGRhdGEsIGxlbmd0aCwgbnVsbHB0ciwgcGFyc2Vk TGVuZ3RoKSk7CiB9CiAKIGZsb2F0IGNoYXJhY3RlcnNUb0Zsb2F0KGNvbnN0IFVDaGFyKiBkYXRh LCBzaXplX3QgbGVuZ3RoLCBzaXplX3QmIHBhcnNlZExlbmd0aCkKIHsKICAgICAvLyBGSVhNRTog VGhpcyB3aWxsIHJldHVybiBvayBldmVuIHdoZW4gdGhlIHN0cmluZyBmaXRzIGludG8gYSBkb3Vi bGUgYnV0IG5vdCBhIGZsb2F0LgotICAgIHJldHVybiBzdGF0aWNfY2FzdDxmbG9hdD4odG9Eb3Vi bGVUeXBlPFVDaGFyLCBBbGxvd1RyYWlsaW5nSnVuaz4oZGF0YSwgbGVuZ3RoLCBudWxscHRyLCBw YXJzZWRMZW5ndGgpKTsKKyAgICByZXR1cm4gc3RhdGljX2Nhc3Q8ZmxvYXQ+KHRvRG91YmxlVHlw ZTxVQ2hhciwgVHJhaWxpbmdKdW5rUG9saWN5OjpBbGxvdz4oZGF0YSwgbGVuZ3RoLCBudWxscHRy LCBwYXJzZWRMZW5ndGgpKTsKIH0KIAogY29uc3QgU3RyaW5nJiBlbXB0eVN0cmluZygpCg==