134452 2014-06-30 13:57:18 -0700 Add code for encoding legacy session history entries 2014-06-30 14:54:24 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca benjamin bunhere cdumez cmarcelo commit-queue gyuyoung.kim sergio oldest_to_newest 1019381 0 andersca 2014-06-30 13:57:18 -0700 Add code for encoding legacy session history entries 1019384 1 234090 andersca 2014-06-30 13:59:34 -0700 Created attachment 234090 Patch 1019387 2 234090 kling 2014-06-30 14:04:27 -0700 Comment on attachment 234090 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=234090&action=review r=me > Source/WebKit2/UIProcess/mac/LegacySessionStateCoding.cpp:238 > + } else This "else" should not be here. 1019407 3 andersca 2014-06-30 14:54:24 -0700 Committed r170599: <http://trac.webkit.org/changeset/170599> 234090 2014-06-30 13:59:34 -0700 2014-06-30 14:04:26 -0700 Patch bug-134452-20140630135915.patch text/plain 11937 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTcwNDMzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IDNkNjQ1YTJlMDIzZWU2ZDY5YjM0YzQx ZTNjOTc1ZGJlMDFhNjc4NTYuLjdmMWNhYTE2ZmRlMTg4NTZmOWViNjEwYjk2NTU5YjI2NDEwMDk2 YWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTQtMDYtMzAgIEFuZGVycyBDYXJsc3NvbiAgPGFu ZGVyc2NhQGFwcGxlLmNvbT4KKworICAgICAgICBBZGQgY29kZSBmb3IgZW5jb2RpbmcgbGVnYWN5 IHNlc3Npb24gaGlzdG9yeSBlbnRyaWVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xMzQ0NTIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICAqIHd0Zi9NYWxsb2NQdHIuaDoKKyAgICAgICAgKFdURjo6TWFsbG9j UHRyOjptYWxsb2MpOgorICAgICAgICAoV1RGOjpNYWxsb2NQdHI6OnJlYWxsb2MpOgorCiAyMDE0 LTA2LTI1ICBwZWF2b0BvdXRsb29rLmNvbSAgPHBlYXZvQG91dGxvb2suY29tPgogCiAgICAgICAg IFtXaW42NF0gQVNNIExMSU5UIGlzIG5vdCBlbmFibGVkLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdDIvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCmluZGV4IGE0Mzc4MjFk MTMzMGQ0OTU3OTcxMDhlMDdkYjEwMDkyOGNlNDAxNjMuLmJkNGIwYjQ4NTY0NjU2ZGE0OWY1NTQ5 NTE5MDM0ODU1NWZhMDU1YmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwor KysgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNCBAQAorMjAxNC0wNi0z MCAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgorCisgICAgICAgIEFkZCBj b2RlIGZvciBlbmNvZGluZyBsZWdhY3kgc2Vzc2lvbiBoaXN0b3J5IGVudHJpZXMKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzNDQ1MgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVUlQcm9jZXNzL21hYy9M ZWdhY3lTZXNzaW9uU3RhdGVDb2RpbmcuY3BwOgorICAgICAgICAoV2ViS2l0OjpIaXN0b3J5RW50 cnlEYXRhRW5jb2Rlcjo6SGlzdG9yeUVudHJ5RGF0YUVuY29kZXIpOgorICAgICAgICAoV2ViS2l0 OjpIaXN0b3J5RW50cnlEYXRhRW5jb2Rlcjo6b3BlcmF0b3I8PCk6CisgICAgICAgIChXZWJLaXQ6 Okhpc3RvcnlFbnRyeURhdGFFbmNvZGVyOjpmaW5pc2hFbmNvZGluZyk6CisgICAgICAgIChXZWJL aXQ6Okhpc3RvcnlFbnRyeURhdGFFbmNvZGVyOjplbmNvZGVBcml0aG1ldGljVHlwZSk6CisgICAg ICAgIChXZWJLaXQ6Okhpc3RvcnlFbnRyeURhdGFFbmNvZGVyOjplbmNvZGVGaXhlZExlbmd0aERh dGEpOgorICAgICAgICAoV2ViS2l0OjpIaXN0b3J5RW50cnlEYXRhRW5jb2Rlcjo6Z3Jvdyk6Cisg ICAgICAgIChXZWJLaXQ6Okhpc3RvcnlFbnRyeURhdGFFbmNvZGVyOjpncm93Q2FwYWNpdHkpOgor ICAgICAgICAoV2ViS2l0OjplbmNvZGVGcmFtZVN0YXRlTm9kZSk6CisgICAgICAgIChXZWJLaXQ6 OmVuY29kZUxlZ2FjeVNlc3Npb25IaXN0b3J5RW50cnlEYXRhKToKKyAgICAgICAgKFdlYktpdDo6 ZGVjb2RlU2Vzc2lvbkhpc3RvcnlFbnRyeURhdGEpOgorICAgICAgICAoV2ViS2l0OjpkZWNvZGVM ZWdhY3lTZXNzaW9uSGlzdG9yeUVudHJ5RGF0YSk6CisgICAgICAgICogVUlQcm9jZXNzL21hYy9M ZWdhY3lTZXNzaW9uU3RhdGVDb2RpbmcuaDoKKwogMjAxNC0wNi0yNSAgTGFzemxvIEdvbWJvcyAg PGwuZ29tYm9zQHNhbXN1bmcuY29tPgogCiAgICAgICAgIFJlbW92ZSBidWlsZCBndWFyZCBmb3Ig cHJvZ3Jlc3MgZWxlbWVudApkaWZmIC0tZ2l0IGEvU291cmNlL1dURi93dGYvTWFsbG9jUHRyLmgg Yi9Tb3VyY2UvV1RGL3d0Zi9NYWxsb2NQdHIuaAppbmRleCA2M2ExZmE0YmYwNjFiOTFlOWEyZDBk NzlmNGJmNmMxNzE0NDdkMjE1Li43MTJmOWUzM2ZlODFlNzM5NTE0Nzc0ZGRlMDlkMDU0ZTQ5ZGZi ODNlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV1RGL3d0Zi9NYWxsb2NQdHIuaAorKysgYi9Tb3VyY2Uv V1RGL3d0Zi9NYWxsb2NQdHIuaApAQCAtODYsNiArODYsMTkgQEAgcHVibGljOgogCiAgICAgdGVt cGxhdGU8dHlwZW5hbWUgVT4gZnJpZW5kIE1hbGxvY1B0cjxVPiBhZG9wdE1hbGxvY1B0cihVKik7 CiAKKyAgICBzdGF0aWMgTWFsbG9jUHRyIG1hbGxvYyhzaXplX3Qgc2l6ZSkKKyAgICB7CisgICAg ICAgIE1hbGxvY1B0ciBtYWxsb2NQdHI7CisgICAgICAgIG1hbGxvY1B0ci5tX3B0ciA9IHN0YXRp Y19jYXN0PFQqPihmYXN0TWFsbG9jKHNpemUpKTsKKworICAgICAgICByZXR1cm4gbWFsbG9jUHRy OworICAgIH0KKworICAgIHZvaWQgcmVhbGxvYyhzaXplX3QgbmV3U2l6ZSkKKyAgICB7CisgICAg ICAgIG1fcHRyID0gc3RhdGljX2Nhc3Q8VCo+KGZhc3RSZWFsbG9jKG1fcHRyLCBuZXdTaXplKSk7 CisgICAgfQorCiBwcml2YXRlOgogICAgIGV4cGxpY2l0IE1hbGxvY1B0cihUKiBwdHIpCiAgICAg ICAgIDogbV9wdHIocHRyKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21h Yy9MZWdhY3lTZXNzaW9uU3RhdGVDb2RpbmcuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L21hYy9MZWdhY3lTZXNzaW9uU3RhdGVDb2RpbmcuY3BwCmluZGV4IGU0N2YxZmZhMGI0ZGVkOTJi ZTkyZmMxNTYwOTY5MDZlYTNkMTVhNzUuLjA2Yzc5ZjVlNjQ1M2MyNGMxOWE4NzA3ZWIwZWZjM2Vk NjMwNzAxYjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvTGVnYWN5 U2Vzc2lvblN0YXRlQ29kaW5nLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFj L0xlZ2FjeVNlc3Npb25TdGF0ZUNvZGluZy5jcHAKQEAgLTI4LDcgKzI4LDkgQEAKIAogI2luY2x1 ZGUgIkFQSURhdGEuaCIKICNpbmNsdWRlICJTZXNzaW9uU3RhdGUuaCIKKyNpbmNsdWRlIDx3dGYv TWFsbG9jUHRyLmg+CiAjaW5jbHVkZSA8d3RmL2NmL1R5cGVDYXN0cy5oPgorI2luY2x1ZGUgPHd0 Zi90ZXh0L1N0cmluZ1ZpZXcuaD4KIAogbmFtZXNwYWNlIFdlYktpdCB7CiAKQEAgLTU1LDYgKzU3 LDIzMyBAQCBjb25zdCB1aW50MzJfdCBzZXNzaW9uSGlzdG9yeUVudHJ5RGF0YVZlcnNpb24gPSAy OwogCiB0ZW1wbGF0ZTx0eXBlbmFtZSBUPiB2b2lkIGlzVmFsaWRFbnVtKFQpOwogCitjbGFzcyBI aXN0b3J5RW50cnlEYXRhRW5jb2RlciB7CitwdWJsaWM6CisgICAgSGlzdG9yeUVudHJ5RGF0YUVu Y29kZXIoKQorICAgICAgICA6IG1fYnVmZmVyU2l6ZSgwKQorICAgICAgICAsIG1fYnVmZmVyQ2Fw YWNpdHkoNTEyKQorICAgICAgICAsIG1fYnVmZmVyKE1hbGxvY1B0cjx1aW50OF90Pjo6bWFsbG9j KG1fYnVmZmVyQ2FwYWNpdHkpKQorICAgICAgICAsIG1fYnVmZmVyUG9pbnRlcihtX2J1ZmZlci5n ZXQoKSkKKyAgICB7CisgICAgICAgIC8vIEtlZXAgZm9ybWF0IGNvbXBhdGliaWxpdHkgYnkgZW5j b2RpbmcgYW4gdW51c2VkIHVpbnQ2NF90IGhlcmUuCisgICAgICAgICp0aGlzIDw8IHN0YXRpY19j YXN0PHVpbnQ2NF90PigwKTsKKyAgICB9CisKKyAgICBIaXN0b3J5RW50cnlEYXRhRW5jb2RlciYg b3BlcmF0b3I8PCh1aW50MzJfdCB2YWx1ZSkKKyAgICB7CisgICAgICAgIHJldHVybiBlbmNvZGVB cml0aG1ldGljVHlwZSh2YWx1ZSk7CisgICAgfQorCisgICAgSGlzdG9yeUVudHJ5RGF0YUVuY29k ZXImIG9wZXJhdG9yPDwoaW50MzJfdCB2YWx1ZSkKKyAgICB7CisgICAgICAgIHJldHVybiBlbmNv ZGVBcml0aG1ldGljVHlwZSh2YWx1ZSk7CisgICAgfQorCisgICAgSGlzdG9yeUVudHJ5RGF0YUVu Y29kZXImIG9wZXJhdG9yPDwodWludDY0X3QgdmFsdWUpCisgICAgeworICAgICAgICByZXR1cm4g ZW5jb2RlQXJpdGhtZXRpY1R5cGUodmFsdWUpOworICAgIH0KKworICAgIEhpc3RvcnlFbnRyeURh dGFFbmNvZGVyJiBvcGVyYXRvcjw8KGludDY0X3QgdmFsdWUpCisgICAgeworICAgICAgICByZXR1 cm4gZW5jb2RlQXJpdGhtZXRpY1R5cGUodmFsdWUpOworICAgIH0KKworICAgIEhpc3RvcnlFbnRy eURhdGFFbmNvZGVyJiBvcGVyYXRvcjw8KGZsb2F0IHZhbHVlKQorICAgIHsKKyAgICAgICAgcmV0 dXJuIGVuY29kZUFyaXRobWV0aWNUeXBlKHZhbHVlKTsKKyAgICB9CisKKyAgICBIaXN0b3J5RW50 cnlEYXRhRW5jb2RlciYgb3BlcmF0b3I8PChkb3VibGUgdmFsdWUpCisgICAgeworICAgICAgICBy ZXR1cm4gZW5jb2RlQXJpdGhtZXRpY1R5cGUodmFsdWUpOworICAgIH0KKworICAgIEhpc3RvcnlF bnRyeURhdGFFbmNvZGVyJiBvcGVyYXRvcjw8KGJvb2wgdmFsdWUpCisgICAgeworICAgICAgICBy ZXR1cm4gZW5jb2RlQXJpdGhtZXRpY1R5cGUodmFsdWUpOworICAgIH0KKworICAgIEhpc3RvcnlF bnRyeURhdGFFbmNvZGVyJiBvcGVyYXRvcjw8KGNvbnN0IFN0cmluZyYgdmFsdWUpCisgICAgewor ICAgICAgICAvLyBTcGVjaWFsIGNhc2UgdGhlIG51bGwgc3RyaW5nLgorICAgICAgICBpZiAodmFs dWUuaXNOdWxsKCkpCisgICAgICAgICAgICByZXR1cm4gKnRoaXMgPDwgc3RkOjpudW1lcmljX2xp bWl0czx1aW50MzJfdD46Om1heCgpOworCisgICAgICAgIHVpbnQzMl90IGxlbmd0aCA9IHZhbHVl Lmxlbmd0aCgpOworICAgICAgICAqdGhpcyA8PCBsZW5ndGg7CisKKyAgICAgICAgKnRoaXMgPDwg c3RhdGljX2Nhc3Q8dWludDY0X3Q+KGxlbmd0aCAqIHNpemVvZihVQ2hhcikpOworICAgICAgICBl bmNvZGVGaXhlZExlbmd0aERhdGEocmVpbnRlcnByZXRfY2FzdDxjb25zdCB1aW50OF90Kj4oU3Ry aW5nVmlldyh2YWx1ZSkudXBjb252ZXJ0ZWRDaGFyYWN0ZXJzKCkuZ2V0KCkpLCBsZW5ndGggKiBz aXplb2YoVUNoYXIpLCBhbGlnbm9mKFVDaGFyKSk7CisKKyAgICAgICAgcmV0dXJuICp0aGlzOwor ICAgIH0KKworI2lmIFBMQVRGT1JNKElPUykKKyAgICBIaXN0b3J5RW50cnlEYXRhRW5jb2RlciYg b3BlcmF0b3I8PChXZWJDb3JlOjpGbG9hdFJlY3QgdmFsdWUpCisgICAgeworICAgICAgICAqdGhp cyA8PCB2YWx1ZS54KCk7CisgICAgICAgICp0aGlzIDw8IHZhbHVlLnkoKTsKKyAgICAgICAgKnRo aXMgPDwgdmFsdWUud2lkdGgoKTsKKyAgICAgICAgKnRoaXMgPDwgdmFsdWUuaGVpZ2h0KCk7CisK KyAgICAgICAgcmV0dXJuICp0aGlzOworICAgIH0KKworICAgIEhpc3RvcnlFbnRyeURhdGFFbmNv ZGVyJiBvcGVyYXRvcjw8KFdlYkNvcmU6OkludFJlY3QgdmFsdWUpCisgICAgeworICAgICAgICAq dGhpcyA8PCB2YWx1ZS54KCk7CisgICAgICAgICp0aGlzIDw8IHZhbHVlLnkoKTsKKyAgICAgICAg KnRoaXMgPDwgdmFsdWUud2lkdGgoKTsKKyAgICAgICAgKnRoaXMgPDwgdmFsdWUuaGVpZ2h0KCk7 CisKKyAgICAgICAgcmV0dXJuICp0aGlzOworICAgIH0KKworICAgIEhpc3RvcnlFbnRyeURhdGFF bmNvZGVyJiBvcGVyYXRvcjw8KFdlYkNvcmU6OkZsb2F0U2l6ZSB2YWx1ZSkKKyAgICB7CisgICAg ICAgICp0aGlzIDw8IHZhbHVlLndpZHRoKCk7CisgICAgICAgICp0aGlzIDw8IHZhbHVlLmhlaWdo dCgpOworCisgICAgICAgIHJldHVybiAqdGhpczsKKyAgICB9CisKKyAgICBIaXN0b3J5RW50cnlE YXRhRW5jb2RlciYgb3BlcmF0b3I8PChXZWJDb3JlOjpJbnRTaXplIHZhbHVlKQorICAgIHsKKyAg ICAgICAgKnRoaXMgPDwgdmFsdWUud2lkdGgoKTsKKyAgICAgICAgKnRoaXMgPDwgdmFsdWUuaGVp Z2h0KCk7CisKKyAgICAgICAgcmV0dXJuICp0aGlzOworICAgIH0KKyNlbmRpZgorCisgICAgTWFs bG9jUHRyPHVpbnQ4X3Q+IGZpbmlzaEVuY29kaW5nKHNpemVfdCYgc2l6ZSkKKyAgICB7CisgICAg ICAgIHNpemUgPSBtX2J1ZmZlclNpemU7CisgICAgICAgIHJldHVybiBzdGQ6Om1vdmUobV9idWZm ZXIpOworICAgIH0KKworcHJpdmF0ZToKKyAgICB0ZW1wbGF0ZTx0eXBlbmFtZSBUeXBlPgorICAg IEhpc3RvcnlFbnRyeURhdGFFbmNvZGVyJiBlbmNvZGVBcml0aG1ldGljVHlwZShUeXBlIHZhbHVl KQorICAgIHsKKyAgICAgICAgc3RhdGljX2Fzc2VydChzdGQ6OmlzX2FyaXRobWV0aWM8VHlwZT46 OnZhbHVlLCAiIik7CisKKyAgICAgICAgZW5jb2RlRml4ZWRMZW5ndGhEYXRhKHJlaW50ZXJwcmV0 X2Nhc3Q8dWludDhfdCo+KCZ2YWx1ZSksIHNpemVvZih2YWx1ZSksIHNpemVvZih2YWx1ZSkpOwor ICAgICAgICByZXR1cm4gKnRoaXM7CisgICAgfQorCisgICAgdm9pZCBlbmNvZGVGaXhlZExlbmd0 aERhdGEoY29uc3QgdWludDhfdCogZGF0YSwgc2l6ZV90IHNpemUsIHVuc2lnbmVkIGFsaWdubWVu dCkKKyAgICB7CisgICAgICAgIEFTU0VSVCghKHJlaW50ZXJwcmV0X2Nhc3Q8dWludHB0cl90Pihk YXRhKSAlIGFsaWdubWVudCkpOworCisgICAgICAgIHVpbnQ4X3QqIGJ1ZmZlciA9IGdyb3coYWxp Z25tZW50LCBzaXplKTsKKyAgICAgICAgbWVtY3B5KGJ1ZmZlciwgZGF0YSwgc2l6ZSk7CisgICAg fQorCisgICAgdWludDhfdCogZ3Jvdyh1bnNpZ25lZCBhbGlnbm1lbnQsIHNpemVfdCBzaXplKQor ICAgIHsKKyAgICAgICAgc2l6ZV90IGFsaWduZWRTaXplID0gKChtX2J1ZmZlclNpemUgKyBhbGln bm1lbnQgLSAxKSAvIGFsaWdubWVudCkgKiBhbGlnbm1lbnQ7CisKKyAgICAgICAgZ3Jvd0NhcGFj aXR5KGFsaWduZWRTaXplICsgc2l6ZSk7CisKKyAgICAgICAgbV9idWZmZXJTaXplID0gYWxpZ25l ZFNpemUgKyBzaXplOworICAgICAgICBtX2J1ZmZlclBvaW50ZXIgPSBtX2J1ZmZlci5nZXQoKSAr IG1fYnVmZmVyU2l6ZTsKKworICAgICAgICByZXR1cm4gbV9idWZmZXIuZ2V0KCkgKyBhbGlnbmVk U2l6ZTsKKyAgICB9CisKKyAgICB2b2lkIGdyb3dDYXBhY2l0eShzaXplX3QgbmV3U2l6ZSkKKyAg ICB7CisgICAgICAgIGlmIChuZXdTaXplIDw9IG1fYnVmZmVyQ2FwYWNpdHkpCisgICAgICAgICAg ICByZXR1cm47CisKKyAgICAgICAgc2l6ZV90IG5ld0NhcGFjaXR5ID0gbV9idWZmZXJDYXBhY2l0 eSAqIDI7CisgICAgICAgIHdoaWxlIChuZXdDYXBhY2l0eSA8IG5ld1NpemUpCisgICAgICAgICAg ICBuZXdDYXBhY2l0eSAqPSAyOworCisgICAgICAgIG1fYnVmZmVyLnJlYWxsb2MobmV3Q2FwYWNp dHkpOworICAgICAgICBtX2J1ZmZlckNhcGFjaXR5ID0gbmV3Q2FwYWNpdHk7CisgICAgfQorCisg ICAgc2l6ZV90IG1fYnVmZmVyU2l6ZTsKKyAgICBzaXplX3QgbV9idWZmZXJDYXBhY2l0eTsKKyAg ICBNYWxsb2NQdHI8dWludDhfdD4gbV9idWZmZXI7CisgICAgdWludDhfdCogbV9idWZmZXJQb2lu dGVyOworfTsKKworc3RhdGljIHZvaWQgZW5jb2RlRnJhbWVTdGF0ZU5vZGUoSGlzdG9yeUVudHJ5 RGF0YUVuY29kZXImIGVuY29kZXIsIGNvbnN0IEZyYW1lU3RhdGUmIGZyYW1lU3RhdGUpCit7Cisg ICAgZW5jb2RlciA8PCBzdGF0aWNfY2FzdDx1aW50NjRfdD4oZnJhbWVTdGF0ZS5jaGlsZHJlbi5z aXplKCkpOworCisgICAgZm9yIChjb25zdCBhdXRvJiBjaGlsZEZyYW1lU3RhdGUgOiBmcmFtZVN0 YXRlLmNoaWxkcmVuKSB7CisgICAgICAgIC8vIEZJWE1FOiBJbXBsZW1lbnQuCisgICAgICAgICh2 b2lkKWNoaWxkRnJhbWVTdGF0ZTsKKyAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CisgICAg fQorCisgICAgZW5jb2RlciA8PCBmcmFtZVN0YXRlLmRvY3VtZW50U2VxdWVuY2VOdW1iZXI7CisK KyAgICBlbmNvZGVyIDw8IHN0YXRpY19jYXN0PHVpbnQ2NF90PihmcmFtZVN0YXRlLmRvY3VtZW50 U3RhdGUuc2l6ZSgpKTsKKyAgICBmb3IgKGNvbnN0IGF1dG8mIGRvY3VtZW50U3RhdGUgOiBmcmFt ZVN0YXRlLmRvY3VtZW50U3RhdGUpIHsKKyAgICAgICAgLy8gRklYTUU6IEltcGxlbWVudC4KKyAg ICAgICAgKHZvaWQpZG9jdW1lbnRTdGF0ZTsKKyAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7 CisgICAgfQorCisgICAgZW5jb2RlciA8PCAhIWZyYW1lU3RhdGUuaHR0cEJvZHk7CisgICAgaWYg KGZyYW1lU3RhdGUuaHR0cEJvZHkpIHsKKyAgICAgICAgLy8gRklYTUU6IEltcGxlbWVudC4KKyAg ICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CisgICAgfSBlbHNlCisKKyAgICBlbmNvZGVyIDw8 IGZyYW1lU3RhdGUuaXRlbVNlcXVlbmNlTnVtYmVyOworCisgICAgZW5jb2RlciA8PCBmcmFtZVN0 YXRlLnJlZmVycmVyOworCisgICAgZW5jb2RlciA8PCBmcmFtZVN0YXRlLnNjcm9sbFBvaW50Lngo KTsKKyAgICBlbmNvZGVyIDw8IGZyYW1lU3RhdGUuc2Nyb2xsUG9pbnQueSgpOworCisgICAgZW5j b2RlciA8PCBmcmFtZVN0YXRlLnBhZ2VTY2FsZUZhY3RvcjsKKworICAgIGVuY29kZXIgPDwgISFm cmFtZVN0YXRlLnN0YXRlT2JqZWN0RGF0YTsKKyAgICBpZiAoZnJhbWVTdGF0ZS5zdGF0ZU9iamVj dERhdGEpIHsKKyAgICAgICAgLy8gRklYTUU6IEltcGxlbWVudC4KKyAgICAgICAgQVNTRVJUX05P VF9SRUFDSEVEKCk7CisgICAgfQorCisgICAgZW5jb2RlciA8PCBmcmFtZVN0YXRlLnRhcmdldDsK KworI2lmIFBMQVRGT1JNKElPUykKKyAgICAvLyBGSVhNRTogaU9TIHNob3VsZCBub3QgdXNlIHRo ZSBsZWdhY3kgc2Vzc2lvbiBzdGF0ZSBlbmNvZGVyLgorICAgIGVuY29kZXIgPDwgZnJhbWVTdGF0 ZS5leHBvc2VkQ29udGVudFJlY3Q7CisgICAgZW5jb2RlciA8PCBmcmFtZVN0YXRlLnVub2JzY3Vy ZWRDb250ZW50UmVjdDsKKyAgICBlbmNvZGVyIDw8IGZyYW1lU3RhdGUubWluaW11bUxheW91dFNp emVJblNjcm9sbFZpZXdDb29yZGluYXRlczsKKyAgICBlbmNvZGVyIDw8IGZyYW1lU3RhdGUuY29u dGVudFNpemU7CisgICAgZW5jb2RlciA8PCBmcmFtZVN0YXRlLnNjYWxlSXNJbml0aWFsOworI2Vu ZGlmCit9CisKK3N0YXRpYyBNYWxsb2NQdHI8dWludDhfdD4gZW5jb2RlTGVnYWN5U2Vzc2lvbkhp c3RvcnlFbnRyeURhdGEoY29uc3QgRnJhbWVTdGF0ZSYgZnJhbWVTdGF0ZSwgc2l6ZV90JiBidWZm ZXJTaXplKQoreworICAgIEhpc3RvcnlFbnRyeURhdGFFbmNvZGVyIGVuY29kZXI7CisKKyAgICBl bmNvZGVyIDw8IHNlc3Npb25IaXN0b3J5RW50cnlEYXRhVmVyc2lvbjsKKyAgICBlbmNvZGVGcmFt ZVN0YXRlTm9kZShlbmNvZGVyLCBmcmFtZVN0YXRlKTsKKworICAgIHJldHVybiBlbmNvZGVyLmZp bmlzaEVuY29kaW5nKGJ1ZmZlclNpemUpOworfQorCitSZWZQdHI8QVBJOjpEYXRhPiBlbmNvZGVM ZWdhY3lTZXNzaW9uSGlzdG9yeUVudHJ5RGF0YShjb25zdCBGcmFtZVN0YXRlJiBmcmFtZVN0YXRl KQoreworICAgIHNpemVfdCBidWZmZXJTaXplOworICAgIGF1dG8gYnVmZmVyID0gZW5jb2RlTGVn YWN5U2Vzc2lvbkhpc3RvcnlFbnRyeURhdGEoZnJhbWVTdGF0ZSwgYnVmZmVyU2l6ZSk7CisKKyAg ICByZXR1cm4gQVBJOjpEYXRhOjpjcmVhdGVXaXRob3V0Q29weWluZyhidWZmZXIubGVha1B0cigp LCBidWZmZXJTaXplLCBbXSAodW5zaWduZWQgY2hhciogYnVmZmVyLCBjb25zdCB2b2lkKiBjb250 ZXh0KSB7CisgICAgICAgIGZhc3RGcmVlKGJ1ZmZlcik7CisgICAgfSwgbnVsbHB0cik7Cit9CisK IGNsYXNzIEhpc3RvcnlFbnRyeURhdGFEZWNvZGVyIHsKIHB1YmxpYzoKICAgICBIaXN0b3J5RW50 cnlEYXRhRGVjb2Rlcihjb25zdCB1aW50OF90KiBidWZmZXIsIHNpemVfdCBidWZmZXJTaXplKQpA QCAtNDk2LDkgKzcyNSw5IEBAIHN0YXRpYyB2b2lkIGRlY29kZUJhY2tGb3J3YXJkVHJlZU5vZGUo SGlzdG9yeUVudHJ5RGF0YURlY29kZXImIGRlY29kZXIsIEZyYW1lU3RhCiAjZW5kaWYKIH0KIAot c3RhdGljIGJvb2wgZGVjb2RlU2Vzc2lvbkhpc3RvcnlFbnRyeURhdGEoQ0ZEYXRhUmVmIGhpc3Rv cnlFbnRyeURhdGEsIEZyYW1lU3RhdGUmIG1haW5GcmFtZVN0YXRlKQorc3RhdGljIGJvb2wgZGVj b2RlU2Vzc2lvbkhpc3RvcnlFbnRyeURhdGEoY29uc3QgdWludDhfdCogYnVmZmVyLCBzaXplX3Qg YnVmZmVyU2l6ZSwgRnJhbWVTdGF0ZSYgbWFpbkZyYW1lU3RhdGUpCiB7Ci0gICAgSGlzdG9yeUVu dHJ5RGF0YURlY29kZXIgZGVjb2RlciB7IENGRGF0YUdldEJ5dGVQdHIoaGlzdG9yeUVudHJ5RGF0 YSksIHN0YXRpY19jYXN0PHNpemVfdD4oQ0ZEYXRhR2V0TGVuZ3RoKGhpc3RvcnlFbnRyeURhdGEp KSB9OworICAgIEhpc3RvcnlFbnRyeURhdGFEZWNvZGVyIGRlY29kZXIgeyBidWZmZXIsIGJ1ZmZl clNpemUgfTsKIAogICAgIHVpbnQzMl90IHZlcnNpb247CiAgICAgZGVjb2RlciA+PiB2ZXJzaW9u OwpAQCAtNTExLDYgKzc0MCwxMSBAQCBzdGF0aWMgYm9vbCBkZWNvZGVTZXNzaW9uSGlzdG9yeUVu dHJ5RGF0YShDRkRhdGFSZWYgaGlzdG9yeUVudHJ5RGF0YSwgRnJhbWVTdGF0ZQogICAgIHJldHVy biBkZWNvZGVyLmZpbmlzaERlY29kaW5nKCk7CiB9CiAKK3N0YXRpYyBib29sIGRlY29kZVNlc3Np b25IaXN0b3J5RW50cnlEYXRhKENGRGF0YVJlZiBoaXN0b3J5RW50cnlEYXRhLCBGcmFtZVN0YXRl JiBtYWluRnJhbWVTdGF0ZSkKK3sKKyAgICByZXR1cm4gZGVjb2RlU2Vzc2lvbkhpc3RvcnlFbnRy eURhdGEoQ0ZEYXRhR2V0Qnl0ZVB0cihoaXN0b3J5RW50cnlEYXRhKSwgc3RhdGljX2Nhc3Q8c2l6 ZV90PihDRkRhdGFHZXRMZW5ndGgoaGlzdG9yeUVudHJ5RGF0YSkpLCBtYWluRnJhbWVTdGF0ZSk7 Cit9CisKIHN0YXRpYyBib29sIGRlY29kZVNlc3Npb25IaXN0b3J5RW50cnkoQ0ZEaWN0aW9uYXJ5 UmVmIGVudHJ5RGljdGlvbmFyeSwgUGFnZVN0YXRlJiBwYWdlU3RhdGUpCiB7CiAgICAgYXV0byB0 aXRsZSA9IGR5bmFtaWNfY2ZfY2FzdDxDRlN0cmluZ1JlZj4oQ0ZEaWN0aW9uYXJ5R2V0VmFsdWUo ZW50cnlEaWN0aW9uYXJ5LCBzZXNzaW9uSGlzdG9yeUVudHJ5VGl0bGVLZXkpKTsKQEAgLTY3Miw0 ICs5MDYsOSBAQCBib29sIGRlY29kZUxlZ2FjeVNlc3Npb25TdGF0ZShjb25zdCBBUEk6OkRhdGEm IGRhdGEsIFNlc3Npb25TdGF0ZSYgc2Vzc2lvblN0YXRlKQogICAgIHJldHVybiB0cnVlOwogfQog Citib29sIGRlY29kZUxlZ2FjeVNlc3Npb25IaXN0b3J5RW50cnlEYXRhKGNvbnN0IEFQSTo6RGF0 YSYgaGlzdG9yeUVudHJ5RGF0YSwgRnJhbWVTdGF0ZSYgbWFpbkZyYW1lU3RhdGUpCit7CisgICAg cmV0dXJuIGRlY29kZVNlc3Npb25IaXN0b3J5RW50cnlEYXRhKGhpc3RvcnlFbnRyeURhdGEuYnl0 ZXMoKSwgaGlzdG9yeUVudHJ5RGF0YS5zaXplKCksIG1haW5GcmFtZVN0YXRlKTsKK30KKwogfSAv LyBuYW1lc3BhY2UgV2ViS2l0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv bWFjL0xlZ2FjeVNlc3Npb25TdGF0ZUNvZGluZy5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L21hYy9MZWdhY3lTZXNzaW9uU3RhdGVDb2RpbmcuaAppbmRleCA3ZWQzYTM1NGYxZmU1MTkyYjQy N2I2ODA0MGZlN2IzY2M2MTQyMjU4Li42NWU0N2JhMWIzN2RlOGYyOTlkYzlkNzljNDYwZTJmMzAx ZTU3YjE5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL0xlZ2FjeVNl c3Npb25TdGF0ZUNvZGluZy5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvTGVn YWN5U2Vzc2lvblN0YXRlQ29kaW5nLmgKQEAgLTM0LDkgKzM0LDEzIEBAIGNsYXNzIERhdGE7CiAK IG5hbWVzcGFjZSBXZWJLaXQgewogCitzdHJ1Y3QgRnJhbWVTdGF0ZTsKIHN0cnVjdCBTZXNzaW9u U3RhdGU7CiAKK1JlZlB0cjxBUEk6OkRhdGE+IGVuY29kZUxlZ2FjeVNlc3Npb25IaXN0b3J5RW50 cnlEYXRhKGNvbnN0IEZyYW1lU3RhdGUmKTsKKwogYm9vbCBkZWNvZGVMZWdhY3lTZXNzaW9uU3Rh dGUoY29uc3QgQVBJOjpEYXRhJiwgU2Vzc2lvblN0YXRlJik7Citib29sIGRlY29kZUxlZ2FjeVNl c3Npb25IaXN0b3J5RW50cnlEYXRhKGNvbnN0IEFQSTo6RGF0YSYsIEZyYW1lU3RhdGUmKTsKIAog fSAvLyBuYW1lc3BhY2UgV2ViS2l0CiAK