148044 2015-08-14 15:44:49 -0700 Add const to content extension parser 2015-08-17 19:25:20 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 achristensen achristensen commit-queue oldest_to_newest 1117815 0 achristensen 2015-08-14 15:44:49 -0700 There's a FIXME I put in earlier when I was trying to avoid touching JavaScriptCore. 1117816 1 259052 achristensen 2015-08-14 15:45:52 -0700 Created attachment 259052 Patch 1118373 2 259052 commit-queue 2015-08-17 19:25:17 -0700 Comment on attachment 259052 Patch Clearing flags on attachment: 259052 Committed r188567: <http://trac.webkit.org/changeset/188567> 1118374 3 commit-queue 2015-08-17 19:25:20 -0700 All reviewed patches have been landed. Closing bug. 259052 2015-08-14 15:45:52 -0700 2015-08-17 19:25:17 -0700 Patch bug-148044-20150814154533.patch text/plain 11403 achristensen SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTg4NDk3KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE3IEBA CisyMDE1LTA4LTE0ICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+ CisKKyAgICAgICAgQWRkIGNvbnN0IHRvIGNvbnRlbnQgZXh0ZW5zaW9uIHBhcnNlcgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ4MDQ0CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBydW50aW1lL0pTT2Jq ZWN0Lmg6CisgICAgICAgIChKU0M6OkpTT2JqZWN0OjpnZXRJbmRleFF1aWNrbHkpOgorICAgICAg ICAoSlNDOjpKU09iamVjdDo6dHJ5R2V0SW5kZXhRdWlja2x5KToKKyAgICAgICAgKEpTQzo6SlNP YmplY3Q6OmdldERpcmVjdEluZGV4KToKKyAgICAgICAgKEpTQzo6SlNPYmplY3Q6OmdldEluZGV4 KToKKyAgICAgICAgQWRkZWQgYSBmZXcgY29uc3Qga2V5d29yZHMuCisKIDIwMTUtMDgtMTMgIFl1 c3VrZSBTdXp1a2kgIDx1dGF0YW5lLnRlYUBnbWFpbC5jb20+CiAKICAgICAgICAgQWRkIEluc3Bl Y3Rvckluc3RydW1lbnRhdGlvbiBidWlsdGluIG9iamVjdCB0byBpbnN0cnVtZW50IHRoZSBjb2Rl IGluIEpTIGJ1aWx0aW5zIGxpa2UgUHJvbWlzZXMKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29y ZS9ydW50aW1lL0pTT2JqZWN0LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3Jl L3J1bnRpbWUvSlNPYmplY3QuaAkocmV2aXNpb24gMTg4NDc2KQorKysgU291cmNlL0phdmFTY3Jp cHRDb3JlL3J1bnRpbWUvSlNPYmplY3QuaAkod29ya2luZyBjb3B5KQpAQCAtMjIyLDcgKzIyMiw3 IEBAIHB1YmxpYzoKICAgICAgICAgfQogICAgIH0KICAgICAgICAgCi0gICAgSlNWYWx1ZSB0cnlH ZXRJbmRleFF1aWNrbHkodW5zaWduZWQgaSkKKyAgICBKU1ZhbHVlIHRyeUdldEluZGV4UXVpY2ts eSh1bnNpZ25lZCBpKSBjb25zdAogICAgIHsKICAgICAgICAgc3dpdGNoIChpbmRleGluZ1R5cGUo KSkgewogICAgICAgICBjYXNlIEFMTF9CTEFOS19JTkRFWElOR19UWVBFUzoKQEAgLTI2OCw3ICsy NjgsNyBAQCBwdWJsaWM6CiAgICAgICAgIHJldHVybiBKU1ZhbHVlKCk7CiAgICAgfQogICAgICAg ICAKLSAgICBKU1ZhbHVlIGdldEluZGV4KEV4ZWNTdGF0ZSogZXhlYywgdW5zaWduZWQgaSkKKyAg ICBKU1ZhbHVlIGdldEluZGV4KEV4ZWNTdGF0ZSogZXhlYywgdW5zaWduZWQgaSkgY29uc3QKICAg ICB7CiAgICAgICAgIGlmIChKU1ZhbHVlIHJlc3VsdCA9IHRyeUdldEluZGV4UXVpY2tseShpKSkK ICAgICAgICAgICAgIHJldHVybiByZXN1bHQ7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9DaGFuZ2VM b2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCShyZXZpc2lvbiAxODg0 OTcpCisrKyBTb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyAr MSwyMCBAQAorMjAxNS0wOC0xNCAgQWxleCBDaHJpc3RlbnNlbiAgPGFjaHJpc3RlbnNlbkB3ZWJr aXQub3JnPgorCisgICAgICAgIEFkZCBjb25zdCB0byBjb250ZW50IGV4dGVuc2lvbiBwYXJzZXIK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0ODA0NAor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogY29udGVu dGV4dGVuc2lvbnMvQ29udGVudEV4dGVuc2lvblBhcnNlci5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpDb250ZW50RXh0ZW5zaW9uczo6Y29udGFpbnNPbmx5QVNDSUlXaXRoTm9VcHBlcmNhc2UpOgor ICAgICAgICAoV2ViQ29yZTo6Q29udGVudEV4dGVuc2lvbnM6OmdldERvbWFpbkxpc3QpOgorICAg ICAgICAoV2ViQ29yZTo6Q29udGVudEV4dGVuc2lvbnM6OmdldFR5cGVGbGFncyk6CisgICAgICAg IChXZWJDb3JlOjpDb250ZW50RXh0ZW5zaW9uczo6bG9hZFRyaWdnZXIpOgorICAgICAgICAoV2Vi Q29yZTo6Q29udGVudEV4dGVuc2lvbnM6OmxvYWRBY3Rpb24pOgorICAgICAgICAoV2ViQ29yZTo6 Q29udGVudEV4dGVuc2lvbnM6OmxvYWRSdWxlKToKKyAgICAgICAgKFdlYkNvcmU6OkNvbnRlbnRF eHRlbnNpb25zOjpsb2FkRW5jb2RlZFJ1bGVzKToKKyAgICAgICAgQWRkIGNvbnN0LiAgTm8gY2hh bmdlIGluIGJlaGF2aW9yLgorCiAyMDE1LTA4LTE0ICBNYXR0aGV3IERhaXRlciAgPG1kYWl0ZXJA YXBwbGUuY29tPgogCiAgICAgICAgIEltcGxlbWVudGluZyBlbnVtZXJhdGVEZXZpY2VzCkluZGV4 OiBTb3VyY2UvV2ViQ29yZS9jb250ZW50ZXh0ZW5zaW9ucy9Db250ZW50RXh0ZW5zaW9uUGFyc2Vy LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9jb250ZW50ZXh0ZW5zaW9ucy9Db250 ZW50RXh0ZW5zaW9uUGFyc2VyLmNwcAkocmV2aXNpb24gMTg4NDc2KQorKysgU291cmNlL1dlYkNv cmUvY29udGVudGV4dGVuc2lvbnMvQ29udGVudEV4dGVuc2lvblBhcnNlci5jcHAJKHdvcmtpbmcg Y29weSkKQEAgLTU3LDE3ICs1NywxNiBAQCBzdGF0aWMgYm9vbCBjb250YWluc09ubHlBU0NJSVdp dGhOb1VwcGVyCiAgICAgcmV0dXJuIHRydWU7CiB9CiAgICAgCi1zdGF0aWMgc3RkOjplcnJvcl9j b2RlIGdldERvbWFpbkxpc3QoRXhlY1N0YXRlJiBleGVjLCBKU09iamVjdCogYXJyYXlPYmplY3Qs IFZlY3RvcjxTdHJpbmc+JiB2ZWN0b3IpCitzdGF0aWMgc3RkOjplcnJvcl9jb2RlIGdldERvbWFp bkxpc3QoRXhlY1N0YXRlJiBleGVjLCBjb25zdCBKU09iamVjdCogYXJyYXlPYmplY3QsIFZlY3Rv cjxTdHJpbmc+JiB2ZWN0b3IpCiB7CiAgICAgQVNTRVJUKHZlY3Rvci5pc0VtcHR5KCkpOwogICAg IGlmICghYXJyYXlPYmplY3QgfHwgIWlzSlNBcnJheShhcnJheU9iamVjdCkpCiAgICAgICAgIHJl dHVybiBDb250ZW50RXh0ZW5zaW9uRXJyb3I6OkpTT05JbnZhbGlkRG9tYWluTGlzdDsKLSAgICBK U0FycmF5KiBhcnJheSA9IGpzQ2FzdDxKU0FycmF5Kj4oYXJyYXlPYmplY3QpOworICAgIGNvbnN0 IEpTQXJyYXkqIGFycmF5ID0ganNDYXN0PGNvbnN0IEpTQXJyYXkqPihhcnJheU9iamVjdCk7CiAg ICAgCiAgICAgdW5zaWduZWQgbGVuZ3RoID0gYXJyYXktPmxlbmd0aCgpOwogICAgIGZvciAodW5z aWduZWQgaSA9IDA7IGkgPCBsZW5ndGg7ICsraSkgewotICAgICAgICAvLyBGSVhNRTogSlNPYmpl Y3Q6OmdldEluZGV4IHNob3VsZCBiZSBtYXJrZWQgYXMgY29uc3QuCi0gICAgICAgIEpTVmFsdWUg dmFsdWUgPSBhcnJheS0+Z2V0SW5kZXgoJmV4ZWMsIGkpOworICAgICAgICBjb25zdCBKU1ZhbHVl IHZhbHVlID0gYXJyYXktPmdldEluZGV4KCZleGVjLCBpKTsKICAgICAgICAgaWYgKGV4ZWMuaGFk RXhjZXB0aW9uKCkgfHwgIXZhbHVlLmlzU3RyaW5nKCkpCiAgICAgICAgICAgICByZXR1cm4gQ29u dGVudEV4dGVuc2lvbkVycm9yOjpKU09OSW52YWxpZERvbWFpbkxpc3Q7CiAgICAgICAgIApAQCAt ODcsMTUgKzg2LDE1IEBAIHN0YXRpYyBzdGQ6OmVycm9yX2NvZGUgZ2V0VHlwZUZsYWdzKEV4ZWMK ICAgICBpZiAoIXR5cGVWYWx1ZS5pc09iamVjdCgpKQogICAgICAgICByZXR1cm4geyB9OwogCi0g ICAgSlNPYmplY3QqIG9iamVjdCA9IHR5cGVWYWx1ZS50b09iamVjdCgmZXhlYyk7CisgICAgY29u c3QgSlNPYmplY3QqIG9iamVjdCA9IHR5cGVWYWx1ZS50b09iamVjdCgmZXhlYyk7CiAgICAgaWYg KCFpc0pTQXJyYXkob2JqZWN0KSkKICAgICAgICAgcmV0dXJuIENvbnRlbnRFeHRlbnNpb25FcnJv cjo6SlNPTkludmFsaWRUcmlnZ2VyRmxhZ3NBcnJheTsKIAotICAgIEpTQXJyYXkqIGFycmF5ID0g anNDYXN0PEpTQXJyYXkqPihvYmplY3QpOworICAgIGNvbnN0IEpTQXJyYXkqIGFycmF5ID0ganND YXN0PGNvbnN0IEpTQXJyYXkqPihvYmplY3QpOwogICAgIAogICAgIHVuc2lnbmVkIGxlbmd0aCA9 IGFycmF5LT5sZW5ndGgoKTsKICAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwgbGVuZ3RoOyAr K2kpIHsKLSAgICAgICAgSlNWYWx1ZSB2YWx1ZSA9IGFycmF5LT5nZXRJbmRleCgmZXhlYywgaSk7 CisgICAgICAgIGNvbnN0IEpTVmFsdWUgdmFsdWUgPSBhcnJheS0+Z2V0SW5kZXgoJmV4ZWMsIGkp OwogICAgICAgICBpZiAoZXhlYy5oYWRFeGNlcHRpb24oKSB8fCAhdmFsdWUpCiAgICAgICAgICAg ICByZXR1cm4gQ29udGVudEV4dGVuc2lvbkVycm9yOjpKU09OSW52YWxpZE9iamVjdEluVHJpZ2dl ckZsYWdzQXJyYXk7CiAgICAgICAgIApAQCAtMTEwLDEzICsxMDksMTMgQEAgc3RhdGljIHN0ZDo6 ZXJyb3JfY29kZSBnZXRUeXBlRmxhZ3MoRXhlYwogICAgIHJldHVybiB7IH07CiB9CiAgICAgCi1z dGF0aWMgc3RkOjplcnJvcl9jb2RlIGxvYWRUcmlnZ2VyKEV4ZWNTdGF0ZSYgZXhlYywgSlNPYmpl Y3QmIHJ1bGVPYmplY3QsIFRyaWdnZXImIHRyaWdnZXIpCitzdGF0aWMgc3RkOjplcnJvcl9jb2Rl IGxvYWRUcmlnZ2VyKEV4ZWNTdGF0ZSYgZXhlYywgY29uc3QgSlNPYmplY3QmIHJ1bGVPYmplY3Qs IFRyaWdnZXImIHRyaWdnZXIpCiB7Ci0gICAgSlNWYWx1ZSB0cmlnZ2VyT2JqZWN0ID0gcnVsZU9i amVjdC5nZXQoJmV4ZWMsIElkZW50aWZpZXI6OmZyb21TdHJpbmcoJmV4ZWMsICJ0cmlnZ2VyIikp OworICAgIGNvbnN0IEpTVmFsdWUgdHJpZ2dlck9iamVjdCA9IHJ1bGVPYmplY3QuZ2V0KCZleGVj LCBJZGVudGlmaWVyOjpmcm9tU3RyaW5nKCZleGVjLCAidHJpZ2dlciIpKTsKICAgICBpZiAoIXRy aWdnZXJPYmplY3QgfHwgZXhlYy5oYWRFeGNlcHRpb24oKSB8fCAhdHJpZ2dlck9iamVjdC5pc09i amVjdCgpKQogICAgICAgICByZXR1cm4gQ29udGVudEV4dGVuc2lvbkVycm9yOjpKU09OSW52YWxp ZFRyaWdnZXI7CiAgICAgCi0gICAgSlNWYWx1ZSB1cmxGaWx0ZXJPYmplY3QgPSB0cmlnZ2VyT2Jq ZWN0LmdldCgmZXhlYywgSWRlbnRpZmllcjo6ZnJvbVN0cmluZygmZXhlYywgInVybC1maWx0ZXIi KSk7CisgICAgY29uc3QgSlNWYWx1ZSB1cmxGaWx0ZXJPYmplY3QgPSB0cmlnZ2VyT2JqZWN0Lmdl dCgmZXhlYywgSWRlbnRpZmllcjo6ZnJvbVN0cmluZygmZXhlYywgInVybC1maWx0ZXIiKSk7CiAg ICAgaWYgKCF1cmxGaWx0ZXJPYmplY3QgfHwgZXhlYy5oYWRFeGNlcHRpb24oKSB8fCAhdXJsRmls dGVyT2JqZWN0LmlzU3RyaW5nKCkpCiAgICAgICAgIHJldHVybiBDb250ZW50RXh0ZW5zaW9uRXJy b3I6OkpTT05JbnZhbGlkVVJMRmlsdGVySW5UcmlnZ2VyOwogCkBAIC0xMjYsMTEgKzEyNSwxMSBA QCBzdGF0aWMgc3RkOjplcnJvcl9jb2RlIGxvYWRUcmlnZ2VyKEV4ZWNTCiAKICAgICB0cmlnZ2Vy LnVybEZpbHRlciA9IHVybEZpbHRlcjsKIAotICAgIEpTVmFsdWUgdXJsRmlsdGVyQ2FzZVZhbHVl ID0gdHJpZ2dlck9iamVjdC5nZXQoJmV4ZWMsIElkZW50aWZpZXI6OmZyb21TdHJpbmcoJmV4ZWMs ICJ1cmwtZmlsdGVyLWlzLWNhc2Utc2Vuc2l0aXZlIikpOworICAgIGNvbnN0IEpTVmFsdWUgdXJs RmlsdGVyQ2FzZVZhbHVlID0gdHJpZ2dlck9iamVjdC5nZXQoJmV4ZWMsIElkZW50aWZpZXI6OmZy b21TdHJpbmcoJmV4ZWMsICJ1cmwtZmlsdGVyLWlzLWNhc2Utc2Vuc2l0aXZlIikpOwogICAgIGlm ICh1cmxGaWx0ZXJDYXNlVmFsdWUgJiYgIWV4ZWMuaGFkRXhjZXB0aW9uKCkgJiYgdXJsRmlsdGVy Q2FzZVZhbHVlLmlzQm9vbGVhbigpKQogICAgICAgICB0cmlnZ2VyLnVybEZpbHRlcklzQ2FzZVNl bnNpdGl2ZSA9IHVybEZpbHRlckNhc2VWYWx1ZS50b0Jvb2xlYW4oJmV4ZWMpOwogCi0gICAgSlNW YWx1ZSByZXNvdXJjZVR5cGVWYWx1ZSA9IHRyaWdnZXJPYmplY3QuZ2V0KCZleGVjLCBJZGVudGlm aWVyOjpmcm9tU3RyaW5nKCZleGVjLCAicmVzb3VyY2UtdHlwZSIpKTsKKyAgICBjb25zdCBKU1Zh bHVlIHJlc291cmNlVHlwZVZhbHVlID0gdHJpZ2dlck9iamVjdC5nZXQoJmV4ZWMsIElkZW50aWZp ZXI6OmZyb21TdHJpbmcoJmV4ZWMsICJyZXNvdXJjZS10eXBlIikpOwogICAgIGlmICghZXhlYy5o YWRFeGNlcHRpb24oKSAmJiByZXNvdXJjZVR5cGVWYWx1ZS5pc09iamVjdCgpKSB7CiAgICAgICAg IGF1dG8gdHlwZUZsYWdzRXJyb3IgPSBnZXRUeXBlRmxhZ3MoZXhlYywgcmVzb3VyY2VUeXBlVmFs dWUsIHRyaWdnZXIuZmxhZ3MsIHJlYWRSZXNvdXJjZVR5cGUpOwogICAgICAgICBpZiAodHlwZUZs YWdzRXJyb3IpCkBAIC0xMzgsNyArMTM3LDcgQEAgc3RhdGljIHN0ZDo6ZXJyb3JfY29kZSBsb2Fk VHJpZ2dlcihFeGVjUwogICAgIH0gZWxzZSBpZiAoIXJlc291cmNlVHlwZVZhbHVlLmlzVW5kZWZp bmVkKCkpCiAgICAgICAgIHJldHVybiBDb250ZW50RXh0ZW5zaW9uRXJyb3I6OkpTT05JbnZhbGlk VHJpZ2dlckZsYWdzQXJyYXk7CiAKLSAgICBKU1ZhbHVlIGxvYWRUeXBlVmFsdWUgPSB0cmlnZ2Vy T2JqZWN0LmdldCgmZXhlYywgSWRlbnRpZmllcjo6ZnJvbVN0cmluZygmZXhlYywgImxvYWQtdHlw ZSIpKTsKKyAgICBjb25zdCBKU1ZhbHVlIGxvYWRUeXBlVmFsdWUgPSB0cmlnZ2VyT2JqZWN0Lmdl dCgmZXhlYywgSWRlbnRpZmllcjo6ZnJvbVN0cmluZygmZXhlYywgImxvYWQtdHlwZSIpKTsKICAg ICBpZiAoIWV4ZWMuaGFkRXhjZXB0aW9uKCkgJiYgbG9hZFR5cGVWYWx1ZS5pc09iamVjdCgpKSB7 CiAgICAgICAgIGF1dG8gdHlwZUZsYWdzRXJyb3IgPSBnZXRUeXBlRmxhZ3MoZXhlYywgbG9hZFR5 cGVWYWx1ZSwgdHJpZ2dlci5mbGFncywgcmVhZExvYWRUeXBlKTsKICAgICAgICAgaWYgKHR5cGVG bGFnc0Vycm9yKQpAQCAtMTQ2LDcgKzE0NSw3IEBAIHN0YXRpYyBzdGQ6OmVycm9yX2NvZGUgbG9h ZFRyaWdnZXIoRXhlY1MKICAgICB9IGVsc2UgaWYgKCFsb2FkVHlwZVZhbHVlLmlzVW5kZWZpbmVk KCkpCiAgICAgICAgIHJldHVybiBDb250ZW50RXh0ZW5zaW9uRXJyb3I6OkpTT05JbnZhbGlkVHJp Z2dlckZsYWdzQXJyYXk7CiAKLSAgICBKU1ZhbHVlIGlmRG9tYWluID0gdHJpZ2dlck9iamVjdC5n ZXQoJmV4ZWMsIElkZW50aWZpZXI6OmZyb21TdHJpbmcoJmV4ZWMsICJpZi1kb21haW4iKSk7Cisg ICAgY29uc3QgSlNWYWx1ZSBpZkRvbWFpbiA9IHRyaWdnZXJPYmplY3QuZ2V0KCZleGVjLCBJZGVu dGlmaWVyOjpmcm9tU3RyaW5nKCZleGVjLCAiaWYtZG9tYWluIikpOwogICAgIGlmICghZXhlYy5o YWRFeGNlcHRpb24oKSAmJiBpZkRvbWFpbi5pc09iamVjdCgpKSB7CiAgICAgICAgIGF1dG8gaWZE b21haW5FcnJvciA9IGdldERvbWFpbkxpc3QoZXhlYywgYXNPYmplY3QoaWZEb21haW4pLCB0cmln Z2VyLmRvbWFpbnMpOwogICAgICAgICBpZiAoaWZEb21haW5FcnJvcikKQEAgLTE1OCw3ICsxNTcs NyBAQCBzdGF0aWMgc3RkOjplcnJvcl9jb2RlIGxvYWRUcmlnZ2VyKEV4ZWNTCiAgICAgfSBlbHNl IGlmICghaWZEb21haW4uaXNVbmRlZmluZWQoKSkKICAgICAgICAgcmV0dXJuIENvbnRlbnRFeHRl bnNpb25FcnJvcjo6SlNPTkludmFsaWREb21haW5MaXN0OwogICAgIAotICAgIEpTVmFsdWUgdW5s ZXNzRG9tYWluID0gdHJpZ2dlck9iamVjdC5nZXQoJmV4ZWMsIElkZW50aWZpZXI6OmZyb21TdHJp bmcoJmV4ZWMsICJ1bmxlc3MtZG9tYWluIikpOworICAgIGNvbnN0IEpTVmFsdWUgdW5sZXNzRG9t YWluID0gdHJpZ2dlck9iamVjdC5nZXQoJmV4ZWMsIElkZW50aWZpZXI6OmZyb21TdHJpbmcoJmV4 ZWMsICJ1bmxlc3MtZG9tYWluIikpOwogICAgIGlmICghZXhlYy5oYWRFeGNlcHRpb24oKSAmJiB1 bmxlc3NEb21haW4uaXNPYmplY3QoKSkgewogICAgICAgICBpZiAodHJpZ2dlci5kb21haW5Db25k aXRpb24gIT0gVHJpZ2dlcjo6RG9tYWluQ29uZGl0aW9uOjpOb25lKQogICAgICAgICAgICAgcmV0 dXJuIENvbnRlbnRFeHRlbnNpb25FcnJvcjo6SlNPTlVubGVzc0FuZElmRG9tYWluOwpAQCAtMTc0 LDEzICsxNzMsMTMgQEAgc3RhdGljIHN0ZDo6ZXJyb3JfY29kZSBsb2FkVHJpZ2dlcihFeGVjUwog ICAgIHJldHVybiB7IH07CiB9CiAKLXN0YXRpYyBzdGQ6OmVycm9yX2NvZGUgbG9hZEFjdGlvbihF eGVjU3RhdGUmIGV4ZWMsIEpTT2JqZWN0JiBydWxlT2JqZWN0LCBBY3Rpb24mIGFjdGlvbikKK3N0 YXRpYyBzdGQ6OmVycm9yX2NvZGUgbG9hZEFjdGlvbihFeGVjU3RhdGUmIGV4ZWMsIGNvbnN0IEpT T2JqZWN0JiBydWxlT2JqZWN0LCBBY3Rpb24mIGFjdGlvbikKIHsKLSAgICBKU1ZhbHVlIGFjdGlv bk9iamVjdCA9IHJ1bGVPYmplY3QuZ2V0KCZleGVjLCBJZGVudGlmaWVyOjpmcm9tU3RyaW5nKCZl eGVjLCAiYWN0aW9uIikpOworICAgIGNvbnN0IEpTVmFsdWUgYWN0aW9uT2JqZWN0ID0gcnVsZU9i amVjdC5nZXQoJmV4ZWMsIElkZW50aWZpZXI6OmZyb21TdHJpbmcoJmV4ZWMsICJhY3Rpb24iKSk7 CiAgICAgaWYgKCFhY3Rpb25PYmplY3QgfHwgZXhlYy5oYWRFeGNlcHRpb24oKSB8fCAhYWN0aW9u T2JqZWN0LmlzT2JqZWN0KCkpCiAgICAgICAgIHJldHVybiBDb250ZW50RXh0ZW5zaW9uRXJyb3I6 OkpTT05JbnZhbGlkQWN0aW9uOwogCi0gICAgSlNWYWx1ZSB0eXBlT2JqZWN0ID0gYWN0aW9uT2Jq ZWN0LmdldCgmZXhlYywgSWRlbnRpZmllcjo6ZnJvbVN0cmluZygmZXhlYywgInR5cGUiKSk7Cisg ICAgY29uc3QgSlNWYWx1ZSB0eXBlT2JqZWN0ID0gYWN0aW9uT2JqZWN0LmdldCgmZXhlYywgSWRl bnRpZmllcjo6ZnJvbVN0cmluZygmZXhlYywgInR5cGUiKSk7CiAgICAgaWYgKCF0eXBlT2JqZWN0 IHx8IGV4ZWMuaGFkRXhjZXB0aW9uKCkgfHwgIXR5cGVPYmplY3QuaXNTdHJpbmcoKSkKICAgICAg ICAgcmV0dXJuIENvbnRlbnRFeHRlbnNpb25FcnJvcjo6SlNPTkludmFsaWRBY3Rpb25UeXBlOwog CkBAIC0yMDQsNyArMjAzLDcgQEAgc3RhdGljIHN0ZDo6ZXJyb3JfY29kZSBsb2FkQWN0aW9uKEV4 ZWNTdAogICAgIHJldHVybiB7IH07CiB9CiAKLXN0YXRpYyBzdGQ6OmVycm9yX2NvZGUgbG9hZFJ1 bGUoRXhlY1N0YXRlJiBleGVjLCBKU09iamVjdCYgcnVsZU9iamVjdCwgVmVjdG9yPENvbnRlbnRF eHRlbnNpb25SdWxlPiYgcnVsZUxpc3QpCitzdGF0aWMgc3RkOjplcnJvcl9jb2RlIGxvYWRSdWxl KEV4ZWNTdGF0ZSYgZXhlYywgY29uc3QgSlNPYmplY3QmIHJ1bGVPYmplY3QsIFZlY3RvcjxDb250 ZW50RXh0ZW5zaW9uUnVsZT4mIHJ1bGVMaXN0KQogewogICAgIFRyaWdnZXIgdHJpZ2dlcjsKICAg ICBhdXRvIHRyaWdnZXJFcnJvciA9IGxvYWRUcmlnZ2VyKGV4ZWMsIHJ1bGVPYmplY3QsIHRyaWdn ZXIpOwpAQCAtMjIzLDcgKzIyMiw3IEBAIHN0YXRpYyBzdGQ6OmVycm9yX2NvZGUgbG9hZFJ1bGUo RXhlY1N0YXQKIHN0YXRpYyBzdGQ6OmVycm9yX2NvZGUgbG9hZEVuY29kZWRSdWxlcyhFeGVjU3Rh dGUmIGV4ZWMsIGNvbnN0IFN0cmluZyYgcnVsZXMsIFZlY3RvcjxDb250ZW50RXh0ZW5zaW9uUnVs ZT4mIHJ1bGVMaXN0KQogewogICAgIC8vIEZJWE1FOiBKU09OUGFyc2Ugc2hvdWxkIHJlcXVpcmUg Y2FsbGJhY2tzIGluc3RlYWQgb2YgYW4gRXhlY1N0YXRlLgotICAgIEpTVmFsdWUgZGVjb2RlZFJ1 bGVzID0gSlNPTlBhcnNlKCZleGVjLCBydWxlcyk7CisgICAgY29uc3QgSlNWYWx1ZSBkZWNvZGVk UnVsZXMgPSBKU09OUGFyc2UoJmV4ZWMsIHJ1bGVzKTsKIAogICAgIGlmIChleGVjLmhhZEV4Y2Vw dGlvbigpIHx8ICFkZWNvZGVkUnVsZXMpCiAgICAgICAgIHJldHVybiBDb250ZW50RXh0ZW5zaW9u RXJyb3I6OkpTT05JbnZhbGlkOwpAQCAtMjMxLDE0ICsyMzAsMTQgQEAgc3RhdGljIHN0ZDo6ZXJy b3JfY29kZSBsb2FkRW5jb2RlZFJ1bGVzKAogICAgIGlmICghZGVjb2RlZFJ1bGVzLmlzT2JqZWN0 KCkpCiAgICAgICAgIHJldHVybiBDb250ZW50RXh0ZW5zaW9uRXJyb3I6OkpTT05Ub3BMZXZlbFN0 cnVjdHVyZU5vdEFuT2JqZWN0OwogCi0gICAgSlNPYmplY3QqIHRvcExldmVsT2JqZWN0ID0gZGVj b2RlZFJ1bGVzLnRvT2JqZWN0KCZleGVjKTsKKyAgICBjb25zdCBKU09iamVjdCogdG9wTGV2ZWxP YmplY3QgPSBkZWNvZGVkUnVsZXMudG9PYmplY3QoJmV4ZWMpOwogICAgIGlmICghdG9wTGV2ZWxP YmplY3QgfHwgZXhlYy5oYWRFeGNlcHRpb24oKSkKICAgICAgICAgcmV0dXJuIENvbnRlbnRFeHRl bnNpb25FcnJvcjo6SlNPTlRvcExldmVsU3RydWN0dXJlTm90QW5PYmplY3Q7CiAgICAgCiAgICAg aWYgKCFpc0pTQXJyYXkodG9wTGV2ZWxPYmplY3QpKQogICAgICAgICByZXR1cm4gQ29udGVudEV4 dGVuc2lvbkVycm9yOjpKU09OVG9wTGV2ZWxTdHJ1Y3R1cmVOb3RBbkFycmF5OwogCi0gICAgSlNB cnJheSogdG9wTGV2ZWxBcnJheSA9IGpzQ2FzdDxKU0FycmF5Kj4odG9wTGV2ZWxPYmplY3QpOwor ICAgIGNvbnN0IEpTQXJyYXkqIHRvcExldmVsQXJyYXkgPSBqc0Nhc3Q8Y29uc3QgSlNBcnJheSo+ KHRvcExldmVsT2JqZWN0KTsKIAogICAgIFZlY3RvcjxDb250ZW50RXh0ZW5zaW9uUnVsZT4gbG9j YWxSdWxlTGlzdDsKIApAQCAtMjQ3LDExICsyNDYsMTEgQEAgc3RhdGljIHN0ZDo6ZXJyb3JfY29k ZSBsb2FkRW5jb2RlZFJ1bGVzKAogICAgIGlmIChsZW5ndGggPiBtYXhSdWxlQ291bnQpCiAgICAg ICAgIHJldHVybiBDb250ZW50RXh0ZW5zaW9uRXJyb3I6OkpTT05Ub29NYW55UnVsZXM7CiAgICAg Zm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IGxlbmd0aDsgKytpKSB7Ci0gICAgICAgIEpTVmFsdWUg dmFsdWUgPSB0b3BMZXZlbEFycmF5LT5nZXRJbmRleCgmZXhlYywgaSk7CisgICAgICAgIGNvbnN0 IEpTVmFsdWUgdmFsdWUgPSB0b3BMZXZlbEFycmF5LT5nZXRJbmRleCgmZXhlYywgaSk7CiAgICAg ICAgIGlmIChleGVjLmhhZEV4Y2VwdGlvbigpIHx8ICF2YWx1ZSkKICAgICAgICAgICAgIHJldHVy biBDb250ZW50RXh0ZW5zaW9uRXJyb3I6OkpTT05JbnZhbGlkT2JqZWN0SW5Ub3BMZXZlbEFycmF5 OwogCi0gICAgICAgIEpTT2JqZWN0KiBydWxlT2JqZWN0ID0gdmFsdWUudG9PYmplY3QoJmV4ZWMp OworICAgICAgICBjb25zdCBKU09iamVjdCogcnVsZU9iamVjdCA9IHZhbHVlLnRvT2JqZWN0KCZl eGVjKTsKICAgICAgICAgaWYgKCFydWxlT2JqZWN0IHx8IGV4ZWMuaGFkRXhjZXB0aW9uKCkpCiAg ICAgICAgICAgICByZXR1cm4gQ29udGVudEV4dGVuc2lvbkVycm9yOjpKU09OSW52YWxpZFJ1bGU7 CiAK