149169 2015-09-15 10:48:23 -0700 Make the IDBAny::Type enum into an enum class 2015-09-15 11:10:21 -0700 1 1 1 Unclassified WebKit WebCore Misc. Safari 9 Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 beidson beidson achristensen alecflett commit-queue jsbell oldest_to_newest 1126030 0 beidson 2015-09-15 10:48:23 -0700 Make the IDBAny::Type enum into an enum class 1126034 1 261212 beidson 2015-09-15 10:49:31 -0700 Created attachment 261212 Patch v1 1126051 2 beidson 2015-09-15 11:10:21 -0700 https://trac.webkit.org/changeset/189813 261212 2015-09-15 10:49:31 -0700 2015-09-15 11:00:28 -0700 Patch v1 patch text/plain 17833 beidson ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAwOTBjZjQ1Li45NDk0NDM3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsNTEg QEAKIDIwMTUtMDktMTUgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgogCisgICAg ICAgIE1ha2UgdGhlIElEQkFueTo6VHlwZSBlbnVtIGludG8gYW4gZW51bSBjbGFzcy4KKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0OTE2OS4KKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBObyBuZXcgdGVzdHMg KENsZWFudXAsIG5vIGJlaGF2aW9yIGNoYW5nZSkuCisKKyAgICAgICAgKiBNb2R1bGVzL2luZGV4 ZWRkYi9JREJBbnkuaDoKKyAgICAgICAgKiBNb2R1bGVzL2luZGV4ZWRkYi9sZWdhY3kvTGVnYWN5 QW55LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxlZ2FjeUFueTo6Y3JlYXRlSW52YWxpZCk6Cisg ICAgICAgIChXZWJDb3JlOjpMZWdhY3lBbnk6OmNyZWF0ZU51bGwpOgorICAgICAgICAoV2ViQ29y ZTo6TGVnYWN5QW55OjpMZWdhY3lBbnkpOgorICAgICAgICAoV2ViQ29yZTo6TGVnYWN5QW55Ojpk b21TdHJpbmdMaXN0KToKKyAgICAgICAgKFdlYkNvcmU6OkxlZ2FjeUFueTo6aWRiQ3Vyc29yKToK KyAgICAgICAgKFdlYkNvcmU6OkxlZ2FjeUFueTo6aWRiQ3Vyc29yV2l0aFZhbHVlKToKKyAgICAg ICAgKFdlYkNvcmU6OkxlZ2FjeUFueTo6aWRiRGF0YWJhc2UpOgorICAgICAgICAoV2ViQ29yZTo6 TGVnYWN5QW55OjppZGJGYWN0b3J5KToKKyAgICAgICAgKFdlYkNvcmU6OkxlZ2FjeUFueTo6aWRi SW5kZXgpOgorICAgICAgICAoV2ViQ29yZTo6TGVnYWN5QW55OjppZGJPYmplY3RTdG9yZSk6Cisg ICAgICAgIChXZWJDb3JlOjpMZWdhY3lBbnk6OmlkYlRyYW5zYWN0aW9uKToKKyAgICAgICAgKFdl YkNvcmU6OkxlZ2FjeUFueTo6c2NyaXB0VmFsdWUpOgorICAgICAgICAoV2ViQ29yZTo6TGVnYWN5 QW55OjpzdHJpbmcpOgorICAgICAgICAoV2ViQ29yZTo6TGVnYWN5QW55OjppbnRlZ2VyKToKKyAg ICAgICAgKFdlYkNvcmU6OkxlZ2FjeUFueTo6bGVnYWN5Q3Vyc29yKToKKyAgICAgICAgKFdlYkNv cmU6OkxlZ2FjeUFueTo6bGVnYWN5Q3Vyc29yV2l0aFZhbHVlKToKKyAgICAgICAgKFdlYkNvcmU6 OkxlZ2FjeUFueTo6bGVnYWN5RGF0YWJhc2UpOgorICAgICAgICAoV2ViQ29yZTo6TGVnYWN5QW55 OjpsZWdhY3lGYWN0b3J5KToKKyAgICAgICAgKFdlYkNvcmU6OkxlZ2FjeUFueTo6bGVnYWN5SW5k ZXgpOgorICAgICAgICAoV2ViQ29yZTo6TGVnYWN5QW55OjpsZWdhY3lPYmplY3RTdG9yZSk6Cisg ICAgICAgIChXZWJDb3JlOjpMZWdhY3lBbnk6OmxlZ2FjeVRyYW5zYWN0aW9uKToKKyAgICAgICAg KiBNb2R1bGVzL2luZGV4ZWRkYi9sZWdhY3kvTGVnYWN5Q3Vyc29yLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OkxlZ2FjeUN1cnNvcjo6TGVnYWN5Q3Vyc29yKToKKyAgICAgICAgKFdlYkNvcmU6Okxl Z2FjeUN1cnNvcjo6ZWZmZWN0aXZlT2JqZWN0U3RvcmUpOgorICAgICAgICAqIE1vZHVsZXMvaW5k ZXhlZGRiL2xlZ2FjeS9MZWdhY3lPYmplY3RTdG9yZS5jcHA6CisgICAgICAgICogTW9kdWxlcy9p bmRleGVkZGIvbGVnYWN5L0xlZ2FjeU9wZW5EQlJlcXVlc3QuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6TGVnYWN5T3BlbkRCUmVxdWVzdDo6ZGlzcGF0Y2hFdmVudCk6CisgICAgICAgICogTW9kdWxl cy9pbmRleGVkZGIvbGVnYWN5L0xlZ2FjeVJlcXVlc3QuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 TGVnYWN5UmVxdWVzdDo6Z2V0UmVzdWx0Q3Vyc29yKToKKyAgICAgICAgKFdlYkNvcmU6OmVmZmVj dGl2ZU9iamVjdFN0b3JlKToKKyAgICAgICAgKiBiaW5kaW5ncy9qcy9KU0lEQkFueUN1c3RvbS5j cHA6CisgICAgICAgIChXZWJDb3JlOjp0b0pTKToKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVj dG9ySW5kZXhlZERCQWdlbnQuY3BwOgorICAgICAgICAqIHBhZ2UvRGF0YWJhc2VQcm92aWRlci5o OgorCisyMDE1LTA5LTE1ICBCcmFkeSBFaWRzb24gIDxiZWlkc29uQGFwcGxlLmNvbT4KKwogICAg ICAgICBNb3ZlIG1vc3QgSURCIG9iamVjdCBlbmNvZGluZy9kZWNvZGluZyBmcm9tIFdlYktpdDIg dG8gV2ViQ29yZS4KICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTE0OTE1MgogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRk Yi9JREJBbnkuaCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL0lEQkFueS5oCmlu ZGV4IGE1NzU3M2MuLjQ0MDZjZGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMv aW5kZXhlZGRiL0lEQkFueS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRi L0lEQkFueS5oCkBAIC01MiwyMSArNTIsMjEgQEAgY2xhc3MgSURCQW55IDogcHVibGljIFNjcmlw dFdyYXBwYWJsZSwgcHVibGljIFJlZkNvdW50ZWQ8SURCQW55PiB7CiBwdWJsaWM6CiAgICAgdmly dHVhbCB+SURCQW55KCkgeyB9CiAKLSAgICBlbnVtIFR5cGUgewotICAgICAgICBVbmRlZmluZWRU eXBlID0gMCwKLSAgICAgICAgTnVsbFR5cGUsCi0gICAgICAgIERPTVN0cmluZ0xpc3RUeXBlLAot ICAgICAgICBJREJDdXJzb3JUeXBlLAotICAgICAgICBJREJDdXJzb3JXaXRoVmFsdWVUeXBlLAot ICAgICAgICBJREJEYXRhYmFzZVR5cGUsCi0gICAgICAgIElEQkZhY3RvcnlUeXBlLAotICAgICAg ICBJREJJbmRleFR5cGUsCi0gICAgICAgIElEQk9iamVjdFN0b3JlVHlwZSwKLSAgICAgICAgSURC VHJhbnNhY3Rpb25UeXBlLAotICAgICAgICBTY3JpcHRWYWx1ZVR5cGUsCi0gICAgICAgIEludGVn ZXJUeXBlLAotICAgICAgICBTdHJpbmdUeXBlLAotICAgICAgICBLZXlQYXRoVHlwZSwKKyAgICBl bnVtIGNsYXNzIFR5cGUgeworICAgICAgICBVbmRlZmluZWQgPSAwLAorICAgICAgICBOdWxsLAor ICAgICAgICBET01TdHJpbmdMaXN0LAorICAgICAgICBJREJDdXJzb3IsCisgICAgICAgIElEQkN1 cnNvcldpdGhWYWx1ZSwKKyAgICAgICAgSURCRGF0YWJhc2UsCisgICAgICAgIElEQkZhY3Rvcnks CisgICAgICAgIElEQkluZGV4LAorICAgICAgICBJREJPYmplY3RTdG9yZSwKKyAgICAgICAgSURC VHJhbnNhY3Rpb24sCisgICAgICAgIFNjcmlwdFZhbHVlLAorICAgICAgICBJbnRlZ2VyLAorICAg ICAgICBTdHJpbmcsCisgICAgICAgIEtleVBhdGgsCiAgICAgfTsKIAogICAgIHZpcnR1YWwgVHlw ZSB0eXBlKCkgY29uc3QgPSAwOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9p bmRleGVkZGIvbGVnYWN5L0xlZ2FjeUFueS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2lu ZGV4ZWRkYi9sZWdhY3kvTGVnYWN5QW55LmNwcAppbmRleCAyMmU4OWFmLi5kMzgyYzEzIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9sZWdhY3kvTGVnYWN5QW55 LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9sZWdhY3kvTGVnYWN5 QW55LmNwcApAQCAtNDAsMTIgKzQwLDEyIEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogUGFzc1Jl ZlB0cjxMZWdhY3lBbnk+IExlZ2FjeUFueTo6Y3JlYXRlSW52YWxpZCgpCiB7Ci0gICAgcmV0dXJu IGFkb3B0UmVmKG5ldyBMZWdhY3lBbnkoVW5kZWZpbmVkVHlwZSkpOworICAgIHJldHVybiBhZG9w dFJlZihuZXcgTGVnYWN5QW55KFR5cGU6OlVuZGVmaW5lZCkpOwogfQogCiBQYXNzUmVmUHRyPExl Z2FjeUFueT4gTGVnYWN5QW55OjpjcmVhdGVOdWxsKCkKIHsKLSAgICByZXR1cm4gYWRvcHRSZWYo bmV3IExlZ2FjeUFueShOdWxsVHlwZSkpOworICAgIHJldHVybiBhZG9wdFJlZihuZXcgTGVnYWN5 QW55KFR5cGU6Ok51bGwpKTsKIH0KIAogUGFzc1JlZlB0cjxMZWdhY3lBbnk+IExlZ2FjeUFueTo6 Y3JlYXRlU3RyaW5nKGNvbnN0IFN0cmluZyYgdmFsdWUpCkBAIC01Nyw3ICs1Nyw3IEBAIExlZ2Fj eUFueTo6TGVnYWN5QW55KFR5cGUgdHlwZSkKICAgICA6IG1fdHlwZSh0eXBlKQogICAgICwgbV9p bnRlZ2VyKDApCiB7Ci0gICAgQVNTRVJUKHR5cGUgPT0gVW5kZWZpbmVkVHlwZSB8fCB0eXBlID09 IE51bGxUeXBlKTsKKyAgICBBU1NFUlQodHlwZSA9PSBUeXBlOjpVbmRlZmluZWQgfHwgdHlwZSA9 PSBUeXBlOjpOdWxsKTsKIH0KIAogTGVnYWN5QW55Ojp+TGVnYWN5QW55KCkKQEAgLTY2LDE5MiAr NjYsMTkyIEBAIExlZ2FjeUFueTo6fkxlZ2FjeUFueSgpCiAKIFBhc3NSZWZQdHI8RE9NU3RyaW5n TGlzdD4gTGVnYWN5QW55Ojpkb21TdHJpbmdMaXN0KCkKIHsKLSAgICBBU1NFUlQobV90eXBlID09 IERPTVN0cmluZ0xpc3RUeXBlKTsKKyAgICBBU1NFUlQobV90eXBlID09IFR5cGU6OkRPTVN0cmlu Z0xpc3QpOwogICAgIHJldHVybiBtX2RvbVN0cmluZ0xpc3Q7CiB9CiAKIFBhc3NSZWZQdHI8SURC Q3Vyc29yPiBMZWdhY3lBbnk6OmlkYkN1cnNvcigpCiB7Ci0gICAgQVNTRVJUKG1fdHlwZSA9PSBJ REJDdXJzb3JUeXBlKTsKKyAgICBBU1NFUlQobV90eXBlID09IFR5cGU6OklEQkN1cnNvcik7CiAg ICAgcmV0dXJuIG1faWRiQ3Vyc29yOwogfQogCiBQYXNzUmVmUHRyPElEQkN1cnNvcldpdGhWYWx1 ZT4gTGVnYWN5QW55OjppZGJDdXJzb3JXaXRoVmFsdWUoKQogewotICAgIEFTU0VSVChtX3R5cGUg PT0gSURCQ3Vyc29yV2l0aFZhbHVlVHlwZSk7CisgICAgQVNTRVJUKG1fdHlwZSA9PSBUeXBlOjpJ REJDdXJzb3JXaXRoVmFsdWUpOwogICAgIHJldHVybiBtX2lkYkN1cnNvcldpdGhWYWx1ZTsKIH0K IAogUGFzc1JlZlB0cjxJREJEYXRhYmFzZT4gTGVnYWN5QW55OjppZGJEYXRhYmFzZSgpCiB7Ci0g ICAgQVNTRVJUKG1fdHlwZSA9PSBJREJEYXRhYmFzZVR5cGUpOworICAgIEFTU0VSVChtX3R5cGUg PT0gVHlwZTo6SURCRGF0YWJhc2UpOwogICAgIHJldHVybiBtX2lkYkRhdGFiYXNlOwogfQogCiBQ YXNzUmVmUHRyPElEQkZhY3Rvcnk+IExlZ2FjeUFueTo6aWRiRmFjdG9yeSgpCiB7Ci0gICAgQVNT RVJUKG1fdHlwZSA9PSBJREJGYWN0b3J5VHlwZSk7CisgICAgQVNTRVJUKG1fdHlwZSA9PSBUeXBl OjpJREJGYWN0b3J5KTsKICAgICByZXR1cm4gbV9pZGJGYWN0b3J5OwogfQogCiBQYXNzUmVmUHRy PElEQkluZGV4PiBMZWdhY3lBbnk6OmlkYkluZGV4KCkKIHsKLSAgICBBU1NFUlQobV90eXBlID09 IElEQkluZGV4VHlwZSk7CisgICAgQVNTRVJUKG1fdHlwZSA9PSBUeXBlOjpJREJJbmRleCk7CiAg ICAgcmV0dXJuIG1faWRiSW5kZXg7CiB9CiAKIFBhc3NSZWZQdHI8SURCT2JqZWN0U3RvcmU+IExl Z2FjeUFueTo6aWRiT2JqZWN0U3RvcmUoKQogewotICAgIEFTU0VSVChtX3R5cGUgPT0gSURCT2Jq ZWN0U3RvcmVUeXBlKTsKKyAgICBBU1NFUlQobV90eXBlID09IFR5cGU6OklEQk9iamVjdFN0b3Jl KTsKICAgICByZXR1cm4gbV9pZGJPYmplY3RTdG9yZTsKIH0KIAogUGFzc1JlZlB0cjxJREJUcmFu c2FjdGlvbj4gTGVnYWN5QW55OjppZGJUcmFuc2FjdGlvbigpCiB7Ci0gICAgQVNTRVJUKG1fdHlw ZSA9PSBJREJUcmFuc2FjdGlvblR5cGUpOworICAgIEFTU0VSVChtX3R5cGUgPT0gVHlwZTo6SURC VHJhbnNhY3Rpb24pOwogICAgIHJldHVybiBtX2lkYlRyYW5zYWN0aW9uOwogfQogCiBjb25zdCBE ZXByZWNhdGVkOjpTY3JpcHRWYWx1ZSYgTGVnYWN5QW55OjpzY3JpcHRWYWx1ZSgpCiB7Ci0gICAg QVNTRVJUKG1fdHlwZSA9PSBTY3JpcHRWYWx1ZVR5cGUpOworICAgIEFTU0VSVChtX3R5cGUgPT0g VHlwZTo6U2NyaXB0VmFsdWUpOwogICAgIHJldHVybiBtX3NjcmlwdFZhbHVlOwogfQogCiBjb25z dCBTdHJpbmcmIExlZ2FjeUFueTo6c3RyaW5nKCkKIHsKLSAgICBBU1NFUlQobV90eXBlID09IFN0 cmluZ1R5cGUpOworICAgIEFTU0VSVChtX3R5cGUgPT0gVHlwZTo6U3RyaW5nKTsKICAgICByZXR1 cm4gbV9zdHJpbmc7CiB9CiAKIGludDY0X3QgTGVnYWN5QW55OjppbnRlZ2VyKCkKIHsKLSAgICBB U1NFUlQobV90eXBlID09IEludGVnZXJUeXBlKTsKKyAgICBBU1NFUlQobV90eXBlID09IFR5cGU6 OkludGVnZXIpOwogICAgIHJldHVybiBtX2ludGVnZXI7CiB9CiAKIExlZ2FjeUFueTo6TGVnYWN5 QW55KFBhc3NSZWZQdHI8RE9NU3RyaW5nTGlzdD4gdmFsdWUpCi0gICAgOiBtX3R5cGUoRE9NU3Ry aW5nTGlzdFR5cGUpCisgICAgOiBtX3R5cGUoVHlwZTo6RE9NU3RyaW5nTGlzdCkKICAgICAsIG1f ZG9tU3RyaW5nTGlzdCh2YWx1ZSkKICAgICAsIG1faW50ZWdlcigwKQogewogfQogCiBMZWdhY3lB bnk6OkxlZ2FjeUFueShQYXNzUmVmUHRyPExlZ2FjeUN1cnNvcldpdGhWYWx1ZT4gdmFsdWUpCi0g ICAgOiBtX3R5cGUoSURCQ3Vyc29yV2l0aFZhbHVlVHlwZSkKKyAgICA6IG1fdHlwZShUeXBlOjpJ REJDdXJzb3JXaXRoVmFsdWUpCiAgICAgLCBtX2lkYkN1cnNvcldpdGhWYWx1ZSh2YWx1ZSkKICAg ICAsIG1faW50ZWdlcigwKQogewogfQogCiBMZWdhY3lBbnk6OkxlZ2FjeUFueShQYXNzUmVmUHRy PExlZ2FjeUN1cnNvcj4gdmFsdWUpCi0gICAgOiBtX3R5cGUoSURCQ3Vyc29yVHlwZSkKKyAgICA6 IG1fdHlwZShUeXBlOjpJREJDdXJzb3IpCiAgICAgLCBtX2lkYkN1cnNvcih2YWx1ZSkKICAgICAs IG1faW50ZWdlcigwKQogewogfQogCiBMZWdhY3lBbnk6OkxlZ2FjeUFueShQYXNzUmVmUHRyPExl Z2FjeURhdGFiYXNlPiB2YWx1ZSkKLSAgICA6IG1fdHlwZShJREJEYXRhYmFzZVR5cGUpCisgICAg OiBtX3R5cGUoVHlwZTo6SURCRGF0YWJhc2UpCiAgICAgLCBtX2lkYkRhdGFiYXNlKHZhbHVlKQog ICAgICwgbV9pbnRlZ2VyKDApCiB7CiB9CiAKIExlZ2FjeUFueTo6TGVnYWN5QW55KFBhc3NSZWZQ dHI8TGVnYWN5RmFjdG9yeT4gdmFsdWUpCi0gICAgOiBtX3R5cGUoSURCRmFjdG9yeVR5cGUpCisg ICAgOiBtX3R5cGUoVHlwZTo6SURCRmFjdG9yeSkKICAgICAsIG1faWRiRmFjdG9yeSh2YWx1ZSkK ICAgICAsIG1faW50ZWdlcigwKQogewogfQogCiBMZWdhY3lBbnk6OkxlZ2FjeUFueShQYXNzUmVm UHRyPExlZ2FjeUluZGV4PiB2YWx1ZSkKLSAgICA6IG1fdHlwZShJREJJbmRleFR5cGUpCisgICAg OiBtX3R5cGUoVHlwZTo6SURCSW5kZXgpCiAgICAgLCBtX2lkYkluZGV4KHZhbHVlKQogICAgICwg bV9pbnRlZ2VyKDApCiB7CiB9CiAKIExlZ2FjeUFueTo6TGVnYWN5QW55KFBhc3NSZWZQdHI8TGVn YWN5VHJhbnNhY3Rpb24+IHZhbHVlKQotICAgIDogbV90eXBlKElEQlRyYW5zYWN0aW9uVHlwZSkK KyAgICA6IG1fdHlwZShUeXBlOjpJREJUcmFuc2FjdGlvbikKICAgICAsIG1faWRiVHJhbnNhY3Rp b24odmFsdWUpCiAgICAgLCBtX2ludGVnZXIoMCkKIHsKIH0KIAogTGVnYWN5QW55OjpMZWdhY3lB bnkoUGFzc1JlZlB0cjxMZWdhY3lPYmplY3RTdG9yZT4gdmFsdWUpCi0gICAgOiBtX3R5cGUoSURC T2JqZWN0U3RvcmVUeXBlKQorICAgIDogbV90eXBlKFR5cGU6OklEQk9iamVjdFN0b3JlKQogICAg ICwgbV9pZGJPYmplY3RTdG9yZSh2YWx1ZSkKICAgICAsIG1faW50ZWdlcigwKQogewogfQogCiBM ZWdhY3lBbnk6OkxlZ2FjeUFueShjb25zdCBEZXByZWNhdGVkOjpTY3JpcHRWYWx1ZSYgdmFsdWUp Ci0gICAgOiBtX3R5cGUoU2NyaXB0VmFsdWVUeXBlKQorICAgIDogbV90eXBlKFR5cGU6OlNjcmlw dFZhbHVlKQogICAgICwgbV9zY3JpcHRWYWx1ZSh2YWx1ZSkKICAgICAsIG1faW50ZWdlcigwKQog ewogfQogCiBMZWdhY3lBbnk6OkxlZ2FjeUFueShjb25zdCBJREJLZXlQYXRoJiB2YWx1ZSkKLSAg ICA6IG1fdHlwZShLZXlQYXRoVHlwZSkKKyAgICA6IG1fdHlwZShUeXBlOjpLZXlQYXRoKQogICAg ICwgbV9pZGJLZXlQYXRoKHZhbHVlKQogICAgICwgbV9pbnRlZ2VyKDApCiB7CiB9CiAKIExlZ2Fj eUFueTo6TGVnYWN5QW55KGNvbnN0IFN0cmluZyYgdmFsdWUpCi0gICAgOiBtX3R5cGUoU3RyaW5n VHlwZSkKKyAgICA6IG1fdHlwZShUeXBlOjpTdHJpbmcpCiAgICAgLCBtX3N0cmluZyh2YWx1ZSkK ICAgICAsIG1faW50ZWdlcigwKQogewogfQogCiBMZWdhY3lBbnk6OkxlZ2FjeUFueShpbnQ2NF90 IHZhbHVlKQotICAgIDogbV90eXBlKEludGVnZXJUeXBlKQorICAgIDogbV90eXBlKFR5cGU6Oklu dGVnZXIpCiAgICAgLCBtX2ludGVnZXIodmFsdWUpCiB7CiB9CiAKIExlZ2FjeUN1cnNvciogTGVn YWN5QW55OjpsZWdhY3lDdXJzb3IoKQogewotICAgIEFTU0VSVChtX3R5cGUgPT0gSURCQ3Vyc29y VHlwZSk7CisgICAgQVNTRVJUKG1fdHlwZSA9PSBUeXBlOjpJREJDdXJzb3IpOwogICAgIHJldHVy biBtX2lkYkN1cnNvci5nZXQoKTsKIH0KIAogTGVnYWN5Q3Vyc29yV2l0aFZhbHVlKiBMZWdhY3lB bnk6OmxlZ2FjeUN1cnNvcldpdGhWYWx1ZSgpCiB7Ci0gICAgQVNTRVJUKG1fdHlwZSA9PSBJREJD dXJzb3JXaXRoVmFsdWVUeXBlKTsKKyAgICBBU1NFUlQobV90eXBlID09IFR5cGU6OklEQkN1cnNv cldpdGhWYWx1ZSk7CiAgICAgcmV0dXJuIG1faWRiQ3Vyc29yV2l0aFZhbHVlLmdldCgpOwogfQog CiBMZWdhY3lEYXRhYmFzZSogTGVnYWN5QW55OjpsZWdhY3lEYXRhYmFzZSgpCiB7Ci0gICAgQVNT RVJUKG1fdHlwZSA9PSBJREJEYXRhYmFzZVR5cGUpOworICAgIEFTU0VSVChtX3R5cGUgPT0gVHlw ZTo6SURCRGF0YWJhc2UpOwogICAgIHJldHVybiBtX2lkYkRhdGFiYXNlLmdldCgpOwogfQogCiBM ZWdhY3lGYWN0b3J5KiBMZWdhY3lBbnk6OmxlZ2FjeUZhY3RvcnkoKQogewotICAgIEFTU0VSVCht X3R5cGUgPT0gSURCRmFjdG9yeVR5cGUpOworICAgIEFTU0VSVChtX3R5cGUgPT0gVHlwZTo6SURC RmFjdG9yeSk7CiAgICAgcmV0dXJuIG1faWRiRmFjdG9yeS5nZXQoKTsKIH0KIAogTGVnYWN5SW5k ZXgqIExlZ2FjeUFueTo6bGVnYWN5SW5kZXgoKQogewotICAgIEFTU0VSVChtX3R5cGUgPT0gSURC SW5kZXhUeXBlKTsKKyAgICBBU1NFUlQobV90eXBlID09IFR5cGU6OklEQkluZGV4KTsKICAgICBy ZXR1cm4gbV9pZGJJbmRleC5nZXQoKTsKIH0KIAogTGVnYWN5T2JqZWN0U3RvcmUqIExlZ2FjeUFu eTo6bGVnYWN5T2JqZWN0U3RvcmUoKQogewotICAgIEFTU0VSVChtX3R5cGUgPT0gSURCT2JqZWN0 U3RvcmVUeXBlKTsKKyAgICBBU1NFUlQobV90eXBlID09IFR5cGU6OklEQk9iamVjdFN0b3JlKTsK ICAgICByZXR1cm4gbV9pZGJPYmplY3RTdG9yZS5nZXQoKTsKIH0KIAogTGVnYWN5VHJhbnNhY3Rp b24qIExlZ2FjeUFueTo6bGVnYWN5VHJhbnNhY3Rpb24oKQogewotICAgIEFTU0VSVChtX3R5cGUg PT0gSURCVHJhbnNhY3Rpb25UeXBlKTsKKyAgICBBU1NFUlQobV90eXBlID09IFR5cGU6OklEQlRy YW5zYWN0aW9uKTsKICAgICByZXR1cm4gbV9pZGJUcmFuc2FjdGlvbi5nZXQoKTsKIH0KIApkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvbGVnYWN5L0xlZ2FjeUN1 cnNvci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9sZWdhY3kvTGVnYWN5 Q3Vyc29yLmNwcAppbmRleCBmMGU5NTVkLi5mNTU3NzFmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9sZWdhY3kvTGVnYWN5Q3Vyc29yLmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9sZWdhY3kvTGVnYWN5Q3Vyc29yLmNwcApAQCAt NTksNyArNTksNyBAQCBMZWdhY3lDdXJzb3I6OkxlZ2FjeUN1cnNvcihQYXNzUmVmUHRyPElEQkN1 cnNvckJhY2tlbmQ+IGJhY2tlbmQsIEluZGV4ZWREQjo6Q3VycwogewogICAgIEFTU0VSVChtX2Jh Y2tlbmQpOwogICAgIEFTU0VSVChtX3JlcXVlc3QpOwotICAgIEFTU0VSVChtX3NvdXJjZS0+dHlw ZSgpID09IElEQkFueTo6SURCT2JqZWN0U3RvcmVUeXBlIHx8IG1fc291cmNlLT50eXBlKCkgPT0g SURCQW55OjpJREJJbmRleFR5cGUpOworICAgIEFTU0VSVChtX3NvdXJjZS0+dHlwZSgpID09IElE QkFueTo6VHlwZTo6SURCT2JqZWN0U3RvcmUgfHwgbV9zb3VyY2UtPnR5cGUoKSA9PSBJREJBbnk6 OlR5cGU6OklEQkluZGV4KTsKICAgICBBU1NFUlQobV90cmFuc2FjdGlvbik7CiB9CiAKQEAgLTI2 Niw3ICsyNjYsNyBAQCB2b2lkIExlZ2FjeUN1cnNvcjo6c2V0VmFsdWVSZWFkeShET01SZXF1ZXN0 U3RhdGUqIHN0YXRlLCBQYXNzUmVmUHRyPElEQktleT4ga2V5LAogCiBQYXNzUmVmUHRyPExlZ2Fj eU9iamVjdFN0b3JlPiBMZWdhY3lDdXJzb3I6OmVmZmVjdGl2ZU9iamVjdFN0b3JlKCkKIHsKLSAg ICBpZiAobV9zb3VyY2UtPnR5cGUoKSA9PSBJREJBbnk6OklEQk9iamVjdFN0b3JlVHlwZSkKKyAg ICBpZiAobV9zb3VyY2UtPnR5cGUoKSA9PSBJREJBbnk6OlR5cGU6OklEQk9iamVjdFN0b3JlKQog ICAgICAgICByZXR1cm4gbV9zb3VyY2UtPmxlZ2FjeU9iamVjdFN0b3JlKCk7CiAgICAgUmVmUHRy PExlZ2FjeUluZGV4PiBpbmRleCA9IG1fc291cmNlLT5sZWdhY3lJbmRleCgpOwogICAgIHJldHVy biBpbmRleC0+bGVnYWN5T2JqZWN0U3RvcmUoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L01vZHVsZXMvaW5kZXhlZGRiL2xlZ2FjeS9MZWdhY3lPYmplY3RTdG9yZS5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9sZWdhY3kvTGVnYWN5T2JqZWN0U3RvcmUuY3BwCmlu ZGV4IDBiM2U2MWUuLjEwZmUxNjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMv aW5kZXhlZGRiL2xlZ2FjeS9MZWdhY3lPYmplY3RTdG9yZS5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvTW9kdWxlcy9pbmRleGVkZGIvbGVnYWN5L0xlZ2FjeU9iamVjdFN0b3JlLmNwcApAQCAtMzEw LDcgKzMxMCw3IEBAIHByaXZhdGU6CiAKICAgICAgICAgUmVmUHRyPExlZ2FjeUFueT4gY3Vyc29y QW55ID0gcmVxdWVzdC0+bGVnYWN5UmVzdWx0KEFTU0VSVF9OT19FWENFUFRJT04pOwogICAgICAg ICBSZWZQdHI8TGVnYWN5Q3Vyc29yV2l0aFZhbHVlPiBjdXJzb3I7Ci0gICAgICAgIGlmIChjdXJz b3JBbnktPnR5cGUoKSA9PSBJREJBbnk6OklEQkN1cnNvcldpdGhWYWx1ZVR5cGUpCisgICAgICAg IGlmIChjdXJzb3JBbnktPnR5cGUoKSA9PSBJREJBbnk6OlR5cGU6OklEQkN1cnNvcldpdGhWYWx1 ZSkKICAgICAgICAgICAgIGN1cnNvciA9IGN1cnNvckFueS0+bGVnYWN5Q3Vyc29yV2l0aFZhbHVl KCk7CiAKICAgICAgICAgVmVjdG9yPGludDY0X3QsIDE+IGluZGV4SWRzOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvbGVnYWN5L0xlZ2FjeU9wZW5EQlJlcXVl c3QuY3BwIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvbGVnYWN5L0xlZ2FjeU9w ZW5EQlJlcXVlc3QuY3BwCmluZGV4IDZhNzIzZTguLjU0NGI2MTUgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL2xlZ2FjeS9MZWdhY3lPcGVuREJSZXF1ZXN0LmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9sZWdhY3kvTGVnYWN5T3Bl bkRCUmVxdWVzdC5jcHAKQEAgLTE0Miw3ICsxNDIsNyBAQCBib29sIExlZ2FjeU9wZW5EQlJlcXVl c3Q6OmRpc3BhdGNoRXZlbnQoUGFzc1JlZlB0cjxFdmVudD4gZXZlbnQpCiB7CiAgICAgLy8gSWYg dGhlIGNvbm5lY3Rpb24gY2xvc2VkIGJldHdlZW4gb25VcGdyYWRlTmVlZGVkIGFuZCB0aGUgZGVs aXZlcnkgb2YgdGhlICJzdWNjZXNzIiBldmVudCwKICAgICAvLyBhbiAiZXJyb3IiIGV2ZW50IHNo b3VsZCBiZSBmaXJlZCBpbnN0ZWFkLgotICAgIGlmIChldmVudC0+dHlwZSgpID09IGV2ZW50TmFt ZXMoKS5zdWNjZXNzRXZlbnQgJiYgbV9yZXN1bHQtPnR5cGUoKSA9PSBJREJBbnk6OklEQkRhdGFi YXNlVHlwZSAmJiBtX3Jlc3VsdC0+bGVnYWN5RGF0YWJhc2UoKS0+aXNDbG9zZVBlbmRpbmcoKSkg eworICAgIGlmIChldmVudC0+dHlwZSgpID09IGV2ZW50TmFtZXMoKS5zdWNjZXNzRXZlbnQgJiYg bV9yZXN1bHQtPnR5cGUoKSA9PSBJREJBbnk6OlR5cGU6OklEQkRhdGFiYXNlICYmIG1fcmVzdWx0 LT5sZWdhY3lEYXRhYmFzZSgpLT5pc0Nsb3NlUGVuZGluZygpKSB7CiAgICAgICAgIG1fcmVzdWx0 ID0gbnVsbHB0cjsKICAgICAgICAgb25FcnJvcihJREJEYXRhYmFzZUVycm9yOjpjcmVhdGUoSURC RGF0YWJhc2VFeGNlcHRpb246OkFib3J0RXJyb3IsICJUaGUgY29ubmVjdGlvbiB3YXMgY2xvc2Vk LiIpKTsKICAgICAgICAgcmV0dXJuIGZhbHNlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv TW9kdWxlcy9pbmRleGVkZGIvbGVnYWN5L0xlZ2FjeVJlcXVlc3QuY3BwIGIvU291cmNlL1dlYkNv cmUvTW9kdWxlcy9pbmRleGVkZGIvbGVnYWN5L0xlZ2FjeVJlcXVlc3QuY3BwCmluZGV4IDBkNGVl OWQuLmQxZmFhOTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRi L2xlZ2FjeS9MZWdhY3lSZXF1ZXN0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2lu ZGV4ZWRkYi9sZWdhY3kvTGVnYWN5UmVxdWVzdC5jcHAKQEAgLTIwOSw5ICsyMDksOSBAQCBSZWZQ dHI8TGVnYWN5Q3Vyc29yPiBMZWdhY3lSZXF1ZXN0OjpnZXRSZXN1bHRDdXJzb3IoKQogewogICAg IGlmICghbV9yZXN1bHQpCiAgICAgICAgIHJldHVybiBudWxscHRyOwotICAgIGlmIChtX3Jlc3Vs dC0+dHlwZSgpID09IElEQkFueTo6SURCQ3Vyc29yVHlwZSkKKyAgICBpZiAobV9yZXN1bHQtPnR5 cGUoKSA9PSBJREJBbnk6OlR5cGU6OklEQkN1cnNvcikKICAgICAgICAgcmV0dXJuIG1fcmVzdWx0 LT5sZWdhY3lDdXJzb3IoKTsKLSAgICBpZiAobV9yZXN1bHQtPnR5cGUoKSA9PSBJREJBbnk6OklE QkN1cnNvcldpdGhWYWx1ZVR5cGUpCisgICAgaWYgKG1fcmVzdWx0LT50eXBlKCkgPT0gSURCQW55 OjpUeXBlOjpJREJDdXJzb3JXaXRoVmFsdWUpCiAgICAgICAgIHJldHVybiBtX3Jlc3VsdC0+bGVn YWN5Q3Vyc29yV2l0aFZhbHVlKCk7CiAgICAgcmV0dXJuIG51bGxwdHI7CiB9CkBAIC0zNDAsOSAr MzQwLDkgQEAgdm9pZCBMZWdhY3lSZXF1ZXN0OjpvblN1Y2Nlc3MoUGFzc1JlZlB0cjxTaGFyZWRC dWZmZXI+IHZhbHVlQnVmZmVyKQogI2lmbmRlZiBOREVCVUcKIHN0YXRpYyBQYXNzUmVmUHRyPElE Qk9iamVjdFN0b3JlPiBlZmZlY3RpdmVPYmplY3RTdG9yZShMZWdhY3lBbnkqIHNvdXJjZSkKIHsK LSAgICBpZiAoc291cmNlLT50eXBlKCkgPT0gSURCQW55OjpJREJPYmplY3RTdG9yZVR5cGUpCisg ICAgaWYgKHNvdXJjZS0+dHlwZSgpID09IElEQkFueTo6VHlwZTo6SURCT2JqZWN0U3RvcmUpCiAg ICAgICAgIHJldHVybiBzb3VyY2UtPmlkYk9iamVjdFN0b3JlKCk7Ci0gICAgaWYgKHNvdXJjZS0+ dHlwZSgpID09IElEQkFueTo6SURCSW5kZXhUeXBlKQorICAgIGlmIChzb3VyY2UtPnR5cGUoKSA9 PSBJREJBbnk6OlR5cGU6OklEQkluZGV4KQogICAgICAgICByZXR1cm4gc291cmNlLT5pZGJJbmRl eCgpLT5vYmplY3RTdG9yZSgpOwogCiAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0lEQkFueUN1c3RvbS5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0lEQkFueUN1c3RvbS5jcHAKaW5kZXggMWMwOGE1NS4u NjY0YjZmYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNJREJBbnlD dXN0b20uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTSURCQW55Q3VzdG9t LmNwcApAQCAtNzcsMzMgKzc3LDMzIEBAIEpTVmFsdWUgdG9KUyhFeGVjU3RhdGUqIGV4ZWMsIEpT RE9NR2xvYmFsT2JqZWN0KiBnbG9iYWxPYmplY3QsIElEQkFueSogaWRiQW55KQogICAgICAgICBy ZXR1cm4ganNOdWxsKCk7CiAKICAgICBzd2l0Y2ggKGlkYkFueS0+dHlwZSgpKSB7Ci0gICAgY2Fz ZSBJREJBbnk6OlVuZGVmaW5lZFR5cGU6CisgICAgY2FzZSBJREJBbnk6OlR5cGU6OlVuZGVmaW5l ZDoKICAgICAgICAgcmV0dXJuIGpzVW5kZWZpbmVkKCk7Ci0gICAgY2FzZSBJREJBbnk6Ok51bGxU eXBlOgorICAgIGNhc2UgSURCQW55OjpUeXBlOjpOdWxsOgogICAgICAgICByZXR1cm4ganNOdWxs KCk7Ci0gICAgY2FzZSBJREJBbnk6OkRPTVN0cmluZ0xpc3RUeXBlOgorICAgIGNhc2UgSURCQW55 OjpUeXBlOjpET01TdHJpbmdMaXN0OgogICAgICAgICByZXR1cm4gdG9KUyhleGVjLCBnbG9iYWxP YmplY3QsIGlkYkFueS0+ZG9tU3RyaW5nTGlzdCgpKTsKLSAgICBjYXNlIElEQkFueTo6SURCQ3Vy c29yVHlwZToKKyAgICBjYXNlIElEQkFueTo6VHlwZTo6SURCQ3Vyc29yOgogICAgICAgICByZXR1 cm4gdG9KUyhleGVjLCBnbG9iYWxPYmplY3QsIGlkYkFueS0+aWRiQ3Vyc29yKCkpOwotICAgIGNh c2UgSURCQW55OjpJREJDdXJzb3JXaXRoVmFsdWVUeXBlOgorICAgIGNhc2UgSURCQW55OjpUeXBl OjpJREJDdXJzb3JXaXRoVmFsdWU6CiAgICAgICAgIHJldHVybiB3cmFwPEpTSURCQ3Vyc29yV2l0 aFZhbHVlPihnbG9iYWxPYmplY3QsIGlkYkFueS0+aWRiQ3Vyc29yV2l0aFZhbHVlKCkuZ2V0KCkp OwotICAgIGNhc2UgSURCQW55OjpJREJEYXRhYmFzZVR5cGU6CisgICAgY2FzZSBJREJBbnk6OlR5 cGU6OklEQkRhdGFiYXNlOgogICAgICAgICByZXR1cm4gdG9KUyhleGVjLCBnbG9iYWxPYmplY3Qs IGlkYkFueS0+aWRiRGF0YWJhc2UoKSk7Ci0gICAgY2FzZSBJREJBbnk6OklEQkZhY3RvcnlUeXBl OgorICAgIGNhc2UgSURCQW55OjpUeXBlOjpJREJGYWN0b3J5OgogICAgICAgICByZXR1cm4gdG9K UyhleGVjLCBnbG9iYWxPYmplY3QsIGlkYkFueS0+aWRiRmFjdG9yeSgpKTsKLSAgICBjYXNlIElE QkFueTo6SURCSW5kZXhUeXBlOgorICAgIGNhc2UgSURCQW55OjpUeXBlOjpJREJJbmRleDoKICAg ICAgICAgcmV0dXJuIHRvSlMoZXhlYywgZ2xvYmFsT2JqZWN0LCBpZGJBbnktPmlkYkluZGV4KCkp OwotICAgIGNhc2UgSURCQW55OjpJREJPYmplY3RTdG9yZVR5cGU6CisgICAgY2FzZSBJREJBbnk6 OlR5cGU6OklEQk9iamVjdFN0b3JlOgogICAgICAgICByZXR1cm4gdG9KUyhleGVjLCBnbG9iYWxP YmplY3QsIGlkYkFueS0+aWRiT2JqZWN0U3RvcmUoKSk7Ci0gICAgY2FzZSBJREJBbnk6OklEQlRy YW5zYWN0aW9uVHlwZToKKyAgICBjYXNlIElEQkFueTo6VHlwZTo6SURCVHJhbnNhY3Rpb246CiAg ICAgICAgIHJldHVybiB0b0pTKGV4ZWMsIGdsb2JhbE9iamVjdCwgaWRiQW55LT5pZGJUcmFuc2Fj dGlvbigpKTsKLSAgICBjYXNlIElEQkFueTo6U2NyaXB0VmFsdWVUeXBlOgorICAgIGNhc2UgSURC QW55OjpUeXBlOjpTY3JpcHRWYWx1ZToKICAgICAgICAgcmV0dXJuIGlkYkFueS0+c2NyaXB0VmFs dWUoKS5qc1ZhbHVlKCk7Ci0gICAgY2FzZSBJREJBbnk6OlN0cmluZ1R5cGU6CisgICAgY2FzZSBJ REJBbnk6OlR5cGU6OlN0cmluZzoKICAgICAgICAgcmV0dXJuIGpzU3RyaW5nV2l0aENhY2hlKGV4 ZWMsIGlkYkFueS0+c3RyaW5nKCkpOwotICAgIGNhc2UgSURCQW55OjpJbnRlZ2VyVHlwZToKKyAg ICBjYXNlIElEQkFueTo6VHlwZTo6SW50ZWdlcjoKICAgICAgICAgcmV0dXJuIGpzTnVtYmVyKGlk YkFueS0+aW50ZWdlcigpKTsKLSAgICBjYXNlIElEQkFueTo6S2V5UGF0aFR5cGU6CisgICAgY2Fz ZSBJREJBbnk6OlR5cGU6OktleVBhdGg6CiAgICAgICAgIHJldHVybiB0b0pTKGV4ZWMsIGdsb2Jh bE9iamVjdCwgaWRiQW55LT5rZXlQYXRoKCkpOwogICAgIH0KIApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckluZGV4ZWREQkFnZW50LmNwcCBiL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JJbmRleGVkREJBZ2VudC5jcHAKaW5kZXggNjNmOWIy Yy4uYjZjZWQ4NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rv ckluZGV4ZWREQkFnZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVj dG9ySW5kZXhlZERCQWdlbnQuY3BwCkBAIC0xMjIsNyArMTIyLDcgQEAgcHVibGljOgogICAgICAg ICAgICAgbV9yZXF1ZXN0Q2FsbGJhY2stPnNlbmRGYWlsdXJlKCJDb3VsZCBub3QgZ2V0IHJlc3Vs dCBpbiBjYWxsYmFjay4iKTsKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQotICAgICAg ICBpZiAocmVxdWVzdFJlc3VsdC0+dHlwZSgpICE9IElEQkFueTo6RE9NU3RyaW5nTGlzdFR5cGUp IHsKKyAgICAgICAgaWYgKHJlcXVlc3RSZXN1bHQtPnR5cGUoKSAhPSBJREJBbnk6OlR5cGU6OkRP TVN0cmluZ0xpc3QpIHsKICAgICAgICAgICAgIG1fcmVxdWVzdENhbGxiYWNrLT5zZW5kRmFpbHVy ZSgiVW5leHBlY3RlZCByZXN1bHQgdHlwZS4iKTsKICAgICAgICAgICAgIHJldHVybjsKICAgICAg ICAgfQpAQCAtMTg0LDcgKzE4NCw3IEBAIHB1YmxpYzoKICAgICAgICAgICAgIG1fZXhlY3V0YWJs ZVdpdGhEYXRhYmFzZS0+cmVxdWVzdENhbGxiYWNrKCkuc2VuZEZhaWx1cmUoIkNvdWxkIG5vdCBn ZXQgcmVzdWx0IGluIGNhbGxiYWNrLiIpOwogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9 Ci0gICAgICAgIGlmIChyZXF1ZXN0UmVzdWx0LT50eXBlKCkgIT0gSURCQW55OjpJREJEYXRhYmFz ZVR5cGUpIHsKKyAgICAgICAgaWYgKHJlcXVlc3RSZXN1bHQtPnR5cGUoKSAhPSBJREJBbnk6OlR5 cGU6OklEQkRhdGFiYXNlKSB7CiAgICAgICAgICAgICBtX2V4ZWN1dGFibGVXaXRoRGF0YWJhc2Ut PnJlcXVlc3RDYWxsYmFjaygpLnNlbmRGYWlsdXJlKCJVbmV4cGVjdGVkIHJlc3VsdCB0eXBlLiIp OwogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CkBAIC00MzksMTEgKzQzOSwxMSBAQCBw dWJsaWM6CiAgICAgICAgICAgICBtX3JlcXVlc3RDYWxsYmFjay0+c2VuZEZhaWx1cmUoIkNvdWxk IG5vdCBnZXQgcmVzdWx0IGluIGNhbGxiYWNrLiIpOwogICAgICAgICAgICAgcmV0dXJuOwogICAg ICAgICB9Ci0gICAgICAgIGlmIChyZXF1ZXN0UmVzdWx0LT50eXBlKCkgPT0gSURCQW55OjpTY3Jp cHRWYWx1ZVR5cGUpIHsKKyAgICAgICAgaWYgKHJlcXVlc3RSZXN1bHQtPnR5cGUoKSA9PSBJREJB bnk6OlR5cGU6OlNjcmlwdFZhbHVlKSB7CiAgICAgICAgICAgICBlbmQoZmFsc2UpOwogICAgICAg ICAgICAgcmV0dXJuOwogICAgICAgICB9Ci0gICAgICAgIGlmIChyZXF1ZXN0UmVzdWx0LT50eXBl KCkgIT0gSURCQW55OjpJREJDdXJzb3JXaXRoVmFsdWVUeXBlKSB7CisgICAgICAgIGlmIChyZXF1 ZXN0UmVzdWx0LT50eXBlKCkgIT0gSURCQW55OjpUeXBlOjpJREJDdXJzb3JXaXRoVmFsdWUpIHsK ICAgICAgICAgICAgIG1fcmVxdWVzdENhbGxiYWNrLT5zZW5kRmFpbHVyZSgiVW5leHBlY3RlZCBy ZXN1bHQgdHlwZS4iKTsKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcGFnZS9EYXRhYmFzZVByb3ZpZGVyLmggYi9Tb3VyY2UvV2ViQ29y ZS9wYWdlL0RhdGFiYXNlUHJvdmlkZXIuaAppbmRleCBhOTI4NjExLi5hNmUyN2M1IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0RhdGFiYXNlUHJvdmlkZXIuaAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9wYWdlL0RhdGFiYXNlUHJvdmlkZXIuaApAQCAtMzEsNiArMzEsNyBAQAogCiBuYW1l c3BhY2UgV2ViQ29yZSB7CiAKK2NsYXNzIElEQkNvbm5lY3Rpb25NYW5hZ2VyOwogY2xhc3MgSURC RmFjdG9yeUJhY2tlbmRJbnRlcmZhY2U7CiAKIGNsYXNzIFdFQkNPUkVfRVhQT1JUIERhdGFiYXNl UHJvdmlkZXIgOiBwdWJsaWMgUmVmQ291bnRlZDxEYXRhYmFzZVByb3ZpZGVyPiB7Cg==