116399 2013-05-18 14:22:57 -0700 Simplify StorageArea getter functions 2013-05-18 15:10:40 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 890953 0 andersca 2013-05-18 14:22:57 -0700 Simplify StorageArea getter functions 890956 1 202218 andersca 2013-05-18 14:25:26 -0700 Created attachment 202218 Patch 890959 2 andersca 2013-05-18 15:10:40 -0700 Committed r150342: <http://trac.webkit.org/changeset/150342> 202218 2013-05-18 14:25:26 -0700 2013-05-18 15:06:27 -0700 Patch bug-116399-20130518142418.patch text/plain 13433 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTUwMzQxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTQzMWU5NGM3ZjAwODRl NTViMDU4MDVhYTA2NjMzMzA5OTRmMzI5OC4uZTZjYWM0NzVlMDMwMmM1OGY3N2E4YzQzOWUxOWI0 M2IxYmU2M2VmMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM0IEBACisyMDEzLTA1LTE4ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAgU2ltcGxpZnkgU3Rv cmFnZUFyZWEgZ2V0dGVyIGZ1bmN0aW9ucworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTE2Mzk5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzIChPT1BTISkuCisKKyAgICAgICAgTW92ZSB0 aGUgc2VjdXJpdHkgYW5kIHByaXZhdGUgYnJvd3NpbmcgY2hlY2tzIGZyb20gU3RvcmFnZUFyZWEg dG8gU3RvcmFnZSBzbyB3ZSBjYW4gc2hhcmUKKyAgICAgICAgbW9yZSBjb2RlIGJldHdlZW4gV2Vi S2l0MSBhbmQgV2ViS2l0Mi4KKworICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JET01TdG9y YWdlQWdlbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yRE9NU3RvcmFnZUFnZW50 OjpnZXRET01TdG9yYWdlSXRlbXMpOgorICAgICAgICBVcGRhdGUgdG8gbmV3IFN0b3JhZ2VBcmVh IGludGVyZmFjZS4gVGhlIHNlY3VyaXR5IGNoZWNrcyBhcmUgdW5uZWNlc3NhcnkgaGVyZSBhbnl3 YXkgYmVjYXVzZQorICAgICAgICBJbnNwZWN0b3JET01TdG9yYWdlQWdlbnQ6OmZpbmRTdG9yYWdl QXJlYSB3aWxsIG9ubHkgcmV0dXJuIGEgU3RvcmFnZUFyZWEgdGhhdCBjYW4gYmUgYWNjZXNzZWQK KyAgICAgICAgYnkgdGhlIGZyYW1lJ3Mgc2VjdXJpdHkgb3JpZ2luLgorICAgICAgICAKKyAgICAg ICAgKiBzdG9yYWdlL1N0b3JhZ2UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U3RvcmFnZTo6a2V5 KToKKyAgICAgICAgKFdlYkNvcmU6OlN0b3JhZ2U6OmdldEl0ZW0pOgorICAgICAgICAoV2ViQ29y ZTo6U3RvcmFnZTo6Y29udGFpbnMpOgorICAgICAgICAqIHN0b3JhZ2UvU3RvcmFnZUFyZWEuaDoK KyAgICAgICAgKFN0b3JhZ2VBcmVhKToKKyAgICAgICAgKiBzdG9yYWdlL1N0b3JhZ2VBcmVhSW1w bC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTdG9yYWdlQXJlYUltcGw6OmtleSk6CisgICAgICAg IChXZWJDb3JlOjpTdG9yYWdlQXJlYUltcGw6Oml0ZW0pOgorICAgICAgICAoV2ViQ29yZTo6U3Rv cmFnZUFyZWFJbXBsOjpjb250YWlucyk6CisgICAgICAgICogc3RvcmFnZS9TdG9yYWdlQXJlYUlt cGwuaDoKKyAgICAgICAgKFN0b3JhZ2VBcmVhSW1wbCk6CisKIDIwMTMtMDUtMTcgIFNpbW9uIEZy YXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CiAKICAgICAgICAgR2FyYmFnZSBvbiBwYWdl IGJhY2tncm91bmQgd2hpbGUgaHR0cDovL2NhbmJlcnJhYmFsbG9vbnMuY29tLmF1IGlzIGxvYWRp bmcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQy L0NoYW5nZUxvZwppbmRleCBhNWM4NmFkNTU0NjUxNTJjMTgxY2U1ZGMxYzA2MjE0YTdkODFjODhh Li5mYjNjNTA4ZDgyNGRkZGE5ZDhjNDU0Y2IxYTNiOTkyZWRlZTMzZGJjIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMTggQEAKKzIwMTMtMDUtMTggIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFw cGxlLmNvbT4KKworICAgICAgICBTaW1wbGlmeSBTdG9yYWdlQXJlYSBnZXR0ZXIgZnVuY3Rpb25z CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTYzOTkK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZW1vdmUg c2VjdXJpdHkgYW5kIHByaXZhdGUgYnJvd3NpbmcgY2hlY2tzLgorCisgICAgICAgICogV2ViUHJv Y2Vzcy9TdG9yYWdlL1N0b3JhZ2VBcmVhSW1wbC5jcHA6CisgICAgICAgIChXZWJLaXQ6OlN0b3Jh Z2VBcmVhSW1wbDo6a2V5KToKKyAgICAgICAgKFdlYktpdDo6U3RvcmFnZUFyZWFJbXBsOjppdGVt KToKKyAgICAgICAgKFdlYktpdDo6U3RvcmFnZUFyZWFJbXBsOjpjb250YWlucyk6CisgICAgICAg ICogV2ViUHJvY2Vzcy9TdG9yYWdlL1N0b3JhZ2VBcmVhSW1wbC5oOgorCiAyMDEzLTA1LTE4ICBQ YXRyaWNrIEdhbnN0ZXJlciAgPHBhcm9nYUB3ZWJraXQub3JnPgogCiAgICAgICAgIFtDTWFrZV0g UmVwbGFjZSAqX0xJQlJBUllfTkFNRSB3aXRoICpfT1VUUFVUX05BTUUKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JET01TdG9yYWdlQWdlbnQuY3BwIGIvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRPTVN0b3JhZ2VBZ2VudC5jcHAKaW5kZXgg NzZkOTA1YTQxNTY4ZTA5NzgwOWYwMjZmYmYzZjY5MDkxNzY4NjY3Yi4uNWU3MDRiYTc5MWM3ZDk3 NDU3OTg0YTEwNmVmYTZhMjkyZmVkNDRiYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL0luc3BlY3RvckRPTVN0b3JhZ2VBZ2VudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL0luc3BlY3RvckRPTVN0b3JhZ2VBZ2VudC5jcHAKQEAgLTYwLDIwICs2MCw2IEBA IG5hbWVzcGFjZSBET01TdG9yYWdlQWdlbnRTdGF0ZSB7CiBzdGF0aWMgY29uc3QgY2hhciBkb21T dG9yYWdlQWdlbnRFbmFibGVkW10gPSAiZG9tU3RvcmFnZUFnZW50RW5hYmxlZCI7CiB9OwogCi1z dGF0aWMgYm9vbCBoYWRFeGNlcHRpb24oRXhjZXB0aW9uQ29kZSBlYywgRXJyb3JTdHJpbmcqIGVy cm9yU3RyaW5nKQotewotICAgIHN3aXRjaCAoZWMpIHsKLSAgICBjYXNlIDA6Ci0gICAgICAgIHJl dHVybiBmYWxzZTsKLSAgICBjYXNlIFNFQ1VSSVRZX0VSUjoKLSAgICAgICAgKmVycm9yU3RyaW5n ID0gIlNlY3VyaXR5IGVycm9yIjsKLSAgICAgICAgcmV0dXJuIHRydWU7Ci0gICAgZGVmYXVsdDoK LSAgICAgICAgKmVycm9yU3RyaW5nID0gIlVua25vd24gRE9NIHN0b3JhZ2UgZXJyb3IiOwotICAg ICAgICByZXR1cm4gdHJ1ZTsKLSAgICB9Ci19Ci0KIEluc3BlY3RvckRPTVN0b3JhZ2VBZ2VudDo6 SW5zcGVjdG9yRE9NU3RvcmFnZUFnZW50KEluc3RydW1lbnRpbmdBZ2VudHMqIGluc3RydW1lbnRp bmdBZ2VudHMsIEluc3BlY3RvclBhZ2VBZ2VudCogcGFnZUFnZW50LCBJbnNwZWN0b3JDb21wb3Np dGVTdGF0ZSogc3RhdGUpCiAgICAgOiBJbnNwZWN0b3JCYXNlQWdlbnQ8SW5zcGVjdG9yRE9NU3Rv cmFnZUFnZW50PigiRE9NU3RvcmFnZSIsIGluc3RydW1lbnRpbmdBZ2VudHMsIHN0YXRlKQogICAg ICwgbV9wYWdlQWdlbnQocGFnZUFnZW50KQpAQCAtMTI2LDE5ICsxMTIsMTYgQEAgdm9pZCBJbnNw ZWN0b3JET01TdG9yYWdlQWdlbnQ6OmdldERPTVN0b3JhZ2VJdGVtcyhFcnJvclN0cmluZyogZXJy b3JTdHJpbmcsIGNvbnMKIAogICAgIFJlZlB0cjxUeXBlQnVpbGRlcjo6QXJyYXk8VHlwZUJ1aWxk ZXI6OkFycmF5PFN0cmluZz4gPiA+IHN0b3JhZ2VJdGVtcyA9IFR5cGVCdWlsZGVyOjpBcnJheTxU eXBlQnVpbGRlcjo6QXJyYXk8U3RyaW5nPiA+OjpjcmVhdGUoKTsKIAotICAgIEV4Y2VwdGlvbkNv ZGUgZWMgPSAwOwogICAgIGZvciAodW5zaWduZWQgaSA9IDA7IGkgPCBzdG9yYWdlQXJlYS0+bGVu Z3RoKCk7ICsraSkgewotICAgICAgICBTdHJpbmcgbmFtZShzdG9yYWdlQXJlYS0+a2V5KGksIGVj LCBmcmFtZSkpOwotICAgICAgICBpZiAoaGFkRXhjZXB0aW9uKGVjLCBlcnJvclN0cmluZykpCi0g ICAgICAgICAgICByZXR1cm47Ci0gICAgICAgIFN0cmluZyB2YWx1ZShzdG9yYWdlQXJlYS0+Z2V0 SXRlbShuYW1lLCBlYywgZnJhbWUpKTsKLSAgICAgICAgaWYgKGhhZEV4Y2VwdGlvbihlYywgZXJy b3JTdHJpbmcpKQotICAgICAgICAgICAgcmV0dXJuOworICAgICAgICBTdHJpbmcga2V5ID0gc3Rv cmFnZUFyZWEtPmtleShpKTsKKyAgICAgICAgU3RyaW5nIHZhbHVlID0gc3RvcmFnZUFyZWEtPml0 ZW0oa2V5KTsKKwogICAgICAgICBSZWZQdHI8VHlwZUJ1aWxkZXI6OkFycmF5PFN0cmluZz4gPiBl bnRyeSA9IFR5cGVCdWlsZGVyOjpBcnJheTxTdHJpbmc+OjpjcmVhdGUoKTsKLSAgICAgICAgZW50 cnktPmFkZEl0ZW0obmFtZSk7CisgICAgICAgIGVudHJ5LT5hZGRJdGVtKGtleSk7CiAgICAgICAg IGVudHJ5LT5hZGRJdGVtKHZhbHVlKTsKLSAgICAgICAgc3RvcmFnZUl0ZW1zLT5hZGRJdGVtKGVu dHJ5KTsKKyAgICAgICAgc3RvcmFnZUl0ZW1zLT5hZGRJdGVtKGVudHJ5LnJlbGVhc2UoKSk7CiAg ICAgfQorCiAgICAgaXRlbXMgPSBzdG9yYWdlSXRlbXMucmVsZWFzZSgpOwogfQogCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9zdG9yYWdlL1N0b3JhZ2UuY3BwIGIvU291cmNlL1dlYkNvcmUv c3RvcmFnZS9TdG9yYWdlLmNwcAppbmRleCAyNTIwZmE2N2EwYzFjODFhZWYwMmRlOWIzMjU1YmE2 ZmZiMTk0NTBmLi42Y2NkNGVhNGJlYTUwNjkzMWY5NThkZjU5YTMzNGM1NDliMWZlOGU4IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9zdG9yYWdlL1N0b3JhZ2UuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3N0b3JhZ2UvU3RvcmFnZS5jcHAKQEAgLTc0LDEyICs3NCwyOCBAQCB1bnNpZ25lZCBT dG9yYWdlOjpsZW5ndGgoRXhjZXB0aW9uQ29kZSYgZWMpIGNvbnN0CiAKIFN0cmluZyBTdG9yYWdl OjprZXkodW5zaWduZWQgaW5kZXgsIEV4Y2VwdGlvbkNvZGUmIGVjKSBjb25zdAogewotICAgIHJl dHVybiBtX3N0b3JhZ2VBcmVhLT5rZXkoaW5kZXgsIGVjLCBtX2ZyYW1lKTsKKyAgICBpZiAoIW1f c3RvcmFnZUFyZWEtPmNhbkFjY2Vzc1N0b3JhZ2UobV9mcmFtZSkpIHsKKyAgICAgICAgZWMgPSBT RUNVUklUWV9FUlI7CisgICAgICAgIHJldHVybiBTdHJpbmcoKTsKKyAgICB9CisKKyAgICBpZiAo aXNEaXNhYmxlZEJ5UHJpdmF0ZUJyb3dzaW5nKCkpCisgICAgICAgIHJldHVybiBTdHJpbmcoKTsK KworICAgIHJldHVybiBtX3N0b3JhZ2VBcmVhLT5rZXkoaW5kZXgpOwogfQogCiBTdHJpbmcgU3Rv cmFnZTo6Z2V0SXRlbShjb25zdCBTdHJpbmcmIGtleSwgRXhjZXB0aW9uQ29kZSYgZWMpIGNvbnN0 CiB7Ci0gICAgcmV0dXJuIG1fc3RvcmFnZUFyZWEtPmdldEl0ZW0oa2V5LCBlYywgbV9mcmFtZSk7 CisgICAgaWYgKCFtX3N0b3JhZ2VBcmVhLT5jYW5BY2Nlc3NTdG9yYWdlKG1fZnJhbWUpKSB7Cisg ICAgICAgIGVjID0gU0VDVVJJVFlfRVJSOworICAgICAgICByZXR1cm4gU3RyaW5nKCk7CisgICAg fQorCisgICAgaWYgKGlzRGlzYWJsZWRCeVByaXZhdGVCcm93c2luZygpKQorICAgICAgICByZXR1 cm4gU3RyaW5nKCk7CisKKyAgICByZXR1cm4gbV9zdG9yYWdlQXJlYS0+aXRlbShrZXkpOwogfQog CiB2b2lkIFN0b3JhZ2U6OnNldEl0ZW0oY29uc3QgU3RyaW5nJiBrZXksIGNvbnN0IFN0cmluZyYg dmFsdWUsIEV4Y2VwdGlvbkNvZGUmIGVjKQpAQCAtOTksNyArMTE1LDE1IEBAIHZvaWQgU3RvcmFn ZTo6Y2xlYXIoRXhjZXB0aW9uQ29kZSYgZWMpCiAKIGJvb2wgU3RvcmFnZTo6Y29udGFpbnMoY29u c3QgU3RyaW5nJiBrZXksIEV4Y2VwdGlvbkNvZGUmIGVjKSBjb25zdAogewotICAgIHJldHVybiBt X3N0b3JhZ2VBcmVhLT5jb250YWlucyhrZXksIGVjLCBtX2ZyYW1lKTsKKyAgICBpZiAoIW1fc3Rv cmFnZUFyZWEtPmNhbkFjY2Vzc1N0b3JhZ2UobV9mcmFtZSkpIHsKKyAgICAgICAgZWMgPSBTRUNV UklUWV9FUlI7CisgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICB9CisKKyAgICBpZiAoaXNEaXNh YmxlZEJ5UHJpdmF0ZUJyb3dzaW5nKCkpCisgICAgICAgIHJldHVybiBmYWxzZTsKKworICAgIHJl dHVybiBtX3N0b3JhZ2VBcmVhLT5jb250YWlucyhrZXkpOwogfQogCiBib29sIFN0b3JhZ2U6Omlz RGlzYWJsZWRCeVByaXZhdGVCcm93c2luZygpIGNvbnN0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9zdG9yYWdlL1N0b3JhZ2VBcmVhLmggYi9Tb3VyY2UvV2ViQ29yZS9zdG9yYWdlL1N0b3Jh Z2VBcmVhLmgKaW5kZXggZTM5OWNmYzU2OGQ4NzNmYzBkNTY0N2UyNGQ2NGZmMDVmODFmYzYzOC4u NjU3MzJjODM3YWUxZTc1YmIzNDRkOGQ1ODE4NWRlM2QxNzNhMmNiMiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvc3RvcmFnZS9TdG9yYWdlQXJlYS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3N0 b3JhZ2UvU3RvcmFnZUFyZWEuaApAQCAtNDUsMTIgKzQ1LDEyIEBAIHB1YmxpYzoKICAgICAvLyBU aGUgSFRNTDUgRE9NIFN0b3JhZ2UgQVBJCiAgICAgLy8gRklYTUU6IFdlIHNob3VsZCBwYXNzIERv Y3VtZW50IGluc3RlYWQgb2YgRnJhbWUuIEFsc28sIHRoYXQgcGFyYW1ldGVyIHNob3VsZCBnbyBm aXJzdC4KICAgICB2aXJ0dWFsIHVuc2lnbmVkIGxlbmd0aCgpID0gMDsKLSAgICB2aXJ0dWFsIFN0 cmluZyBrZXkodW5zaWduZWQgaW5kZXgsIEV4Y2VwdGlvbkNvZGUmLCBGcmFtZSogc291cmNlRnJh bWUpID0gMDsKLSAgICB2aXJ0dWFsIFN0cmluZyBnZXRJdGVtKGNvbnN0IFN0cmluZyYga2V5LCBF eGNlcHRpb25Db2RlJiwgRnJhbWUqIHNvdXJjZUZyYW1lKSA9IDA7CisgICAgdmlydHVhbCBTdHJp bmcga2V5KHVuc2lnbmVkIGluZGV4KSA9IDA7CisgICAgdmlydHVhbCBTdHJpbmcgaXRlbShjb25z dCBTdHJpbmcmIGtleSkgPSAwOwogICAgIHZpcnR1YWwgdm9pZCBzZXRJdGVtKGNvbnN0IFN0cmlu ZyYga2V5LCBjb25zdCBTdHJpbmcmIHZhbHVlLCBFeGNlcHRpb25Db2RlJiwgRnJhbWUqIHNvdXJj ZUZyYW1lKSA9IDA7CiAgICAgdmlydHVhbCB2b2lkIHJlbW92ZUl0ZW0oY29uc3QgU3RyaW5nJiBr ZXksIEV4Y2VwdGlvbkNvZGUmLCBGcmFtZSogc291cmNlRnJhbWUpID0gMDsKICAgICB2aXJ0dWFs IHZvaWQgY2xlYXIoRXhjZXB0aW9uQ29kZSYsIEZyYW1lKiBzb3VyY2VGcmFtZSkgPSAwOwotICAg IHZpcnR1YWwgYm9vbCBjb250YWlucyhjb25zdCBTdHJpbmcmIGtleSwgRXhjZXB0aW9uQ29kZSYs IEZyYW1lKiBzb3VyY2VGcmFtZSkgPSAwOworICAgIHZpcnR1YWwgYm9vbCBjb250YWlucyhjb25z dCBTdHJpbmcmIGtleSkgPSAwOwogCiAgICAgdmlydHVhbCBib29sIGNhbkFjY2Vzc1N0b3JhZ2Uo RnJhbWUqKSA9IDA7CiAgICAgdmlydHVhbCBTdG9yYWdlVHlwZSBzdG9yYWdlVHlwZSgpIGNvbnN0 ID0gMDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3N0b3JhZ2UvU3RvcmFnZUFyZWFJbXBs LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3N0b3JhZ2UvU3RvcmFnZUFyZWFJbXBsLmNwcAppbmRleCAy MmQxY2IyNDYyMGM1MDA2YTJiY2ZiZDFmZmRjMjU1MWNkYTQwOWNiLi45YTUzNmE5ODYwOTE3ZWNi MDZjMWU5YmU0MDMwOWM3OTA4MTY1NzJlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9zdG9y YWdlL1N0b3JhZ2VBcmVhSW1wbC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvc3RvcmFnZS9TdG9y YWdlQXJlYUltcGwuY3BwCkBAIC0xMzEsMzIgKzEzMSwxNiBAQCB1bnNpZ25lZCBTdG9yYWdlQXJl YUltcGw6Omxlbmd0aCgpCiAgICAgcmV0dXJuIG1fc3RvcmFnZU1hcC0+bGVuZ3RoKCk7CiB9CiAK LVN0cmluZyBTdG9yYWdlQXJlYUltcGw6OmtleSh1bnNpZ25lZCBpbmRleCwgRXhjZXB0aW9uQ29k ZSYgZWMsIEZyYW1lKiBmcmFtZSkKK1N0cmluZyBTdG9yYWdlQXJlYUltcGw6OmtleSh1bnNpZ25l ZCBpbmRleCkKIHsKLSAgICBlYyA9IDA7Ci0gICAgaWYgKCFjYW5BY2Nlc3NTdG9yYWdlKGZyYW1l KSkgewotICAgICAgICBlYyA9IFNFQ1VSSVRZX0VSUjsKLSAgICAgICAgcmV0dXJuIFN0cmluZygp OwotICAgIH0KLSAgICBpZiAoZGlzYWJsZWRCeVByaXZhdGVCcm93c2luZ0luRnJhbWUoZnJhbWUp KQotICAgICAgICByZXR1cm4gU3RyaW5nKCk7Ci0KICAgICBBU1NFUlQoIW1faXNTaHV0ZG93bik7 CiAgICAgYmxvY2tVbnRpbEltcG9ydENvbXBsZXRlKCk7CiAKICAgICByZXR1cm4gbV9zdG9yYWdl TWFwLT5rZXkoaW5kZXgpOwogfQogCi1TdHJpbmcgU3RvcmFnZUFyZWFJbXBsOjpnZXRJdGVtKGNv bnN0IFN0cmluZyYga2V5LCBFeGNlcHRpb25Db2RlJiBlYywgRnJhbWUqIGZyYW1lKQorU3RyaW5n IFN0b3JhZ2VBcmVhSW1wbDo6aXRlbShjb25zdCBTdHJpbmcmIGtleSkKIHsKLSAgICBlYyA9IDA7 Ci0gICAgaWYgKCFjYW5BY2Nlc3NTdG9yYWdlKGZyYW1lKSkgewotICAgICAgICBlYyA9IFNFQ1VS SVRZX0VSUjsKLSAgICAgICAgcmV0dXJuIFN0cmluZygpOwotICAgIH0KLSAgICBpZiAoZGlzYWJs ZWRCeVByaXZhdGVCcm93c2luZ0luRnJhbWUoZnJhbWUpKQotICAgICAgICByZXR1cm4gU3RyaW5n KCk7Ci0KICAgICBBU1NFUlQoIW1faXNTaHV0ZG93bik7CiAgICAgYmxvY2tVbnRpbEltcG9ydENv bXBsZXRlKCk7CiAKQEAgLTI1MiwxNiArMjM2LDggQEAgdm9pZCBTdG9yYWdlQXJlYUltcGw6OmNs ZWFyKEV4Y2VwdGlvbkNvZGUmIGVjLCBGcmFtZSogZnJhbWUpCiAgICAgZGlzcGF0Y2hTdG9yYWdl RXZlbnQoU3RyaW5nKCksIFN0cmluZygpLCBTdHJpbmcoKSwgZnJhbWUpOwogfQogCi1ib29sIFN0 b3JhZ2VBcmVhSW1wbDo6Y29udGFpbnMoY29uc3QgU3RyaW5nJiBrZXksIEV4Y2VwdGlvbkNvZGUm IGVjLCBGcmFtZSogZnJhbWUpCitib29sIFN0b3JhZ2VBcmVhSW1wbDo6Y29udGFpbnMoY29uc3Qg U3RyaW5nJiBrZXkpCiB7Ci0gICAgZWMgPSAwOwotICAgIGlmICghY2FuQWNjZXNzU3RvcmFnZShm cmFtZSkpIHsKLSAgICAgICAgZWMgPSBTRUNVUklUWV9FUlI7Ci0gICAgICAgIHJldHVybiBmYWxz ZTsKLSAgICB9Ci0gICAgaWYgKGRpc2FibGVkQnlQcml2YXRlQnJvd3NpbmdJbkZyYW1lKGZyYW1l KSkKLSAgICAgICAgcmV0dXJuIGZhbHNlOwotCiAgICAgQVNTRVJUKCFtX2lzU2h1dGRvd24pOwog ICAgIGJsb2NrVW50aWxJbXBvcnRDb21wbGV0ZSgpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9zdG9yYWdlL1N0b3JhZ2VBcmVhSW1wbC5oIGIvU291cmNlL1dlYkNvcmUvc3RvcmFnZS9T dG9yYWdlQXJlYUltcGwuaAppbmRleCBlM2JjOTdiOTMyODVhOWM4NDNkN2ZmZWJmNmVhYTYwYjYz YmQzNGNlLi41NDQ3ZjdjYTIxNWY3MDg3NDU1YmFlM2JmZDQ2ZGI2OWExZTk5ZjllIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9zdG9yYWdlL1N0b3JhZ2VBcmVhSW1wbC5oCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3N0b3JhZ2UvU3RvcmFnZUFyZWFJbXBsLmgKQEAgLTQ1LDEyICs0NSwxMiBAQCBw dWJsaWM6CiAgICAgdmlydHVhbCB+U3RvcmFnZUFyZWFJbXBsKCk7CiAKICAgICB2aXJ0dWFsIHVu c2lnbmVkIGxlbmd0aCgpIE9WRVJSSURFOwotICAgIHZpcnR1YWwgU3RyaW5nIGtleSh1bnNpZ25l ZCBpbmRleCwgRXhjZXB0aW9uQ29kZSYsIEZyYW1lKiBzb3VyY2VGcmFtZSkgT1ZFUlJJREU7Ci0g ICAgdmlydHVhbCBTdHJpbmcgZ2V0SXRlbShjb25zdCBTdHJpbmcmIGtleSwgRXhjZXB0aW9uQ29k ZSYsIEZyYW1lKiBzb3VyY2VGcmFtZSkgT1ZFUlJJREU7CisgICAgdmlydHVhbCBTdHJpbmcga2V5 KHVuc2lnbmVkIGluZGV4KSBPVkVSUklERTsKKyAgICB2aXJ0dWFsIFN0cmluZyBpdGVtKGNvbnN0 IFN0cmluZyYga2V5KSBPVkVSUklERTsKICAgICB2aXJ0dWFsIHZvaWQgc2V0SXRlbShjb25zdCBT dHJpbmcmIGtleSwgY29uc3QgU3RyaW5nJiB2YWx1ZSwgRXhjZXB0aW9uQ29kZSYsIEZyYW1lKiBz b3VyY2VGcmFtZSkgT1ZFUlJJREU7CiAgICAgdmlydHVhbCB2b2lkIHJlbW92ZUl0ZW0oY29uc3Qg U3RyaW5nJiBrZXksIEV4Y2VwdGlvbkNvZGUmLCBGcmFtZSogc291cmNlRnJhbWUpIE9WRVJSSURF OwogICAgIHZpcnR1YWwgdm9pZCBjbGVhcihFeGNlcHRpb25Db2RlJiwgRnJhbWUqIHNvdXJjZUZy YW1lKSBPVkVSUklERTsKLSAgICB2aXJ0dWFsIGJvb2wgY29udGFpbnMoY29uc3QgU3RyaW5nJiBr ZXksIEV4Y2VwdGlvbkNvZGUmLCBGcmFtZSogc291cmNlRnJhbWUpIE9WRVJSSURFOworICAgIHZp cnR1YWwgYm9vbCBjb250YWlucyhjb25zdCBTdHJpbmcmIGtleSkgT1ZFUlJJREU7CiAKICAgICB2 aXJ0dWFsIGJvb2wgY2FuQWNjZXNzU3RvcmFnZShGcmFtZSogc291cmNlRnJhbWUpIE9WRVJSSURF OwogICAgIHZpcnR1YWwgU3RvcmFnZVR5cGUgc3RvcmFnZVR5cGUoKSBjb25zdCBPVkVSUklERTsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvU3RvcmFnZS9TdG9yYWdlQXJl YUltcGwuY3BwIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9TdG9yYWdlL1N0b3JhZ2VBcmVh SW1wbC5jcHAKaW5kZXggN2NlNmI1YzM5NTFkMWY3ZTU0MTRiNmVmNjdkYjIyOGExMDEyYjc1My4u ZDcwYjU3ZmQzYmYxOTNhN2RjYTFjMjg1N2EzODlkZTk4MWEyZDhjZSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9TdG9yYWdlL1N0b3JhZ2VBcmVhSW1wbC5jcHAKKysrIGIv U291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9TdG9yYWdlL1N0b3JhZ2VBcmVhSW1wbC5jcHAKQEAg LTY0LDMxICs2NCwxMyBAQCB1bnNpZ25lZCBTdG9yYWdlQXJlYUltcGw6Omxlbmd0aCgpCiAgICAg cmV0dXJuIG1fc3RvcmFnZUFyZWFNYXAtPmxlbmd0aCgpOwogfQogCi1TdHJpbmcgU3RvcmFnZUFy ZWFJbXBsOjprZXkodW5zaWduZWQgaW5kZXgsIEV4Y2VwdGlvbkNvZGUmIGVjLCBGcmFtZSogc291 cmNlRnJhbWUpCitTdHJpbmcgU3RvcmFnZUFyZWFJbXBsOjprZXkodW5zaWduZWQgaW5kZXgpCiB7 Ci0gICAgZWMgPSAwOwotICAgIGlmICghY2FuQWNjZXNzU3RvcmFnZShzb3VyY2VGcmFtZSkpIHsK LSAgICAgICAgZWMgPSBTRUNVUklUWV9FUlI7Ci0gICAgICAgIHJldHVybiBTdHJpbmcoKTsKLSAg ICB9Ci0KLSAgICBpZiAoZGlzYWJsZWRCeVByaXZhdGVCcm93c2luZ0luRnJhbWUoc291cmNlRnJh bWUpKQotICAgICAgICByZXR1cm4gU3RyaW5nKCk7Ci0KICAgICByZXR1cm4gbV9zdG9yYWdlQXJl YU1hcC0+a2V5KGluZGV4KTsKIH0KIAotU3RyaW5nIFN0b3JhZ2VBcmVhSW1wbDo6Z2V0SXRlbShj b25zdCBTdHJpbmcmIGtleSwgRXhjZXB0aW9uQ29kZSYgZWMsIEZyYW1lKiBzb3VyY2VGcmFtZSkK K1N0cmluZyBTdG9yYWdlQXJlYUltcGw6Oml0ZW0oY29uc3QgU3RyaW5nJiBrZXkpCiB7Ci0gICAg ZWMgPSAwOwotICAgIGlmICghY2FuQWNjZXNzU3RvcmFnZShzb3VyY2VGcmFtZSkpIHsKLSAgICAg ICAgZWMgPSBTRUNVUklUWV9FUlI7Ci0gICAgICAgIHJldHVybiBTdHJpbmcoKTsKLSAgICB9Ci0K LSAgICBpZiAoZGlzYWJsZWRCeVByaXZhdGVCcm93c2luZ0luRnJhbWUoc291cmNlRnJhbWUpKQot ICAgICAgICByZXR1cm4gU3RyaW5nKCk7Ci0KICAgICByZXR1cm4gbV9zdG9yYWdlQXJlYU1hcC0+ aXRlbShrZXkpOwogfQogCkBAIC0xNDIsMTYgKzEyNCw4IEBAIHZvaWQgU3RvcmFnZUFyZWFJbXBs OjpjbGVhcihFeGNlcHRpb25Db2RlJiBlYywgRnJhbWUqIHNvdXJjZUZyYW1lKQogICAgIG1fc3Rv cmFnZUFyZWFNYXAtPmNsZWFyKHNvdXJjZUZyYW1lLCB0aGlzKTsKIH0KIAotYm9vbCBTdG9yYWdl QXJlYUltcGw6OmNvbnRhaW5zKGNvbnN0IFN0cmluZyYga2V5LCBFeGNlcHRpb25Db2RlJiBlYywg RnJhbWUqIHNvdXJjZUZyYW1lKQorYm9vbCBTdG9yYWdlQXJlYUltcGw6OmNvbnRhaW5zKGNvbnN0 IFN0cmluZyYga2V5KQogewotICAgIGVjID0gMDsKLSAgICBpZiAoIWNhbkFjY2Vzc1N0b3JhZ2Uo c291cmNlRnJhbWUpKSB7Ci0gICAgICAgIGVjID0gU0VDVVJJVFlfRVJSOwotICAgICAgICByZXR1 cm4gZmFsc2U7Ci0gICAgfQotICAgIGlmIChkaXNhYmxlZEJ5UHJpdmF0ZUJyb3dzaW5nSW5GcmFt ZShzb3VyY2VGcmFtZSkpCi0gICAgICAgIHJldHVybiBmYWxzZTsKLQogICAgIHJldHVybiBtX3N0 b3JhZ2VBcmVhTWFwLT5jb250YWlucyhrZXkpOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0Mi9XZWJQcm9jZXNzL1N0b3JhZ2UvU3RvcmFnZUFyZWFJbXBsLmggYi9Tb3VyY2UvV2ViS2l0 Mi9XZWJQcm9jZXNzL1N0b3JhZ2UvU3RvcmFnZUFyZWFJbXBsLmgKaW5kZXggYzFkYjUwNzFlNGQy ZWY1ZGNiYzg0NmVhNThiNDc5OGVhMjUxZWI1NS4uOWFkODQyM2QxOTZlOWI2NmI4MGQyMTQwNjQw N2Y1YjYzMGFkODE4MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9TdG9y YWdlL1N0b3JhZ2VBcmVhSW1wbC5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvU3Rv cmFnZS9TdG9yYWdlQXJlYUltcGwuaApAQCAtNDcsMTIgKzQ3LDEyIEBAIHByaXZhdGU6CiAKICAg ICAvLyBXZWJDb3JlOjpTdG9yYWdlQXJlYS4KICAgICB2aXJ0dWFsIHVuc2lnbmVkIGxlbmd0aCgp IE9WRVJSSURFOwotICAgIHZpcnR1YWwgU3RyaW5nIGtleSh1bnNpZ25lZCBpbmRleCwgV2ViQ29y ZTo6RXhjZXB0aW9uQ29kZSYsIFdlYkNvcmU6OkZyYW1lKiBzb3VyY2VGcmFtZSkgT1ZFUlJJREU7 Ci0gICAgdmlydHVhbCBTdHJpbmcgZ2V0SXRlbShjb25zdCBTdHJpbmcmIGtleSwgV2ViQ29yZTo6 RXhjZXB0aW9uQ29kZSYsIFdlYkNvcmU6OkZyYW1lKiBzb3VyY2VGcmFtZSkgT1ZFUlJJREU7Cisg ICAgdmlydHVhbCBTdHJpbmcga2V5KHVuc2lnbmVkIGluZGV4KSBPVkVSUklERTsKKyAgICB2aXJ0 dWFsIFN0cmluZyBpdGVtKGNvbnN0IFN0cmluZyYga2V5KSBPVkVSUklERTsKICAgICB2aXJ0dWFs IHZvaWQgc2V0SXRlbShjb25zdCBTdHJpbmcmIGtleSwgY29uc3QgU3RyaW5nJiB2YWx1ZSwgV2Vi Q29yZTo6RXhjZXB0aW9uQ29kZSYsIFdlYkNvcmU6OkZyYW1lKiBzb3VyY2VGcmFtZSkgT1ZFUlJJ REU7CiAgICAgdmlydHVhbCB2b2lkIHJlbW92ZUl0ZW0oY29uc3QgU3RyaW5nJiBrZXksIFdlYkNv cmU6OkV4Y2VwdGlvbkNvZGUmLCBXZWJDb3JlOjpGcmFtZSogc291cmNlRnJhbWUpIE9WRVJSSURF OwogICAgIHZpcnR1YWwgdm9pZCBjbGVhcihXZWJDb3JlOjpFeGNlcHRpb25Db2RlJiwgV2ViQ29y ZTo6RnJhbWUqIHNvdXJjZUZyYW1lKSBPVkVSUklERTsKLSAgICB2aXJ0dWFsIGJvb2wgY29udGFp bnMoY29uc3QgU3RyaW5nJiBrZXksIFdlYkNvcmU6OkV4Y2VwdGlvbkNvZGUmLCBXZWJDb3JlOjpG cmFtZSogc291cmNlRnJhbWUpIE9WRVJSSURFOworICAgIHZpcnR1YWwgYm9vbCBjb250YWlucyhj b25zdCBTdHJpbmcmIGtleSkgT1ZFUlJJREU7CiAgICAgdmlydHVhbCBib29sIGNhbkFjY2Vzc1N0 b3JhZ2UoV2ViQ29yZTo6RnJhbWUqKSBPVkVSUklERTsKICAgICB2aXJ0dWFsIFdlYkNvcmU6OlN0 b3JhZ2VUeXBlIHN0b3JhZ2VUeXBlKCkgY29uc3QgT1ZFUlJJREU7CiAgICAgdmlydHVhbCBzaXpl X3QgbWVtb3J5Qnl0ZXNVc2VkQnlDYWNoZSgpIE9WRVJSSURFOwo=