116738 2013-05-24 14:08:20 -0700 Remove unused code to read/write history 2013-05-24 15:06:55 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 893437 0 andersca 2013-05-24 14:08:20 -0700 Remove code to read/write history 893449 1 202850 andersca 2013-05-24 14:32:26 -0700 Created attachment 202850 Patch 893462 2 202850 bfulgham 2013-05-24 15:02:28 -0700 Comment on attachment 202850 Patch Could we say "Remove unused code to read/write history"? 893463 3 andersca 2013-05-24 15:06:55 -0700 Committed r150660: <http://trac.webkit.org/changeset/150660> 202850 2013-05-24 14:32:26 -0700 2013-05-24 15:02:28 -0700 Patch bug-116738-20130524143110.patch text/plain 14610 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTUwNTI1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L3dp bi9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L3dpbi9DaGFuZ2VMb2cKaW5kZXggYjA4ZTNjOTY2 MzQxMmY3Mzg3NzNkNzBhNjljY2JhZjY1MjU2MGYyOS4uZWM2NGUyN2UzMTAxNDM0ZTNlMmJiNTdl ODU2OGMyZjA5NWRkZmMwZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC93aW4vQ2hhbmdlTG9n CisrKyBiL1NvdXJjZS9XZWJLaXQvd2luL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDEz LTA1LTI0ICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAg UmVtb3ZlIGNvZGUgdG8gcmVhZC93cml0ZSBoaXN0b3J5CisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTY3MzgKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIEludGVyZmFjZXMvSVdlYkhpc3RvcnkuaWRsOgor ICAgICAgICBSZXBsYWNlIGxvYWRGcm9tVVJMIGFuZCBzYXZlVG9VUkwgd2l0aCB1bnVzZWQxL3Vu dXNlZDIuCisKKyAgICAgICAgKiBJbnRlcmZhY2VzL0lXZWJIaXN0b3J5UHJpdmF0ZS5pZGw6Cisg ICAgICAgIFJlcGxhY2UgZGF0YSB3aXRoIHVudXNlZDEuCisKKyAgICAgICAgKiBXZWJIaXN0b3J5 LmNwcDoKKyAgICAgICAgUmVtb3ZlIGhpc3RvcnkgbG9hZGluZy9zYXZpbmcgY29kZS4KKworICAg ICAgICAoV2ViSGlzdG9yeTo6dW51c2VkMSk6CisgICAgICAgIChXZWJIaXN0b3J5Ojp1bnVzZWQy KToKKyAgICAgICAgQWRkIGltcGxlbWVudGF0aW9ucy4KKworICAgICAgICAqIFdlYkhpc3Rvcnku aDoKKyAgICAgICAgKFdlYkhpc3RvcnkpOgorCiAyMDEzLTA1LTIxICBNYXJrIFNhbGlzYnVyeSAg PG1hcmsuc2FsaXNidXJ5QGhwLmNvbT4KIAogICAgICAgICBbV2luZG93cywgY3VybF0gV2ViRG93 bmxvYWRDdXJsLmNwcCBzaG91bGQgbm90IGluY2x1ZGUgU3lzdGVtVGltZS5oCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L3dpbi9JbnRlcmZhY2VzL0lXZWJIaXN0b3J5LmlkbCBiL1NvdXJjZS9X ZWJLaXQvd2luL0ludGVyZmFjZXMvSVdlYkhpc3RvcnkuaWRsCmluZGV4IGE4YjU1ZDYxOWFmNTgw ZTIxMTM3YmQ4ZTJkMjQ5Y2MwNjA4ZTIzMmQuLjY1YTc3YzQ4MjJjOTA4Y2M4N2FhMTMzZTgyZjU2 MjkyY2FkNzM2MjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvd2luL0ludGVyZmFjZXMvSVdl Ykhpc3RvcnkuaWRsCisrKyBiL1NvdXJjZS9XZWJLaXQvd2luL0ludGVyZmFjZXMvSVdlYkhpc3Rv cnkuaWRsCkBAIC04MCwyNSArODAsOCBAQCBpbnRlcmZhY2UgSVdlYkhpc3RvcnkgOiBJVW5rbm93 bgogICAgICovCiAgICAgSFJFU1VMVCBzZXRPcHRpb25hbFNoYXJlZEhpc3RvcnkoW2luXSBJV2Vi SGlzdG9yeSogaGlzdG9yeSk7CiAKLSAgICAvKiEKLSAgICAgICAgQG1ldGhvZCBsb2FkRnJvbVVS TDplcnJvcjoKLSAgICAgICAgQHBhcmFtIFVSTCBUaGUgVVJMIHRvIHVzZSB0byBpbml0aWFsaXpl IHRoZSBXZWJIaXN0b3J5LgotICAgICAgICBAcGFyYW0gZXJyb3IgU2V0IHRvIG5pbCBvciBhbiBO U0Vycm9yIGluc3RhbmNlIGlmIGFuIGVycm9yIG9jY3VycmVkLgotICAgICAgICBAYWJzdHJhY3Qg VGhlIGRlc2lnbmF0ZWQgaW5pdGlhbGl6ZXIgZm9yIFdlYkhpc3RvcnkuCi0gICAgICAgIEByZXN1 bHQgUmV0dXJucyBZRVMgaWYgc3VjY2Vzc2Z1bCwgTk8gb3RoZXJ3aXNlLgotICAgICAgICAtIChC T09MKWxvYWRGcm9tVVJMOihOU1VSTCAqKVVSTCBlcnJvcjooTlNFcnJvciAqKillcnJvcjsKLSAg ICAqLwotICAgIEhSRVNVTFQgbG9hZEZyb21VUkwoW2luXSBCU1RSIHVybCwgW291dF0gSVdlYkVy cm9yKiogZXJyb3IsIFtvdXQsIHJldHZhbF0gQk9PTCogc3VjY2VlZGVkKTsKLQotICAgIC8qIQot ICAgICAgICBAbWV0aG9kIHNhdmVUb1VSTDplcnJvcjoKLSAgICAgICAgQGRpc2N1c3Npb24gU2F2 ZSBoaXN0b3J5IHRvIFVSTC4gSXQgaXMgdGhlIGNsaWVudCdzIHJlc3BvbnNpYmlsaXR5IHRvIGNh bGwgdGhpcyBhdCBhcHByb3ByaWF0ZSB0aW1lcy4KLSAgICAgICAgQHBhcmFtIFVSTCBUaGUgVVJM IHRvIHVzZSB0byBzYXZlIHRoZSBXZWJIaXN0b3J5LgotICAgICAgICBAcGFyYW0gZXJyb3IgU2V0 IHRvIG5pbCBvciBhbiBOU0Vycm9yIGluc3RhbmNlIGlmIGFuIGVycm9yIG9jY3VycmVkLgotICAg ICAgICBAcmVzdWx0IFJldHVybnMgWUVTIGlmIHN1Y2Nlc3NmdWwsIE5PIG90aGVyd2lzZS4KLSAg ICAgICAgLSAoQk9PTClzYXZlVG9VUkw6KE5TVVJMICopVVJMIGVycm9yOihOU0Vycm9yICoqKWVy cm9yOwotICAgICovCi0gICAgSFJFU1VMVCBzYXZlVG9VUkwoW2luXSBCU1RSIHVybCwgW291dF0g SVdlYkVycm9yKiogZXJyb3IsIFtvdXQsIHJldHZhbF0gQk9PTCogc3VjY2VlZGVkKTsKKyAgICBI UkVTVUxUIHVudXNlZDEoKTsKKyAgICBIUkVTVUxUIHVudXNlZDIoKTsKIAogICAgIC8qIQogICAg ICAgICBAbWV0aG9kIGFkZEl0ZW1zOgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC93aW4vSW50 ZXJmYWNlcy9JV2ViSGlzdG9yeVByaXZhdGUuaWRsIGIvU291cmNlL1dlYktpdC93aW4vSW50ZXJm YWNlcy9JV2ViSGlzdG9yeVByaXZhdGUuaWRsCmluZGV4IGFmNmMyN2FhZWY4ZTk2YzNhNjViYjhi ZmFkODkwZDQyNjk1MDIwZjAuLjZmYzc1ZDBhMTkyMThjNjhjMDcyYmMyMTEwN2I4NTVjMjA4NmFm NDggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvd2luL0ludGVyZmFjZXMvSVdlYkhpc3RvcnlQ cml2YXRlLmlkbAorKysgYi9Tb3VyY2UvV2ViS2l0L3dpbi9JbnRlcmZhY2VzL0lXZWJIaXN0b3J5 UHJpdmF0ZS5pZGwKQEAgLTM1LDcgKzM1LDcgQEAgaW50ZXJmYWNlIElXZWJIaXN0b3J5SXRlbTsK IGludGVyZmFjZSBJV2ViSGlzdG9yeVByaXZhdGUgOiBJVW5rbm93bgogewogICAgIEhSRVNVTFQg YWxsSXRlbXMoW2luLCBvdXRdIGludCogY291bnQsIFtvdXQsIHJldHZhbF0gSVdlYkhpc3RvcnlJ dGVtKiogaXRlbXMpOwotICAgIEhSRVNVTFQgZGF0YShbb3V0LCByZXR2YWxdIElTdHJlYW0qKik7 CisgICAgSFJFU1VMVCB1bnVzZWQxKCk7CiAgICAgSFJFU1VMVCBzZXRWaXNpdGVkTGlua1RyYWNr aW5nRW5hYmxlZChbaW5dIEJPT0wgdmlzaXRlZExpbmtUcmFja2luZ0VuYWJsZSk7CiAgICAgSFJF U1VMVCByZW1vdmVBbGxWaXNpdGVkTGlua3MoKTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQvd2luL1dlYkhpc3RvcnkuY3BwIGIvU291cmNlL1dlYktpdC93aW4vV2ViSGlzdG9yeS5jcHAK aW5kZXggNzllN2E1M2FkNjAxMDQ2ZWZjMzNkYWI1MmU1MmE1NDllZjIxMGJmMi4uZmYxY2RmMmNm NzUzNGQyMzExYTdmZmMwNDFhMDc1N2ZkYTg4ZDU0NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dC93aW4vV2ViSGlzdG9yeS5jcHAKKysrIGIvU291cmNlL1dlYktpdC93aW4vV2ViSGlzdG9yeS5j cHAKQEAgLTM4LDcgKzM4LDYgQEAKICNpbmNsdWRlIDxDb3JlRm91bmRhdGlvbi9Db3JlRm91bmRh dGlvbi5oPgogI2luY2x1ZGUgPFdlYkNvcmUvQlN0cmluZy5oPgogI2luY2x1ZGUgPFdlYkNvcmUv SGlzdG9yeUl0ZW0uaD4KLSNpbmNsdWRlIDxXZWJDb3JlL0hpc3RvcnlQcm9wZXJ0eUxpc3QuaD4K ICNpbmNsdWRlIDxXZWJDb3JlL0tVUkwuaD4KICNpbmNsdWRlIDxXZWJDb3JlL1BhZ2VHcm91cC5o PgogI2luY2x1ZGUgPFdlYkNvcmUvU2hhcmVkQnVmZmVyLmg+CkBAIC00OSw0NiArNDgsNiBAQAog dXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7CiB1c2luZyBuYW1lc3BhY2Ugc3RkOwogCi1DRlN0cmlu Z1JlZiBEYXRlc0FycmF5S2V5ID0gQ0ZTVFIoIldlYkhpc3RvcnlEYXRlcyIpOwotQ0ZTdHJpbmdS ZWYgRmlsZVZlcnNpb25LZXkgPSBDRlNUUigiV2ViSGlzdG9yeUZpbGVWZXJzaW9uIik7Ci0KLSNk ZWZpbmUgY3VycmVudEZpbGVWZXJzaW9uIDEKLQotY2xhc3MgV2ViSGlzdG9yeVdyaXRlciA6IHB1 YmxpYyBIaXN0b3J5UHJvcGVydHlMaXN0V3JpdGVyIHsKLXB1YmxpYzoKLSAgICBXZWJIaXN0b3J5 V3JpdGVyKGNvbnN0IFdlYkhpc3Rvcnk6OkRhdGVUb0VudHJpZXNNYXAmKTsKLQotcHJpdmF0ZToK LSAgICB2aXJ0dWFsIHZvaWQgd3JpdGVIaXN0b3J5SXRlbXMoQmluYXJ5UHJvcGVydHlMaXN0T2Jq ZWN0U3RyZWFtJik7Ci0KLSAgICBjb25zdCBXZWJIaXN0b3J5OjpEYXRlVG9FbnRyaWVzTWFwJiBt X2VudHJpZXNCeURhdGU7Ci0gICAgVmVjdG9yPFdlYkhpc3Rvcnk6OkRhdGVLZXk+IG1fZGF0ZUtl eXM7Ci19OwotCi1XZWJIaXN0b3J5V3JpdGVyOjpXZWJIaXN0b3J5V3JpdGVyKGNvbnN0IFdlYkhp c3Rvcnk6OkRhdGVUb0VudHJpZXNNYXAmIGVudHJpZXNCeURhdGUpCi0gICAgOiBtX2VudHJpZXNC eURhdGUoZW50cmllc0J5RGF0ZSkKLXsKLSAgICBjb3B5S2V5c1RvVmVjdG9yKG1fZW50cmllc0J5 RGF0ZSwgbV9kYXRlS2V5cyk7Ci0gICAgc29ydChtX2RhdGVLZXlzLmJlZ2luKCksIG1fZGF0ZUtl eXMuZW5kKCkpOwotfQotCi12b2lkIFdlYkhpc3RvcnlXcml0ZXI6OndyaXRlSGlzdG9yeUl0ZW1z KEJpbmFyeVByb3BlcnR5TGlzdE9iamVjdFN0cmVhbSYgc3RyZWFtKQotewotICAgIGZvciAoaW50 IGRhdGVJbmRleCA9IG1fZGF0ZUtleXMuc2l6ZSgpIC0gMTsgZGF0ZUluZGV4ID49IDA7IC0tZGF0 ZUluZGV4KSB7Ci0gICAgICAgIC8vIGdldCB0aGUgZW50cmllcyBmb3IgdGhhdCBkYXRlCi0gICAg ICAgIENGQXJyYXlSZWYgZW50cmllcyA9IG1fZW50cmllc0J5RGF0ZS5nZXQobV9kYXRlS2V5c1tk YXRlSW5kZXhdKS5nZXQoKTsKLSAgICAgICAgQ0ZJbmRleCBlbnRyaWVzQ291bnQgPSBDRkFycmF5 R2V0Q291bnQoZW50cmllcyk7Ci0gICAgICAgIGZvciAoQ0ZJbmRleCBqID0gZW50cmllc0NvdW50 IC0gMTsgaiA+PSAwOyAtLWopIHsKLSAgICAgICAgICAgIElXZWJIaXN0b3J5SXRlbSogaXRlbSA9 IChJV2ViSGlzdG9yeUl0ZW0qKSBDRkFycmF5R2V0VmFsdWVBdEluZGV4KGVudHJpZXMsIGopOwot ICAgICAgICAgICAgQ09NUHRyPFdlYkhpc3RvcnlJdGVtPiB3ZWJJdGVtKFF1ZXJ5LCBpdGVtKTsK LSAgICAgICAgICAgIGlmICghd2ViSXRlbSkKLSAgICAgICAgICAgICAgICBjb250aW51ZTsKLQot ICAgICAgICAgICAgd3JpdGVIaXN0b3J5SXRlbShzdHJlYW0sIHdlYkl0ZW0tPmhpc3RvcnlJdGVt KCkpOwotICAgICAgICB9Ci0gICAgfQotfQotCiBzdGF0aWMgYm9vbCBhcmVFcXVhbE9yQ2xvc2Uo ZG91YmxlIGQxLCBkb3VibGUgZDIpCiB7CiAgICAgZG91YmxlIGRpZmYgPSBkMS1kMjsKQEAgLTIz NCwxNzkgKzE5MywxNiBAQCBIUkVTVUxUIFNURE1FVEhPRENBTExUWVBFIFdlYkhpc3Rvcnk6OnNl dE9wdGlvbmFsU2hhcmVkSGlzdG9yeSgKICAgICByZXR1cm4gU19PSzsKIH0KIAotSFJFU1VMVCBT VERNRVRIT0RDQUxMVFlQRSBXZWJIaXN0b3J5Ojpsb2FkRnJvbVVSTCggCi0gICAgLyogW2luXSAq LyBCU1RSIHVybCwKLSAgICAvKiBbb3V0XSAqLyBJV2ViRXJyb3IqKiBlcnJvciwKLSAgICAvKiBb cmV0dmFsXVtvdXRdICovIEJPT0wqIHN1Y2NlZWRlZCkKLXsKLSAgICBIUkVTVUxUIGhyID0gU19P SzsKLSAgICBSZXRhaW5QdHI8Q0ZNdXRhYmxlQXJyYXlSZWY+IGRpc2NhcmRlZEl0ZW1zID0gYWRv cHRDRigKLSAgICAgICAgQ0ZBcnJheUNyZWF0ZU11dGFibGUoMCwgMCwgJk1hcnNoYWxsaW5nSGVs cGVyczo6a0lVbmtub3duQXJyYXlDYWxsQmFja3MpKTsKLQotICAgIFJldGFpblB0cjxDRlVSTFJl Zj4gdXJsUmVmID0gYWRvcHRDRihNYXJzaGFsbGluZ0hlbHBlcnM6OkJTVFJUb0NGVVJMUmVmKHVy bCkpOwotCi0gICAgaHIgPSBsb2FkSGlzdG9yeUd1dHNGcm9tVVJMKHVybFJlZi5nZXQoKSwgZGlz Y2FyZGVkSXRlbXMuZ2V0KCksIGVycm9yKTsKLSAgICBpZiAoRkFJTEVEKGhyKSkKLSAgICAgICAg Z290byBleGl0OwotCi0gICAgaHIgPSBwb3N0Tm90aWZpY2F0aW9uKGtXZWJIaXN0b3J5TG9hZGVk Tm90aWZpY2F0aW9uKTsKLSAgICBpZiAoRkFJTEVEKGhyKSkKLSAgICAgICAgZ290byBleGl0Owot Ci0gICAgaWYgKENGQXJyYXlHZXRDb3VudChkaXNjYXJkZWRJdGVtcy5nZXQoKSkgPiAwKSB7Ci0g ICAgICAgIENPTVB0cjxDRkRpY3Rpb25hcnlQcm9wZXJ0eUJhZz4gdXNlckluZm8gPSBjcmVhdGVV c2VySW5mb0Zyb21BcnJheShnZXROb3RpZmljYXRpb25TdHJpbmcoa1dlYkhpc3RvcnlJdGVtc0Rp c2NhcmRlZFdoaWxlTG9hZGluZ05vdGlmaWNhdGlvbiksIGRpc2NhcmRlZEl0ZW1zLmdldCgpKTsK LSAgICAgICAgaHIgPSBwb3N0Tm90aWZpY2F0aW9uKGtXZWJIaXN0b3J5SXRlbXNEaXNjYXJkZWRX aGlsZUxvYWRpbmdOb3RpZmljYXRpb24sIHVzZXJJbmZvLmdldCgpKTsKLSAgICAgICAgaWYgKEZB SUxFRChocikpCi0gICAgICAgICAgICBnb3RvIGV4aXQ7Ci0gICAgfQotCi1leGl0OgotICAgIGlm IChzdWNjZWVkZWQpCi0gICAgICAgICpzdWNjZWVkZWQgPSBTVUNDRUVERUQoaHIpOwotICAgIHJl dHVybiBocjsKLX0KLQotc3RhdGljIENGRGljdGlvbmFyeVJlZiBjcmVhdGVIaXN0b3J5TGlzdEZy b21TdHJlYW0oQ0ZSZWFkU3RyZWFtUmVmIHN0cmVhbSwgQ0ZQcm9wZXJ0eUxpc3RGb3JtYXQgZm9y bWF0KQotewotICAgIHJldHVybiAoQ0ZEaWN0aW9uYXJ5UmVmKUNGUHJvcGVydHlMaXN0Q3JlYXRl RnJvbVN0cmVhbSgwLCBzdHJlYW0sIDAsIGtDRlByb3BlcnR5TGlzdEltbXV0YWJsZSwgJmZvcm1h dCwgMCk7Ci19Ci0KLUhSRVNVTFQgV2ViSGlzdG9yeTo6bG9hZEhpc3RvcnlHdXRzRnJvbVVSTChD RlVSTFJlZiB1cmwsIENGTXV0YWJsZUFycmF5UmVmIGRpc2NhcmRlZEl0ZW1zLCBJV2ViRXJyb3Iq KiAvKmVycm9yKi8pIC8vRklYTUUKLXsKLSAgICBDRlByb3BlcnR5TGlzdEZvcm1hdCBmb3JtYXQg PSBrQ0ZQcm9wZXJ0eUxpc3RCaW5hcnlGb3JtYXRfdjFfMCB8IGtDRlByb3BlcnR5TGlzdFhNTEZv cm1hdF92MV8wOwotICAgIEhSRVNVTFQgaHIgPSBTX09LOwotICAgIGludCBudW1iZXJPZkl0ZW1z TG9hZGVkID0gMDsKLQotICAgIFJldGFpblB0cjxDRlJlYWRTdHJlYW1SZWY+IHN0cmVhbSA9IGFk b3B0Q0YoQ0ZSZWFkU3RyZWFtQ3JlYXRlV2l0aEZpbGUoMCwgdXJsKSk7Ci0gICAgaWYgKCFzdHJl YW0pIAotICAgICAgICByZXR1cm4gRV9GQUlMOwotCi0gICAgaWYgKCFDRlJlYWRTdHJlYW1PcGVu KHN0cmVhbS5nZXQoKSkpIAotICAgICAgICByZXR1cm4gRV9GQUlMOwotCi0gICAgUmV0YWluUHRy PENGRGljdGlvbmFyeVJlZj4gaGlzdG9yeUxpc3QgPSBhZG9wdENGKGNyZWF0ZUhpc3RvcnlMaXN0 RnJvbVN0cmVhbShzdHJlYW0uZ2V0KCksIGZvcm1hdCkpOwotICAgIENGUmVhZFN0cmVhbUNsb3Nl KHN0cmVhbS5nZXQoKSk7Ci0KLSAgICBpZiAoIWhpc3RvcnlMaXN0KSAKLSAgICAgICAgcmV0dXJu IEVfRkFJTDsKLQotICAgIENGTnVtYmVyUmVmIGZpbGVWZXJzaW9uT2JqZWN0ID0gKENGTnVtYmVy UmVmKUNGRGljdGlvbmFyeUdldFZhbHVlKGhpc3RvcnlMaXN0LmdldCgpLCBGaWxlVmVyc2lvbktl eSk7Ci0gICAgaW50IGZpbGVWZXJzaW9uOwotICAgIGlmICghQ0ZOdW1iZXJHZXRWYWx1ZShmaWxl VmVyc2lvbk9iamVjdCwga0NGTnVtYmVySW50VHlwZSwgJmZpbGVWZXJzaW9uKSkgCi0gICAgICAg IHJldHVybiBFX0ZBSUw7Ci0KLSAgICBpZiAoZmlsZVZlcnNpb24gPiBjdXJyZW50RmlsZVZlcnNp b24pIAotICAgICAgICByZXR1cm4gRV9GQUlMOwotICAgIAotICAgIENGQXJyYXlSZWYgZGF0ZXNB cnJheSA9IChDRkFycmF5UmVmKUNGRGljdGlvbmFyeUdldFZhbHVlKGhpc3RvcnlMaXN0LmdldCgp LCBEYXRlc0FycmF5S2V5KTsKLQotICAgIGludCBpdGVtQ291bnRMaW1pdDsKLSAgICBociA9IGhp c3RvcnlJdGVtTGltaXQoJml0ZW1Db3VudExpbWl0KTsKLSAgICBpZiAoRkFJTEVEKGhyKSkKLSAg ICAgICAgcmV0dXJuIGhyOwotCi0gICAgQ0ZBYnNvbHV0ZVRpbWUgbGltaXREYXRlOwotICAgIGhy ID0gYWdlTGltaXREYXRlKCZsaW1pdERhdGUpOwotICAgIGlmIChGQUlMRUQoaHIpKQotICAgICAg ICByZXR1cm4gaHI7Ci0KLSAgICBib29sIGFnZUxpbWl0UGFzc2VkID0gZmFsc2U7Ci0gICAgYm9v bCBpdGVtTGltaXRQYXNzZWQgPSBmYWxzZTsKLQotICAgIENGSW5kZXggaXRlbUNvdW50ID0gQ0ZB cnJheUdldENvdW50KGRhdGVzQXJyYXkpOwotICAgIGZvciAoQ0ZJbmRleCBpID0gMDsgaSA8IGl0 ZW1Db3VudDsgKytpKSB7Ci0gICAgICAgIENGRGljdGlvbmFyeVJlZiBpdGVtQXNEaWN0aW9uYXJ5 ID0gKENGRGljdGlvbmFyeVJlZilDRkFycmF5R2V0VmFsdWVBdEluZGV4KGRhdGVzQXJyYXksIGkp OwotICAgICAgICBDT01QdHI8V2ViSGlzdG9yeUl0ZW0+IGl0ZW0oQWRvcHRDT00sIFdlYkhpc3Rv cnlJdGVtOjpjcmVhdGVJbnN0YW5jZSgpKTsKLSAgICAgICAgaHIgPSBpdGVtLT5pbml0RnJvbURp Y3Rpb25hcnlSZXByZXNlbnRhdGlvbigodm9pZCopaXRlbUFzRGljdGlvbmFyeSk7Ci0gICAgICAg IGlmIChGQUlMRUQoaHIpKQotICAgICAgICAgICAgcmV0dXJuIGhyOwotCi0gICAgICAgIC8vIGl0 ZW0gd2l0aG91dCBVUkwgaXMgdXNlbGVzczsgZGF0YSBvbiBkaXNrIG11c3QgaGF2ZSBiZWVuIGJh ZDsgaWdub3JlCi0gICAgICAgIEJPT0wgaGFzVVJMOwotICAgICAgICBociA9IGl0ZW0tPmhhc1VS TFN0cmluZygmaGFzVVJMKTsKLSAgICAgICAgaWYgKEZBSUxFRChocikpCi0gICAgICAgICAgICBy ZXR1cm4gaHI7Ci0gICAgICAgIAotICAgICAgICBpZiAoaGFzVVJMKSB7Ci0gICAgICAgICAgICAv LyBUZXN0IGFnYWluc3QgZGF0ZSBsaW1pdC4gU2luY2UgdGhlIGl0ZW1zIGFyZSBvcmRlcmVkIG5l d2VzdCB0byBvbGRlc3QsIHdlIGNhbiBzdG9wIGNvbXBhcmluZwotICAgICAgICAgICAgLy8gb25j ZSB3ZSd2ZSBmb3VuZCB0aGUgZmlyc3QgaXRlbSB0aGF0J3MgdG9vIG9sZC4KLSAgICAgICAgICAg IGlmICghYWdlTGltaXRQYXNzZWQpIHsKLSAgICAgICAgICAgICAgICBEQVRFIGxhc3RWaXNpdGVk VGltZTsKLSAgICAgICAgICAgICAgICBociA9IGl0ZW0tPmxhc3RWaXNpdGVkVGltZUludGVydmFs KCZsYXN0VmlzaXRlZFRpbWUpOwotICAgICAgICAgICAgICAgIGlmIChGQUlMRUQoaHIpKQotICAg ICAgICAgICAgICAgICAgICByZXR1cm4gaHI7Ci0gICAgICAgICAgICAgICAgaWYgKHRpbWVUb0Rh dGUoTWFyc2hhbGxpbmdIZWxwZXJzOjpEQVRFVG9DRkFic29sdXRlVGltZShsYXN0VmlzaXRlZFRp bWUpKSA8PSBsaW1pdERhdGUpCi0gICAgICAgICAgICAgICAgICAgIGFnZUxpbWl0UGFzc2VkID0g dHJ1ZTsKLSAgICAgICAgICAgIH0KLSAgICAgICAgICAgIGlmIChhZ2VMaW1pdFBhc3NlZCB8fCBp dGVtTGltaXRQYXNzZWQpCi0gICAgICAgICAgICAgICAgQ0ZBcnJheUFwcGVuZFZhbHVlKGRpc2Nh cmRlZEl0ZW1zLCBpdGVtLmdldCgpKTsKLSAgICAgICAgICAgIGVsc2UgewotICAgICAgICAgICAg ICAgIGJvb2wgYWRkZWQ7Ci0gICAgICAgICAgICAgICAgYWRkSXRlbShpdGVtLmdldCgpLCB0cnVl LCAmYWRkZWQpOyAvLyByZWYgaXMgYWRkZWQgaW5zaWRlIGFkZEl0ZW0KLSAgICAgICAgICAgICAg ICBpZiAoYWRkZWQpCi0gICAgICAgICAgICAgICAgICAgICsrbnVtYmVyT2ZJdGVtc0xvYWRlZDsK LSAgICAgICAgICAgICAgICBpZiAobnVtYmVyT2ZJdGVtc0xvYWRlZCA9PSBpdGVtQ291bnRMaW1p dCkKLSAgICAgICAgICAgICAgICAgICAgaXRlbUxpbWl0UGFzc2VkID0gdHJ1ZTsKLSAgICAgICAg ICAgIH0KLSAgICAgICAgfQotICAgIH0KLSAgICByZXR1cm4gaHI7Ci19Ci0KLUhSRVNVTFQgU1RE TUVUSE9EQ0FMTFRZUEUgV2ViSGlzdG9yeTo6c2F2ZVRvVVJMKCAKLSAgICAvKiBbaW5dICovIEJT VFIgdXJsLAotICAgIC8qIFtvdXRdICovIElXZWJFcnJvcioqIGVycm9yLAotICAgIC8qIFtyZXR2 YWxdW291dF0gKi8gQk9PTCogc3VjY2VlZGVkKQorSFJFU1VMVCBTVERNRVRIT0RDQUxMVFlQRSBX ZWJIaXN0b3J5Ojp1bnVzZWQxKCkKIHsKLSAgICBIUkVTVUxUIGhyID0gU19PSzsKLSAgICBSZXRh aW5QdHI8Q0ZVUkxSZWY+IHVybFJlZiA9IGFkb3B0Q0YoTWFyc2hhbGxpbmdIZWxwZXJzOjpCU1RS VG9DRlVSTFJlZih1cmwpKTsKLQotICAgIGhyID0gc2F2ZUhpc3RvcnlHdXRzKHVybFJlZi5nZXQo KSwgZXJyb3IpOwotCi0gICAgaWYgKHN1Y2NlZWRlZCkKLSAgICAgICAgKnN1Y2NlZWRlZCA9IFNV Q0NFRURFRChocik7Ci0gICAgaWYgKFNVQ0NFRURFRChocikpCi0gICAgICAgIGhyID0gcG9zdE5v dGlmaWNhdGlvbihrV2ViSGlzdG9yeVNhdmVkTm90aWZpY2F0aW9uKTsKLQotICAgIHJldHVybiBo cjsKKyAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKKyAgICByZXR1cm4gRV9GQUlMOwogfQogCi1I UkVTVUxUIFdlYkhpc3Rvcnk6OnNhdmVIaXN0b3J5R3V0cyhDRlVSTFJlZiB1cmwsIElXZWJFcnJv cioqIGVycm9yKQorSFJFU1VMVCBTVERNRVRIT0RDQUxMVFlQRSBXZWJIaXN0b3J5Ojp1bnVzZWQy KCkKIHsKLSAgICBIUkVTVUxUIGhyID0gU19PSzsKLQotICAgIC8vIEZJWE1FOiBDb3JyZWN0bHkg cmVwb3J0IGVycm9yIHdoZW4gbmV3IEFQSSBpcyByZWFkeS4KLSAgICBpZiAoZXJyb3IpCi0gICAg ICAgICplcnJvciA9IDA7Ci0KLSAgICBSZXRhaW5QdHI8Q0ZEYXRhUmVmPiBkYXRhID0gdGhpcy0+ ZGF0YSgpOwotCi0gICAgaWYgKCFkYXRhLmdldCgpKQotICAgICAgICByZXR1cm4gRV9GQUlMOwot Ci0gICAgUmV0YWluUHRyPENGV3JpdGVTdHJlYW1SZWY+IHN0cmVhbSA9IGFkb3B0Q0YoQ0ZXcml0 ZVN0cmVhbUNyZWF0ZVdpdGhGaWxlKGtDRkFsbG9jYXRvckRlZmF1bHQsIHVybCkpOwotICAgIGlm ICghc3RyZWFtKSAKLSAgICAgICAgcmV0dXJuIEVfRkFJTDsKLQotICAgIGlmICghQ0ZXcml0ZVN0 cmVhbU9wZW4oc3RyZWFtLmdldCgpKSkgCi0gICAgICAgIHJldHVybiBFX0ZBSUw7Ci0KLSAgICBj b25zdCBVSW50OCogZGF0YVB0ciA9IENGRGF0YUdldEJ5dGVQdHIoZGF0YS5nZXQoKSk7Ci0gICAg Q0ZJbmRleCBsZW5ndGggPSBDRkRhdGFHZXRMZW5ndGgoZGF0YS5nZXQoKSk7Ci0KLSAgICB3aGls ZSAobGVuZ3RoKSB7Ci0gICAgICAgIENGSW5kZXggYnl0ZXNXcml0dGVuID0gQ0ZXcml0ZVN0cmVh bVdyaXRlKHN0cmVhbS5nZXQoKSwgZGF0YVB0ciwgbGVuZ3RoKTsKLSAgICAgICAgaWYgKGJ5dGVz V3JpdHRlbiA8PSAwKSB7Ci0gICAgICAgICAgICBociA9IEVfRkFJTDsKLSAgICAgICAgICAgIGJy ZWFrOwotICAgICAgICB9Ci0gICAgICAgIGRhdGFQdHIgKz0gYnl0ZXNXcml0dGVuOwotICAgICAg ICBsZW5ndGggLT0gYnl0ZXNXcml0dGVuOwotICAgIH0KLQotICAgIENGV3JpdGVTdHJlYW1DbG9z ZShzdHJlYW0uZ2V0KCkpOwotCi0gICAgcmV0dXJuIGhyOworICAgIEFTU0VSVF9OT1RfUkVBQ0hF RCgpOworICAgIHJldHVybiBFX0ZBSUw7CiB9CiAKIEhSRVNVTFQgU1RETUVUSE9EQ0FMTFRZUEUg V2ViSGlzdG9yeTo6YWRkSXRlbXMoIApAQCAtNTU0LDIxICszNTAsNiBAQCBIUkVTVUxUIFNURE1F VEhPRENBTExUWVBFIFdlYkhpc3Rvcnk6OmFsbEl0ZW1zKAogICAgIHJldHVybiBTX09LOwogfQog Ci1IUkVTVUxUIFdlYkhpc3Rvcnk6OmRhdGEoSVN0cmVhbSoqIHN0cmVhbSkKLXsKLSAgICBpZiAo IXN0cmVhbSkKLSAgICAgICAgcmV0dXJuIEVfUE9JTlRFUjsKLQotICAgICpzdHJlYW0gPSAwOwot Ci0gICAgUmV0YWluUHRyPENGRGF0YVJlZj4gaGlzdG9yeURhdGEgPSBkYXRhKCk7Ci0gICAgaWYg KCFoaXN0b3J5RGF0YSkKLSAgICAgICAgcmV0dXJuIFNfT0s7Ci0KLSAgICBDT01QdHI8TWVtb3J5 U3RyZWFtPiByZXN1bHQgPSBNZW1vcnlTdHJlYW06OmNyZWF0ZUluc3RhbmNlKFNoYXJlZEJ1ZmZl cjo6d3JhcENGRGF0YShoaXN0b3J5RGF0YS5nZXQoKSkpOwotICAgIHJldHVybiByZXN1bHQuY29w eVJlZlRvKHN0cmVhbSk7Ci19Ci0KIEhSRVNVTFQgV2ViSGlzdG9yeTo6c2V0VmlzaXRlZExpbmtU cmFja2luZ0VuYWJsZWQoQk9PTCB2aXNpdGVkTGlua1RyYWNraW5nRW5hYmxlZCkKIHsKICAgICBQ YWdlR3JvdXA6OnNldFNob3VsZFRyYWNrVmlzaXRlZExpbmtzKHZpc2l0ZWRMaW5rVHJhY2tpbmdF bmFibGVkKTsKQEAgLTEwMDMsMTMgKzc4NCwzIEBAIHZvaWQgV2ViSGlzdG9yeTo6YWRkVmlzaXRl ZExpbmtzVG9QYWdlR3JvdXAoUGFnZUdyb3VwJiBncm91cCkKIHsKICAgICBDRkRpY3Rpb25hcnlB cHBseUZ1bmN0aW9uKG1fZW50cmllc0J5VVJMLmdldCgpLCBhZGRWaXNpdGVkTGlua1RvUGFnZUdy b3VwLCAmZ3JvdXApOwogfQotCi1SZXRhaW5QdHI8Q0ZEYXRhUmVmPiBXZWJIaXN0b3J5OjpkYXRh KCkgY29uc3QKLXsKLSAgICBpZiAobV9lbnRyaWVzQnlEYXRlLmlzRW1wdHkoKSkKLSAgICAgICAg cmV0dXJuIDA7Ci0KLSAgICBXZWJIaXN0b3J5V3JpdGVyIHdyaXRlcihtX2VudHJpZXNCeURhdGUp OwotICAgIHdyaXRlci53cml0ZVByb3BlcnR5TGlzdCgpOwotICAgIHJldHVybiB3cml0ZXIucmVs ZWFzZURhdGEoKTsKLX0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvd2luL1dlYkhpc3Rvcnku aCBiL1NvdXJjZS9XZWJLaXQvd2luL1dlYkhpc3RvcnkuaAppbmRleCBlYzdhN2E5MDA0YmZiNzVl MTE5M2QxMDg1OTAzZWFkM2U3OWJlMTZlLi5hZWZiMmM4Y2E1YTY0M2JmY2ZjN2VhNmVlM2M4NDVj OGQ0YmQ1OTYyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L3dpbi9XZWJIaXN0b3J5LmgKKysr IGIvU291cmNlL1dlYktpdC93aW4vV2ViSGlzdG9yeS5oCkBAIC02MiwxNSArNjIsOCBAQCBwdWJs aWM6CiAgICAgdmlydHVhbCBIUkVTVUxUIFNURE1FVEhPRENBTExUWVBFIHNldE9wdGlvbmFsU2hh cmVkSGlzdG9yeSggCiAgICAgICAgIC8qIFtpbl0gKi8gSVdlYkhpc3RvcnkqIGhpc3RvcnkpOwog ICAgIAotICAgIHZpcnR1YWwgSFJFU1VMVCBTVERNRVRIT0RDQUxMVFlQRSBsb2FkRnJvbVVSTCgg Ci0gICAgICAgIC8qIFtpbl0gKi8gQlNUUiB1cmwsCi0gICAgICAgIC8qIFtvdXRdICovIElXZWJF cnJvcioqIGVycm9yLAotICAgICAgICAvKiBbcmV0dmFsXVtvdXRdICovIEJPT0wqIHN1Y2NlZWRl ZCk7Ci0gICAgCi0gICAgdmlydHVhbCBIUkVTVUxUIFNURE1FVEhPRENBTExUWVBFIHNhdmVUb1VS TCggCi0gICAgICAgIC8qIFtpbl0gKi8gQlNUUiB1cmwsCi0gICAgICAgIC8qIFtvdXRdICovIElX ZWJFcnJvcioqIGVycm9yLAotICAgICAgICAvKiBbcmV0dmFsXVtvdXRdICovIEJPT0wqIHN1Y2Nl ZWRlZCk7CisgICAgdmlydHVhbCBIUkVTVUxUIFNURE1FVEhPRENBTExUWVBFIHVudXNlZDEoKSBP VkVSUklERTsKKyAgICB2aXJ0dWFsIEhSRVNVTFQgU1RETUVUSE9EQ0FMTFRZUEUgdW51c2VkMigp IE9WRVJSSURFOwogICAgIAogICAgIHZpcnR1YWwgSFJFU1VMVCBTVERNRVRIT0RDQUxMVFlQRSBh ZGRJdGVtcyggCiAgICAgICAgIC8qIFtpbl0gKi8gaW50IGl0ZW1Db3VudCwKQEAgLTExMyw4ICsx MDYsNiBAQCBwdWJsaWM6CiAgICAgICAgIC8qIFtvdXRdW2luXSAqLyBpbnQqIGNvdW50LAogICAg ICAgICAvKiBbcmV0dmFsXVtvdXRdICovIElXZWJIaXN0b3J5SXRlbSoqIGl0ZW1zKTsKIAotICAg IHZpcnR1YWwgSFJFU1VMVCBTVERNRVRIT0RDQUxMVFlQRSBkYXRhKElTdHJlYW0qKik7Ci0KICAg ICB2aXJ0dWFsIEhSRVNVTFQgU1RETUVUSE9EQ0FMTFRZUEUgc2V0VmlzaXRlZExpbmtUcmFja2lu Z0VuYWJsZWQoQk9PTCB2aXNpdGVkTGlua1RyYWNraW5nRW5hYmxlKTsKICAgICB2aXJ0dWFsIEhS RVNVTFQgU1RETUVUSE9EQ0FMTFRZUEUgcmVtb3ZlQWxsVmlzaXRlZExpbmtzKCk7CiAKQEAgLTE0 MCw4ICsxMzEsNiBAQCBwcml2YXRlOgogICAgICAgICBrV2ViSGlzdG9yeVNhdmVkTm90aWZpY2F0 aW9uID0gNQogICAgIH07CiAKLSAgICBIUkVTVUxUIGxvYWRIaXN0b3J5R3V0c0Zyb21VUkwoQ0ZV UkxSZWYgdXJsLCBDRk11dGFibGVBcnJheVJlZiBkaXNjYXJkZWRJdGVtcywgSVdlYkVycm9yKiog ZXJyb3IpOwotICAgIEhSRVNVTFQgc2F2ZUhpc3RvcnlHdXRzKENGVVJMUmVmIHVybCwgSVdlYkVy cm9yKiogZXJyb3IpOwogICAgIEhSRVNVTFQgcG9zdE5vdGlmaWNhdGlvbihOb3RpZmljYXRpb25U eXBlIG5vdGlmeVR5cGUsIElQcm9wZXJ0eUJhZyogdXNlckluZm8gPSAwKTsKICAgICBIUkVTVUxU IHJlbW92ZUl0ZW0oSVdlYkhpc3RvcnlJdGVtKiBlbnRyeSk7CiAgICAgSFJFU1VMVCBhZGRJdGVt KElXZWJIaXN0b3J5SXRlbSogZW50cnksIGJvb2wgZGlzY2FyZER1cGxpY2F0ZSwgYm9vbCogYWRk ZWQpOwpAQCAtMTU0LDcgKzE0Myw2IEBAIHByaXZhdGU6CiAgICAgc3RhdGljIENGQWJzb2x1dGVU aW1lIHRpbWVUb0RhdGUoQ0ZBYnNvbHV0ZVRpbWUgdGltZSk7CiAgICAgQlNUUiBnZXROb3RpZmlj YXRpb25TdHJpbmcoTm90aWZpY2F0aW9uVHlwZSBub3RpZnlUeXBlKTsKICAgICBIUkVTVUxUIGl0 ZW1Gb3JVUkxTdHJpbmcoQ0ZTdHJpbmdSZWYgdXJsU3RyaW5nLCBJV2ViSGlzdG9yeUl0ZW0qKiBp dGVtKSBjb25zdDsKLSAgICBSZXRhaW5QdHI8Q0ZEYXRhUmVmPiBkYXRhKCkgY29uc3Q7CiAKICAg ICBVTE9ORyBtX3JlZkNvdW50OwogICAgIFJldGFpblB0cjxDRk11dGFibGVEaWN0aW9uYXJ5UmVm PiBtX2VudHJpZXNCeVVSTDsK