140054 2015-01-04 10:49:50 -0800 Modernize parts of the database code 2015-01-04 10:57:44 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 1058545 0 andersca 2015-01-04 10:49:50 -0800 Modernize parts of the database code 1058546 1 243930 andersca 2015-01-04 10:53:06 -0800 Created attachment 243930 Patch 1058547 2 andersca 2015-01-04 10:57:44 -0800 Committed r177873: <http://trac.webkit.org/changeset/177873> 243930 2015-01-04 10:53:06 -0800 2015-01-04 10:56:51 -0800 Patch bug-140054-20150104105313.patch text/plain 12572 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTc3ODcyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMWNkNDZhNTY4MjkyOTk0 Y2MxMjcyMDAzN2ZkMTI1NDJkZGVmYmMyOS4uM2YxZTUwZTdhODZkMjA5ZjMzMmI1Nzc4MTUyM2Yw MzQxYzRkNzkzNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDE1LTAxLTA0ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAgTW9kZXJuaXplIHBh cnRzIG9mIHRoZSBkYXRhYmFzZSBjb2RlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xNDAwNTQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICAqIE1vZHVsZXMvd2ViZGF0YWJhc2UvRGF0YWJhc2UuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6RGF0YWJhc2U6OnJ1blRyYW5zYWN0aW9uKToKKyAgICAgICAgKiBNb2R1 bGVzL3dlYmRhdGFiYXNlL0RhdGFiYXNlLmg6CisgICAgICAgICogTW9kdWxlcy93ZWJkYXRhYmFz ZS9TUUxTdGF0ZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U1FMU3RhdGVtZW50OjpTUUxT dGF0ZW1lbnQpOgorICAgICAgICAqIE1vZHVsZXMvd2ViZGF0YWJhc2UvU1FMU3RhdGVtZW50Lmg6 CisgICAgICAgICogTW9kdWxlcy93ZWJkYXRhYmFzZS9TUUxUcmFuc2FjdGlvbi5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpTUUxUcmFuc2FjdGlvbjo6Y3JlYXRlKToKKyAgICAgICAgKFdlYkNvcmU6 OlNRTFRyYW5zYWN0aW9uOjpTUUxUcmFuc2FjdGlvbik6CisgICAgICAgIChXZWJDb3JlOjpTUUxU cmFuc2FjdGlvbjo6ZGVsaXZlclF1b3RhSW5jcmVhc2VDYWxsYmFjayk6CisgICAgICAgIChXZWJD b3JlOjpTUUxUcmFuc2FjdGlvbjo6ZXhlY3V0ZVNRTCk6CisgICAgICAgICogTW9kdWxlcy93ZWJk YXRhYmFzZS9TUUxUcmFuc2FjdGlvbi5oOgorICAgICAgICAoV2ViQ29yZTo6U1FMVHJhbnNhY3Rp b246OmRhdGFiYXNlKToKKwogMjAxNS0wMS0wMyAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUu Y29tPgogCiAgICAgICAgIE1vdmUgdGhlIENTUyBHcmlkIHByb3BlcnRpZXMgdG8gdGhlIG5ldyBT dHlsZUJ1aWxkZXIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2ViZGF0YWJh c2UvRGF0YWJhc2UuY3BwIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJkYXRhYmFzZS9EYXRh YmFzZS5jcHAKaW5kZXggZjJlMTVmODZhODQ1ZjNkMWEyZmJkYjg4MDBkMGJiN2NmNzY3NmY1ZC4u MzBhMTUxMDA0MGM2M2M3NjA3YTc0NDFjOTM0MTNkZmRkZjUyNmMyOCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJkYXRhYmFzZS9EYXRhYmFzZS5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvTW9kdWxlcy93ZWJkYXRhYmFzZS9EYXRhYmFzZS5jcHAKQEAgLTE2MiwxNyArMTYy LDE3IEBAIHZvaWQgRGF0YWJhc2U6OnJlYWRUcmFuc2FjdGlvbihQYXNzUmVmUHRyPFNRTFRyYW5z YWN0aW9uQ2FsbGJhY2s+IGNhbGxiYWNrLCBQYXNzCiAgICAgcnVuVHJhbnNhY3Rpb24oY2FsbGJh Y2ssIGVycm9yQ2FsbGJhY2ssIHN1Y2Nlc3NDYWxsYmFjaywgdHJ1ZSk7CiB9CiAKLXZvaWQgRGF0 YWJhc2U6OnJ1blRyYW5zYWN0aW9uKFBhc3NSZWZQdHI8U1FMVHJhbnNhY3Rpb25DYWxsYmFjaz4g Y2FsbGJhY2ssIFBhc3NSZWZQdHI8U1FMVHJhbnNhY3Rpb25FcnJvckNhbGxiYWNrPiBlcnJvckNh bGxiYWNrLAotICAgIFBhc3NSZWZQdHI8Vm9pZENhbGxiYWNrPiBzdWNjZXNzQ2FsbGJhY2ssIGJv b2wgcmVhZE9ubHksIGNvbnN0IENoYW5nZVZlcnNpb25EYXRhKiBjaGFuZ2VWZXJzaW9uRGF0YSkK K3ZvaWQgRGF0YWJhc2U6OnJ1blRyYW5zYWN0aW9uKFJlZlB0cjxTUUxUcmFuc2FjdGlvbkNhbGxi YWNrPiYmIGNhbGxiYWNrLCBSZWZQdHI8U1FMVHJhbnNhY3Rpb25FcnJvckNhbGxiYWNrPiYmIGVy cm9yQ2FsbGJhY2ssIFJlZlB0cjxWb2lkQ2FsbGJhY2s+JiYgc3VjY2Vzc0NhbGxiYWNrLCBib29s IHJlYWRPbmx5LCBjb25zdCBDaGFuZ2VWZXJzaW9uRGF0YSogY2hhbmdlVmVyc2lvbkRhdGEpCiB7 Ci0gICAgUmVmUHRyPFNRTFRyYW5zYWN0aW9uRXJyb3JDYWxsYmFjaz4gZXJyb3JDYWxsYmFja1By b3RlY3RvcihlcnJvckNhbGxiYWNrKTsKLSAgICBSZWZQdHI8U1FMVHJhbnNhY3Rpb24+IHRyYW5z YWN0aW9uID0gU1FMVHJhbnNhY3Rpb246OmNyZWF0ZSh0aGlzLCBjYWxsYmFjaywgc3VjY2Vzc0Nh bGxiYWNrLCBlcnJvckNhbGxiYWNrUHJvdGVjdG9yLCByZWFkT25seSk7CisgICAgUmVmUHRyPFNR TFRyYW5zYWN0aW9uPiB0cmFuc2FjdGlvbiA9IFNRTFRyYW5zYWN0aW9uOjpjcmVhdGUoKnRoaXMs IFdURjo6bW92ZShjYWxsYmFjayksIFdURjo6bW92ZShzdWNjZXNzQ2FsbGJhY2spLCBlcnJvckNh bGxiYWNrLmNvcHlSZWYoKSwgcmVhZE9ubHkpOwogCi0gICAgUmVmUHRyPFNRTFRyYW5zYWN0aW9u QmFja2VuZD4gdHJhbnNhY3Rpb25CYWNrZW5kKGJhY2tlbmQoKS0+cnVuVHJhbnNhY3Rpb24odHJh bnNhY3Rpb24ucmVsZWFzZSgpLCByZWFkT25seSwgY2hhbmdlVmVyc2lvbkRhdGEpKTsKLSAgICBp ZiAoIXRyYW5zYWN0aW9uQmFja2VuZCAmJiBlcnJvckNhbGxiYWNrUHJvdGVjdG9yKQotICAgICAg ICBzY3JpcHRFeGVjdXRpb25Db250ZXh0KCktPnBvc3RUYXNrKFtlcnJvckNhbGxiYWNrUHJvdGVj dG9yXSAoU2NyaXB0RXhlY3V0aW9uQ29udGV4dCYpIHsKKyAgICBSZWZQdHI8U1FMVHJhbnNhY3Rp b25CYWNrZW5kPiB0cmFuc2FjdGlvbkJhY2tlbmQgPSBiYWNrZW5kKCktPnJ1blRyYW5zYWN0aW9u KHRyYW5zYWN0aW9uLnJlbGVhc2UoKSwgcmVhZE9ubHksIGNoYW5nZVZlcnNpb25EYXRhKTsKKyAg ICBpZiAoIXRyYW5zYWN0aW9uQmFja2VuZCAmJiBlcnJvckNhbGxiYWNrKSB7CisgICAgICAgIFdU Rjo6UmVmUHRyPFNRTFRyYW5zYWN0aW9uRXJyb3JDYWxsYmFjaz4gZXJyb3JDYWxsYmFja1Byb3Rl Y3RvciA9IFdURjo6bW92ZShlcnJvckNhbGxiYWNrKTsKKyAgICAgICAgc2NyaXB0RXhlY3V0aW9u Q29udGV4dCgpLT5wb3N0VGFzayhbZXJyb3JDYWxsYmFja1Byb3RlY3Rvcl0oU2NyaXB0RXhlY3V0 aW9uQ29udGV4dCYpIHsKICAgICAgICAgICAgIGVycm9yQ2FsbGJhY2tQcm90ZWN0b3ItPmhhbmRs ZUV2ZW50KFNRTEVycm9yOjpjcmVhdGUoU1FMRXJyb3I6OlVOS05PV05fRVJSLCAiZGF0YWJhc2Ug aGFzIGJlZW4gY2xvc2VkIikuZ2V0KCkpOwogICAgICAgICB9KTsKKyAgICB9CiB9CiAKIHZvaWQg RGF0YWJhc2U6OnNjaGVkdWxlVHJhbnNhY3Rpb25DYWxsYmFjayhTUUxUcmFuc2FjdGlvbiogdHJh bnNhY3Rpb24pCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYmRhdGFiYXNl L0RhdGFiYXNlLmggYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYmRhdGFiYXNlL0RhdGFiYXNl LmgKaW5kZXggNmZiMDI5OGU0OTg2MWU2ZWQxMTRlMzY3MGU1NGYwZGJlMGQ3M2IyYS4uNTI4ODQ0 ZmQ3ZDNkYzI0NDgxNzJlMDk3YjUzYzNlYmExYjcwNGIyYyAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvTW9kdWxlcy93ZWJkYXRhYmFzZS9EYXRhYmFzZS5oCisrKyBiL1NvdXJjZS9XZWJDb3Jl L01vZHVsZXMvd2ViZGF0YWJhc2UvRGF0YWJhc2UuaApAQCAtNzYsMTMgKzc2LDEyIEBAIHB1Ymxp YzoKICAgICB2b2lkIHNjaGVkdWxlVHJhbnNhY3Rpb25DYWxsYmFjayhTUUxUcmFuc2FjdGlvbiop OwogCiBwcml2YXRlOgotICAgIERhdGFiYXNlKFBhc3NSZWZQdHI8RGF0YWJhc2VCYWNrZW5kQ29u dGV4dD4sIGNvbnN0IFN0cmluZyYgbmFtZSwKLSAgICAgICAgY29uc3QgU3RyaW5nJiBleHBlY3Rl ZFZlcnNpb24sIGNvbnN0IFN0cmluZyYgZGlzcGxheU5hbWUsIHVuc2lnbmVkIGxvbmcgZXN0aW1h dGVkU2l6ZSk7CisgICAgRGF0YWJhc2UoUGFzc1JlZlB0cjxEYXRhYmFzZUJhY2tlbmRDb250ZXh0 PiwgY29uc3QgU3RyaW5nJiBuYW1lLCBjb25zdCBTdHJpbmcmIGV4cGVjdGVkVmVyc2lvbiwgY29u c3QgU3RyaW5nJiBkaXNwbGF5TmFtZSwgdW5zaWduZWQgbG9uZyBlc3RpbWF0ZWRTaXplKTsKKwog ICAgIFBhc3NSZWZQdHI8RGF0YWJhc2VCYWNrZW5kPiBiYWNrZW5kKCk7CiAgICAgc3RhdGljIFBh c3NSZWZQdHI8RGF0YWJhc2U+IGNyZWF0ZShTY3JpcHRFeGVjdXRpb25Db250ZXh0KiwgUGFzc1Jl ZlB0cjxEYXRhYmFzZUJhY2tlbmRCYXNlPik7CiAKLSAgICB2b2lkIHJ1blRyYW5zYWN0aW9uKFBh c3NSZWZQdHI8U1FMVHJhbnNhY3Rpb25DYWxsYmFjaz4sIFBhc3NSZWZQdHI8U1FMVHJhbnNhY3Rp b25FcnJvckNhbGxiYWNrPiwKLSAgICAgICAgUGFzc1JlZlB0cjxWb2lkQ2FsbGJhY2s+IHN1Y2Nl c3NDYWxsYmFjaywgYm9vbCByZWFkT25seSwgY29uc3QgQ2hhbmdlVmVyc2lvbkRhdGEqID0gMCk7 CisgICAgdm9pZCBydW5UcmFuc2FjdGlvbihSZWZQdHI8U1FMVHJhbnNhY3Rpb25DYWxsYmFjaz4m JiwgUmVmUHRyPFNRTFRyYW5zYWN0aW9uRXJyb3JDYWxsYmFjaz4mJiwgUmVmUHRyPFZvaWRDYWxs YmFjaz4mJiBzdWNjZXNzQ2FsbGJhY2ssIGJvb2wgcmVhZE9ubHksIGNvbnN0IENoYW5nZVZlcnNp b25EYXRhKiA9IG51bGxwdHIpOwogCiAgICAgVmVjdG9yPFN0cmluZz4gcGVyZm9ybUdldFRhYmxl TmFtZXMoKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJkYXRhYmFz ZS9TUUxTdGF0ZW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJkYXRhYmFzZS9T UUxTdGF0ZW1lbnQuY3BwCmluZGV4IDQzNjc0MmM5OWQxN2ZhZTZjNDFjMDIzYTZlNDIwODU5MDIw YmE2ZWEuLjgwZDdkMmJlNTc2YWE2ZTJlMTA4ZmVmNDUzOTQ2NWJlNzk1YjlmMGMgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2ViZGF0YWJhc2UvU1FMU3RhdGVtZW50LmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYmRhdGFiYXNlL1NRTFN0YXRlbWVudC5jcHAK QEAgLTQ1LDEwICs0NSw5IEBACiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAotU1FMU3RhdGVtZW50 OjpTUUxTdGF0ZW1lbnQoRGF0YWJhc2UqIGRhdGFiYXNlLCBQYXNzUmVmUHRyPFNRTFN0YXRlbWVu dENhbGxiYWNrPiBjYWxsYmFjaywKLSAgICBQYXNzUmVmUHRyPFNRTFN0YXRlbWVudEVycm9yQ2Fs bGJhY2s+IGVycm9yQ2FsbGJhY2spCi0gICAgOiBtX3N0YXRlbWVudENhbGxiYWNrV3JhcHBlcihj YWxsYmFjaywgZGF0YWJhc2UtPnNjcmlwdEV4ZWN1dGlvbkNvbnRleHQoKSkKLSAgICAsIG1fc3Rh dGVtZW50RXJyb3JDYWxsYmFja1dyYXBwZXIoZXJyb3JDYWxsYmFjaywgZGF0YWJhc2UtPnNjcmlw dEV4ZWN1dGlvbkNvbnRleHQoKSkKK1NRTFN0YXRlbWVudDo6U1FMU3RhdGVtZW50KERhdGFiYXNl JiBkYXRhYmFzZSwgUGFzc1JlZlB0cjxTUUxTdGF0ZW1lbnRDYWxsYmFjaz4gY2FsbGJhY2ssIFBh c3NSZWZQdHI8U1FMU3RhdGVtZW50RXJyb3JDYWxsYmFjaz4gZXJyb3JDYWxsYmFjaykKKyAgICA6 IG1fc3RhdGVtZW50Q2FsbGJhY2tXcmFwcGVyKGNhbGxiYWNrLCBkYXRhYmFzZS5zY3JpcHRFeGVj dXRpb25Db250ZXh0KCkpCisgICAgLCBtX3N0YXRlbWVudEVycm9yQ2FsbGJhY2tXcmFwcGVyKGVy cm9yQ2FsbGJhY2ssIGRhdGFiYXNlLnNjcmlwdEV4ZWN1dGlvbkNvbnRleHQoKSkKIHsKIH0KIApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJkYXRhYmFzZS9TUUxTdGF0ZW1l bnQuaCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2ViZGF0YWJhc2UvU1FMU3RhdGVtZW50LmgK aW5kZXggZjc3MTg2YWU2ODQ1NWRlZWI5MWVmN2M0NjVjMzc2ODlmMTExODg4My4uYTgwNTQxY2Vk MmEzYzExN2U3OTFiZjAyZWZmM2JmNDUyYjQ3MWRmNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvTW9kdWxlcy93ZWJkYXRhYmFzZS9TUUxTdGF0ZW1lbnQuaAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9Nb2R1bGVzL3dlYmRhdGFiYXNlL1NRTFN0YXRlbWVudC5oCkBAIC00OSw3ICs0OSw3IEBAIGNs YXNzIFNRTFRyYW5zYWN0aW9uOwogCiBjbGFzcyBTUUxTdGF0ZW1lbnQgOiBwdWJsaWMgQWJzdHJh Y3RTUUxTdGF0ZW1lbnQgewogcHVibGljOgotICAgIFNRTFN0YXRlbWVudChEYXRhYmFzZSosIFBh c3NSZWZQdHI8U1FMU3RhdGVtZW50Q2FsbGJhY2s+LCBQYXNzUmVmUHRyPFNRTFN0YXRlbWVudEVy cm9yQ2FsbGJhY2s+KTsKKyAgICBTUUxTdGF0ZW1lbnQoRGF0YWJhc2UmLCBQYXNzUmVmUHRyPFNR TFN0YXRlbWVudENhbGxiYWNrPiwgUGFzc1JlZlB0cjxTUUxTdGF0ZW1lbnRFcnJvckNhbGxiYWNr Pik7CiAKICAgICBib29sIHBlcmZvcm1DYWxsYmFjayhTUUxUcmFuc2FjdGlvbiopOwogCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYmRhdGFiYXNlL1NRTFRyYW5zYWN0aW9u LmNwcCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2ViZGF0YWJhc2UvU1FMVHJhbnNhY3Rpb24u Y3BwCmluZGV4IGM5ZWUyMDMwNGQ4NDNhOWRlZTVmMjQ5OTIzODRkMjljMjIyMGNmMzEuLjk3YmNi MmFhNjY0ZjAxZTBhMDRjYmViY2Q2NzJlOGU0ZjNlYzVmOWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL01vZHVsZXMvd2ViZGF0YWJhc2UvU1FMVHJhbnNhY3Rpb24uY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL01vZHVsZXMvd2ViZGF0YWJhc2UvU1FMVHJhbnNhY3Rpb24uY3BwCkBAIC00OSwy NCArNDksMTkgQEAKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCi1QYXNzUmVmUHRyPFNRTFRyYW5z YWN0aW9uPiBTUUxUcmFuc2FjdGlvbjo6Y3JlYXRlKERhdGFiYXNlKiBkYiwgUGFzc1JlZlB0cjxT UUxUcmFuc2FjdGlvbkNhbGxiYWNrPiBjYWxsYmFjaywKLSAgICBQYXNzUmVmUHRyPFZvaWRDYWxs YmFjaz4gc3VjY2Vzc0NhbGxiYWNrLCBQYXNzUmVmUHRyPFNRTFRyYW5zYWN0aW9uRXJyb3JDYWxs YmFjaz4gZXJyb3JDYWxsYmFjaywKLSAgICBib29sIHJlYWRPbmx5KQorUmVmPFNRTFRyYW5zYWN0 aW9uPiBTUUxUcmFuc2FjdGlvbjo6Y3JlYXRlKFJlZjxEYXRhYmFzZT4mJiBkYXRhYmFzZSwgUmVm UHRyPFNRTFRyYW5zYWN0aW9uQ2FsbGJhY2s+JiYgY2FsbGJhY2ssIFJlZlB0cjxWb2lkQ2FsbGJh Y2s+JiYgc3VjY2Vzc0NhbGxiYWNrLCBSZWZQdHI8U1FMVHJhbnNhY3Rpb25FcnJvckNhbGxiYWNr PiYmIGVycm9yQ2FsbGJhY2ssIGJvb2wgcmVhZE9ubHkpCiB7Ci0gICAgcmV0dXJuIGFkb3B0UmVm KG5ldyBTUUxUcmFuc2FjdGlvbihkYiwgY2FsbGJhY2ssIHN1Y2Nlc3NDYWxsYmFjaywgZXJyb3JD YWxsYmFjaywgcmVhZE9ubHkpKTsKKyAgICByZXR1cm4gYWRvcHRSZWYoKm5ldyBTUUxUcmFuc2Fj dGlvbihXVEY6Om1vdmUoZGF0YWJhc2UpLCBXVEY6Om1vdmUoY2FsbGJhY2spLCBXVEY6Om1vdmUo c3VjY2Vzc0NhbGxiYWNrKSwgV1RGOjptb3ZlKGVycm9yQ2FsbGJhY2spLCByZWFkT25seSkpOwog fQogCi1TUUxUcmFuc2FjdGlvbjo6U1FMVHJhbnNhY3Rpb24oRGF0YWJhc2UqIGRiLCBQYXNzUmVm UHRyPFNRTFRyYW5zYWN0aW9uQ2FsbGJhY2s+IGNhbGxiYWNrLAotICAgIFBhc3NSZWZQdHI8Vm9p ZENhbGxiYWNrPiBzdWNjZXNzQ2FsbGJhY2ssIFBhc3NSZWZQdHI8U1FMVHJhbnNhY3Rpb25FcnJv ckNhbGxiYWNrPiBlcnJvckNhbGxiYWNrLAotICAgIGJvb2wgcmVhZE9ubHkpCi0gICAgOiBtX2Rh dGFiYXNlKGRiKQotICAgICwgbV9jYWxsYmFja1dyYXBwZXIoY2FsbGJhY2ssIGRiLT5zY3JpcHRF eGVjdXRpb25Db250ZXh0KCkpCi0gICAgLCBtX3N1Y2Nlc3NDYWxsYmFja1dyYXBwZXIoc3VjY2Vz c0NhbGxiYWNrLCBkYi0+c2NyaXB0RXhlY3V0aW9uQ29udGV4dCgpKQotICAgICwgbV9lcnJvckNh bGxiYWNrV3JhcHBlcihlcnJvckNhbGxiYWNrLCBkYi0+c2NyaXB0RXhlY3V0aW9uQ29udGV4dCgp KQorU1FMVHJhbnNhY3Rpb246OlNRTFRyYW5zYWN0aW9uKFJlZjxEYXRhYmFzZT4mJiBkYXRhYmFz ZSwgUmVmUHRyPFNRTFRyYW5zYWN0aW9uQ2FsbGJhY2s+JiYgY2FsbGJhY2ssIFJlZlB0cjxWb2lk Q2FsbGJhY2s+JiYgc3VjY2Vzc0NhbGxiYWNrLCBSZWZQdHI8U1FMVHJhbnNhY3Rpb25FcnJvckNh bGxiYWNrPiYmIGVycm9yQ2FsbGJhY2ssIGJvb2wgcmVhZE9ubHkpCisgICAgOiBtX2RhdGFiYXNl KFdURjo6bW92ZShkYXRhYmFzZSkpCisgICAgLCBtX2NhbGxiYWNrV3JhcHBlcihXVEY6Om1vdmUo Y2FsbGJhY2spLCBtX2RhdGFiYXNlLT5zY3JpcHRFeGVjdXRpb25Db250ZXh0KCkpCisgICAgLCBt X3N1Y2Nlc3NDYWxsYmFja1dyYXBwZXIoV1RGOjptb3ZlKHN1Y2Nlc3NDYWxsYmFjayksIG1fZGF0 YWJhc2UtPnNjcmlwdEV4ZWN1dGlvbkNvbnRleHQoKSkKKyAgICAsIG1fZXJyb3JDYWxsYmFja1dy YXBwZXIoV1RGOjptb3ZlKGVycm9yQ2FsbGJhY2spLCBtX2RhdGFiYXNlLT5zY3JpcHRFeGVjdXRp b25Db250ZXh0KCkpCiAgICAgLCBtX2V4ZWN1dGVTcWxBbGxvd2VkKGZhbHNlKQogICAgICwgbV9y ZWFkT25seShyZWFkT25seSkKIHsKLSAgICBBU1NFUlQobV9kYXRhYmFzZSk7CiB9CiAKIGJvb2wg U1FMVHJhbnNhY3Rpb246Omhhc0NhbGxiYWNrKCkgY29uc3QKQEAgLTIwNiw3ICsyMDEsNyBAQCBT UUxUcmFuc2FjdGlvblN0YXRlIFNRTFRyYW5zYWN0aW9uOjpkZWxpdmVyUXVvdGFJbmNyZWFzZUNh bGxiYWNrKCkKIHsKICAgICBBU1NFUlQobV9iYWNrZW5kLT5jdXJyZW50U3RhdGVtZW50KCkpOwog Ci0gICAgYm9vbCBzaG91bGRSZXRyeUN1cnJlbnRTdGF0ZW1lbnQgPSBtX2RhdGFiYXNlLT50cmFu c2FjdGlvbkNsaWVudCgpLT5kaWRFeGNlZWRRdW90YShkYXRhYmFzZSgpKTsKKyAgICBib29sIHNo b3VsZFJldHJ5Q3VycmVudFN0YXRlbWVudCA9IG1fZGF0YWJhc2UtPnRyYW5zYWN0aW9uQ2xpZW50 KCktPmRpZEV4Y2VlZFF1b3RhKCZkYXRhYmFzZSgpKTsKICAgICBtX2JhY2tlbmQtPnNldFNob3Vs ZFJldHJ5Q3VycmVudFN0YXRlbWVudChzaG91bGRSZXRyeUN1cnJlbnRTdGF0ZW1lbnQpOwogCiAg ICAgcmV0dXJuIFNRTFRyYW5zYWN0aW9uU3RhdGU6OlJ1blN0YXRlbWVudHM7CkBAIC0yNDgsMTAg KzI0MywxMCBAQCB2b2lkIFNRTFRyYW5zYWN0aW9uOjpwZXJmb3JtUGVuZGluZ0NhbGxiYWNrKCkK ICAgICBydW5TdGF0ZU1hY2hpbmUoKTsKIH0KIAotdm9pZCBTUUxUcmFuc2FjdGlvbjo6ZXhlY3V0 ZVNRTChjb25zdCBTdHJpbmcmIHNxbFN0YXRlbWVudCwgY29uc3QgVmVjdG9yPFNRTFZhbHVlPiYg YXJndW1lbnRzLCBQYXNzUmVmUHRyPFNRTFN0YXRlbWVudENhbGxiYWNrPiBjYWxsYmFjaywgUGFz c1JlZlB0cjxTUUxTdGF0ZW1lbnRFcnJvckNhbGxiYWNrPiBjYWxsYmFja0Vycm9yLCBFeGNlcHRp b25Db2RlJiBlKQordm9pZCBTUUxUcmFuc2FjdGlvbjo6ZXhlY3V0ZVNRTChjb25zdCBTdHJpbmcm IHNxbFN0YXRlbWVudCwgY29uc3QgVmVjdG9yPFNRTFZhbHVlPiYgYXJndW1lbnRzLCBSZWZQdHI8 U1FMU3RhdGVtZW50Q2FsbGJhY2s+JiYgY2FsbGJhY2ssIFJlZlB0cjxTUUxTdGF0ZW1lbnRFcnJv ckNhbGxiYWNrPiYmIGNhbGxiYWNrRXJyb3IsIEV4Y2VwdGlvbkNvZGUmIGVjKQogewogICAgIGlm ICghbV9leGVjdXRlU3FsQWxsb3dlZCB8fCAhbV9kYXRhYmFzZS0+b3BlbmVkKCkpIHsKLSAgICAg ICAgZSA9IElOVkFMSURfU1RBVEVfRVJSOworICAgICAgICBlYyA9IElOVkFMSURfU1RBVEVfRVJS OwogICAgICAgICByZXR1cm47CiAgICAgfQogCkBAIC0yNjEsNyArMjU2LDcgQEAgdm9pZCBTUUxU cmFuc2FjdGlvbjo6ZXhlY3V0ZVNRTChjb25zdCBTdHJpbmcmIHNxbFN0YXRlbWVudCwgY29uc3Qg VmVjdG9yPFNRTFZhbHUKICAgICBlbHNlIGlmIChtX3JlYWRPbmx5KQogICAgICAgICBwZXJtaXNz aW9ucyB8PSBEYXRhYmFzZUF1dGhvcml6ZXI6OlJlYWRPbmx5TWFzazsKIAotICAgIGF1dG8gc3Rh dGVtZW50ID0gc3RkOjptYWtlX3VuaXF1ZTxTUUxTdGF0ZW1lbnQ+KG1fZGF0YWJhc2UuZ2V0KCks IGNhbGxiYWNrLCBjYWxsYmFja0Vycm9yKTsKKyAgICBhdXRvIHN0YXRlbWVudCA9IHN0ZDo6bWFr ZV91bmlxdWU8U1FMU3RhdGVtZW50PihtX2RhdGFiYXNlLCBXVEY6Om1vdmUoY2FsbGJhY2spLCBX VEY6Om1vdmUoY2FsbGJhY2tFcnJvcikpOwogICAgIG1fYmFja2VuZC0+ZXhlY3V0ZVNRTChXVEY6 Om1vdmUoc3RhdGVtZW50KSwgc3FsU3RhdGVtZW50LCBhcmd1bWVudHMsIHBlcm1pc3Npb25zKTsK IH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJkYXRhYmFzZS9TUUxU cmFuc2FjdGlvbi5oIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJkYXRhYmFzZS9TUUxUcmFu c2FjdGlvbi5oCmluZGV4IGFkNGM2NDM5ZWQ2MzIyNmI4NjRjMzYxZTdkZWQxYTYwZjc4MWQwMDIu Ljg4YmQ5MDYzZTMyODYyMjdkMWE2YmEzODY0NWUwY2RmNmE5ZjAxZTkgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL01vZHVsZXMvd2ViZGF0YWJhc2UvU1FMVHJhbnNhY3Rpb24uaAorKysgYi9T b3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYmRhdGFiYXNlL1NRTFRyYW5zYWN0aW9uLmgKQEAgLTM2 LDYgKzM2LDcgQEAKICNpbmNsdWRlICJTUUxTdGF0ZW1lbnQuaCIKICNpbmNsdWRlICJTUUxUcmFu c2FjdGlvblN0YXRlTWFjaGluZS5oIgogI2luY2x1ZGUgPHd0Zi9QYXNzUmVmUHRyLmg+CisjaW5j bHVkZSA8d3RmL1JlZi5oPgogI2luY2x1ZGUgPHd0Zi9SZWZQdHIuaD4KIAogbmFtZXNwYWNlIFdl YkNvcmUgewpAQCAtNTIsMjEgKzUzLDE2IEBAIGNsYXNzIFZvaWRDYWxsYmFjazsKIAogY2xhc3Mg U1FMVHJhbnNhY3Rpb24gOiBwdWJsaWMgU1FMVHJhbnNhY3Rpb25TdGF0ZU1hY2hpbmU8U1FMVHJh bnNhY3Rpb24+LCBwdWJsaWMgQWJzdHJhY3RTUUxUcmFuc2FjdGlvbiB7CiBwdWJsaWM6Ci0gICAg c3RhdGljIFBhc3NSZWZQdHI8U1FMVHJhbnNhY3Rpb24+IGNyZWF0ZShEYXRhYmFzZSosIFBhc3NS ZWZQdHI8U1FMVHJhbnNhY3Rpb25DYWxsYmFjaz4sCi0gICAgICAgIFBhc3NSZWZQdHI8Vm9pZENh bGxiYWNrPiBzdWNjZXNzQ2FsbGJhY2ssIFBhc3NSZWZQdHI8U1FMVHJhbnNhY3Rpb25FcnJvckNh bGxiYWNrPiwKLSAgICAgICAgYm9vbCByZWFkT25seSk7CisgICAgc3RhdGljIFJlZjxTUUxUcmFu c2FjdGlvbj4gY3JlYXRlKFJlZjxEYXRhYmFzZT4mJiwgUmVmUHRyPFNRTFRyYW5zYWN0aW9uQ2Fs bGJhY2s+JiYsIFJlZlB0cjxWb2lkQ2FsbGJhY2s+JiYgc3VjY2Vzc0NhbGxiYWNrLCBSZWZQdHI8 U1FMVHJhbnNhY3Rpb25FcnJvckNhbGxiYWNrPiYmLCBib29sIHJlYWRPbmx5KTsKIAogICAgIHZv aWQgcGVyZm9ybVBlbmRpbmdDYWxsYmFjaygpOwogCi0gICAgdm9pZCBleGVjdXRlU1FMKGNvbnN0 IFN0cmluZyYgc3FsU3RhdGVtZW50LCBjb25zdCBWZWN0b3I8U1FMVmFsdWU+JiBhcmd1bWVudHMs Ci0gICAgICAgIFBhc3NSZWZQdHI8U1FMU3RhdGVtZW50Q2FsbGJhY2s+LCBQYXNzUmVmUHRyPFNR TFN0YXRlbWVudEVycm9yQ2FsbGJhY2s+LCBFeGNlcHRpb25Db2RlJik7CisgICAgdm9pZCBleGVj dXRlU1FMKGNvbnN0IFN0cmluZyYgc3FsU3RhdGVtZW50LCBjb25zdCBWZWN0b3I8U1FMVmFsdWU+ JiBhcmd1bWVudHMsIFJlZlB0cjxTUUxTdGF0ZW1lbnRDYWxsYmFjaz4mJiwgUmVmUHRyPFNRTFN0 YXRlbWVudEVycm9yQ2FsbGJhY2s+JiYsIEV4Y2VwdGlvbkNvZGUmKTsKIAotICAgIERhdGFiYXNl KiBkYXRhYmFzZSgpIHsgcmV0dXJuIG1fZGF0YWJhc2UuZ2V0KCk7IH0KKyAgICBEYXRhYmFzZSYg ZGF0YWJhc2UoKSB7IHJldHVybiBtX2RhdGFiYXNlOyB9CiAKIHByaXZhdGU6Ci0gICAgU1FMVHJh bnNhY3Rpb24oRGF0YWJhc2UqLCBQYXNzUmVmUHRyPFNRTFRyYW5zYWN0aW9uQ2FsbGJhY2s+LAot ICAgICAgICBQYXNzUmVmUHRyPFZvaWRDYWxsYmFjaz4gc3VjY2Vzc0NhbGxiYWNrLCBQYXNzUmVm UHRyPFNRTFRyYW5zYWN0aW9uRXJyb3JDYWxsYmFjaz4sCi0gICAgICAgIGJvb2wgcmVhZE9ubHkp OworICAgIFNRTFRyYW5zYWN0aW9uKFJlZjxEYXRhYmFzZT4mJiwgUmVmUHRyPFNRTFRyYW5zYWN0 aW9uQ2FsbGJhY2s+JiYsIFJlZlB0cjxWb2lkQ2FsbGJhY2s+JiYgc3VjY2Vzc0NhbGxiYWNrLCBS ZWZQdHI8U1FMVHJhbnNhY3Rpb25FcnJvckNhbGxiYWNrPiYmLCBib29sIHJlYWRPbmx5KTsKIAog ICAgIHZvaWQgY2xlYXJDYWxsYmFja1dyYXBwZXJzKCk7CiAKQEAgLTkzLDcgKzg5LDcgQEAgcHJp dmF0ZToKIAogICAgIFNRTFRyYW5zYWN0aW9uU3RhdGUgbmV4dFN0YXRlRm9yVHJhbnNhY3Rpb25F cnJvcigpOwogCi0gICAgUmVmUHRyPERhdGFiYXNlPiBtX2RhdGFiYXNlOworICAgIFJlZjxEYXRh YmFzZT4gbV9kYXRhYmFzZTsKICAgICBSZWZQdHI8QWJzdHJhY3RTUUxUcmFuc2FjdGlvbkJhY2tl bmQ+IG1fYmFja2VuZDsKICAgICBTUUxDYWxsYmFja1dyYXBwZXI8U1FMVHJhbnNhY3Rpb25DYWxs YmFjaz4gbV9jYWxsYmFja1dyYXBwZXI7CiAgICAgU1FMQ2FsbGJhY2tXcmFwcGVyPFZvaWRDYWxs YmFjaz4gbV9zdWNjZXNzQ2FsbGJhY2tXcmFwcGVyOwo=