134166 2014-06-21 16:00:14 -0700 Implement the rest of back forward tree decoding 2014-06-22 09:34:40 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca mitz oldest_to_newest 1017350 0 andersca 2014-06-21 16:00:14 -0700 Implement the rest of back forward tree decoding 1017351 1 233549 andersca 2014-06-21 16:00:42 -0700 Created attachment 233549 Patch 1017353 2 233549 mitz 2014-06-21 16:17:35 -0700 Comment on attachment 233549 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=233549&action=review > Source/WebKit2/UIProcess/mac/LegacySessionStateCoding.cpp:442 > + break; ? 1017354 3 233550 andersca 2014-06-21 16:23:27 -0700 Created attachment 233550 Patch 1017355 4 233550 sam 2014-06-21 16:27:01 -0700 Comment on attachment 233550 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=233550&action=review > Source/WebKit2/UIProcess/mac/LegacySessionStateCoding.cpp:445 > + decoder >> formDataElement.fileStart; > + if (formDataElement.fileStart < 0) > + return; Is formDataElement.fileStart < 0 ever ok? Should this mark the decoder as invalid? > Source/WebKit2/UIProcess/mac/LegacySessionStateCoding.cpp:490 > + bool dummy; > + decoder >> dummy; Can you add a comment for future versions of us about what this once was. 1017393 5 andersca 2014-06-22 09:34:40 -0700 Committed r170262: <http://trac.webkit.org/changeset/170262> 233549 2014-06-21 16:00:42 -0700 2014-06-21 16:23:25 -0700 Patch bug-134166-20140621160021.patch text/plain 4045 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTcwMjUzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggYWQxZDc3YTNkNTE0YWRj ZGQ1Y2VmYTcwNWJkM2NhNzZlMGNiYjdlYy4uZGVhNmRkODcxNWZlMmI0YzUxZjk1NzdiZGU4OTU3 MzI2MzNhM2FlMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDE4IEBACiAyMDE0LTA2LTIxICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKKyAgICAgICAgSW1wbGVtZW50IHRo ZSByZXN0IG9mIGJhY2sgZm9yd2FyZCB0cmVlIGRlY29kaW5nCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzQxNjYKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9tYWMvTGVnYWN5U2Vzc2lv blN0YXRlQ29kaW5nLmNwcDoKKyAgICAgICAgKFdlYktpdDo6SGlzdG9yeUVudHJ5RGF0YURlY29k ZXI6Om9wZXJhdG9yPj4pOgorICAgICAgICAoV2ViS2l0OjpkZWNvZGVGb3JtRGF0YUVsZW1lbnQp OgorICAgICAgICAoV2ViS2l0OjpkZWNvZGVGb3JtRGF0YSk6CisgICAgICAgIChXZWJLaXQ6OmRl Y29kZUJhY2tGb3J3YXJkVHJlZU5vZGUpOgorCisyMDE0LTA2LTIxICBBbmRlcnMgQ2FybHNzb24g IDxhbmRlcnNjYUBhcHBsZS5jb20+CisKICAgICAgICAgTWFrZSBpdCBwb3NzaWJsZSB0byBvdmVy cmlkZSBkZWJ1ZyBwcmVmZXJlbmNlcyBvbiBhIHBlci1pZGVudGlmaWVyIGJhc2lzIGFzIHdlbGwg YXMgZ2xvYmFsbHkKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTEzNDE2NAogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL0xl Z2FjeVNlc3Npb25TdGF0ZUNvZGluZy5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFj L0xlZ2FjeVNlc3Npb25TdGF0ZUNvZGluZy5jcHAKaW5kZXggOGUwNWZjYTM2N2Q1NWMwNmUyYzBj MzNmNTY2NGM0MzFmYmViYzgxNi4uMjcxMjRjZjdjOTUyNTM5YTRiYjVhZTkzYzFlNDVhZmU2MWE3 ZDVjNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9MZWdhY3lTZXNz aW9uU3RhdGVDb2RpbmcuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvTGVn YWN5U2Vzc2lvblN0YXRlQ29kaW5nLmNwcApAQCAtMjQxLDYgKzI0MSwxMSBAQCBwdWJsaWM6CiAg ICAgICAgIHJldHVybiBkZWNvZGVBcml0aG1ldGljVHlwZSh2YWx1ZSk7CiAgICAgfQogCisgICAg SGlzdG9yeUVudHJ5RGF0YURlY29kZXImIG9wZXJhdG9yPj4oZG91YmxlJiB2YWx1ZSkKKyAgICB7 CisgICAgICAgIHJldHVybiBkZWNvZGVBcml0aG1ldGljVHlwZSh2YWx1ZSk7CisgICAgfQorCiAg ICAgSGlzdG9yeUVudHJ5RGF0YURlY29kZXImIG9wZXJhdG9yPj4oU3RyaW5nJiB2YWx1ZSkKICAg ICB7CiAgICAgICAgIHZhbHVlID0gU3RyaW5nKCk7CkBAIC00MjYsMTAgKzQzMSw0MSBAQCBzdGF0 aWMgdm9pZCBkZWNvZGVGb3JtRGF0YUVsZW1lbnQoSGlzdG9yeUVudHJ5RGF0YURlY29kZXImIGRl Y29kZXIsIEhUVFBCb2R5OjpFbAogICAgICAgICBkZWNvZGVyID4+IGZvcm1EYXRhRWxlbWVudC5k YXRhOwogICAgICAgICBicmVhazsKIAotICAgIGNhc2UgRm9ybURhdGFFbGVtZW50VHlwZTo6RW5j b2RlZEZpbGU6CisgICAgY2FzZSBGb3JtRGF0YUVsZW1lbnRUeXBlOjpFbmNvZGVkRmlsZTogewor ICAgICAgICBkZWNvZGVyID4+IGZvcm1EYXRhRWxlbWVudC5maWxlUGF0aDsKKworICAgICAgICBT dHJpbmcgZ2VuZXJhdGVkRmlsZW5hbWU7CisgICAgICAgIGRlY29kZXIgPj4gZ2VuZXJhdGVkRmls ZW5hbWU7CisKKyAgICAgICAgYm9vbCBzaG91bGRHZW5lcmF0ZUZpbGU7CisgICAgICAgIGRlY29k ZXIgPj4gc2hvdWxkR2VuZXJhdGVGaWxlOworICAgICAgICBicmVhazsKKworICAgICAgICBkZWNv ZGVyID4+IGZvcm1EYXRhRWxlbWVudC5maWxlU3RhcnQ7CisgICAgICAgIGlmIChmb3JtRGF0YUVs ZW1lbnQuZmlsZVN0YXJ0IDwgMCkKKyAgICAgICAgICAgIHJldHVybjsKKworICAgICAgICBpbnQ2 NF90IGZpbGVMZW5ndGg7CisgICAgICAgIGRlY29kZXIgPj4gZmlsZUxlbmd0aDsKKyAgICAgICAg aWYgKGZpbGVMZW5ndGggIT0gLTEpIHsKKyAgICAgICAgICAgIGlmIChmaWxlTGVuZ3RoIDwgZm9y bURhdGFFbGVtZW50LmZpbGVTdGFydCkKKyAgICAgICAgICAgICAgICByZXR1cm47CisKKyAgICAg ICAgICAgIGZvcm1EYXRhRWxlbWVudC5maWxlTGVuZ3RoID0gZmlsZUxlbmd0aDsKKyAgICAgICAg fQorCisKKyAgICAgICAgZG91YmxlIGV4cGVjdGVkRmlsZU1vZGlmaWNhdGlvblRpbWU7CisgICAg ICAgIGRlY29kZXIgPj4gZXhwZWN0ZWRGaWxlTW9kaWZpY2F0aW9uVGltZTsKKyAgICAgICAgaWYg KGV4cGVjdGVkRmlsZU1vZGlmaWNhdGlvblRpbWUgIT0gc3RkOjpudW1lcmljX2xpbWl0czxkb3Vi bGU+OjpxdWlldF9OYU4oKSkKKyAgICAgICAgICAgIGZvcm1EYXRhRWxlbWVudC5leHBlY3RlZEZp bGVNb2RpZmljYXRpb25UaW1lID0gZXhwZWN0ZWRGaWxlTW9kaWZpY2F0aW9uVGltZTsKKworICAg ICAgICBicmVhazsKKyAgICB9CisKICAgICBjYXNlIEZvcm1EYXRhRWxlbWVudFR5cGU6OkVuY29k ZWRCbG9iOgotICAgICAgICAvLyBGSVhNRTogSW1wbGVtZW50LgotICAgICAgICBBU1NFUlRfTk9U X1JFQUNIRUQoKTsKKyAgICAgICAgZGVjb2RlciA+PiBmb3JtRGF0YUVsZW1lbnQuYmxvYlVSTFN0 cmluZzsKKyAgICAgICAgYnJlYWs7CiAgICAgfQogfQogCkBAIC00NTAsNiArNDg2LDEyIEBAIHN0 YXRpYyB2b2lkIGRlY29kZUZvcm1EYXRhKEhpc3RvcnlFbnRyeURhdGFEZWNvZGVyJiBkZWNvZGVy LCBIVFRQQm9keSYgZm9ybURhdGEpCiAKICAgICAgICAgZm9ybURhdGEuZWxlbWVudHMuYXBwZW5k KHN0ZDo6bW92ZShmb3JtRGF0YUVsZW1lbnQpKTsKICAgICB9CisKKyAgICBib29sIGR1bW15Owor ICAgIGRlY29kZXIgPj4gZHVtbXk7CisKKyAgICBpbnQ2NF90IGlkZW50aWZpZXI7CisgICAgZGVj b2RlciA+PiBpZGVudGlmaWVyOwogfQogCiBzdGF0aWMgdm9pZCBkZWNvZGVCYWNrRm9yd2FyZFRy ZWVOb2RlKEhpc3RvcnlFbnRyeURhdGFEZWNvZGVyJiBkZWNvZGVyLCBGcmFtZVN0YXRlJiBmcmFt ZVN0YXRlKQpAQCAtNDcyLDggKzUxNCwxMCBAQCBzdGF0aWMgdm9pZCBkZWNvZGVCYWNrRm9yd2Fy ZFRyZWVOb2RlKEhpc3RvcnlFbnRyeURhdGFEZWNvZGVyJiBkZWNvZGVyLCBGcmFtZVN0YQogICAg IGRlY29kZXIgPj4gZG9jdW1lbnRTdGF0ZVZlY3RvclNpemU7CiAKICAgICBmb3IgKHVpbnQ2NF90 IGkgPSAwOyBpIDwgZG9jdW1lbnRTdGF0ZVZlY3RvclNpemU7ICsraSkgewotICAgICAgICAvLyBG SVhNRTogSW1wbGVtZW50LgotICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKKyAgICAgICAg U3RyaW5nIHN0YXRlOworICAgICAgICBkZWNvZGVyID4+IHN0YXRlOworCisgICAgICAgIGZyYW1l U3RhdGUuZG9jdW1lbnRTdGF0ZS5hcHBlbmQoc3RkOjptb3ZlKHN0YXRlKSk7CiAgICAgfQogCiAg ICAgU3RyaW5nIGZvcm1Db250ZW50VHlwZTsKQEAgLTUwOCwxMCArNTUyLDggQEAgc3RhdGljIHZv aWQgZGVjb2RlQmFja0ZvcndhcmRUcmVlTm9kZShIaXN0b3J5RW50cnlEYXRhRGVjb2RlciYgZGVj b2RlciwgRnJhbWVTdGEKICAgICBib29sIGhhc1N0YXRlT2JqZWN0OwogICAgIGRlY29kZXIgPj4g aGFzU3RhdGVPYmplY3Q7CiAKLSAgICBpZiAoaGFzU3RhdGVPYmplY3QpIHsKLSAgICAgICAgLy8g RklYTUU6IEltcGxlbWVudC4KLSAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7Ci0gICAgfQor ICAgIGlmIChoYXNTdGF0ZU9iamVjdCkKKyAgICAgICAgZGVjb2RlciA+PiBmcmFtZVN0YXRlLnN0 YXRlT2JqZWN0RGF0YTsKIAogICAgIGRlY29kZXIgPj4gZnJhbWVTdGF0ZS50YXJnZXQ7CiB9Cg== 233550 2014-06-21 16:23:27 -0700 2014-06-21 16:27:01 -0700 Patch bug-134166-20140621162306.patch text/plain 3934 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTcwMjU1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMWMzZDRhNTNjMmIyMjU3 YWExZTI1ZmE3MGI1Nzc0M2MxNWNmMWQ5Yi4uMjJlOWQxN2EwZTk3OGU0ZmFmZTI2YWNkNDFlYTk2 Yjk2Mjk5YWYyNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDE0LTA2LTIxICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAgSW1wbGVtZW50IHRo ZSByZXN0IG9mIGJhY2sgZm9yd2FyZCB0cmVlIGRlY29kaW5nCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzQxNjYKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9tYWMvTGVnYWN5U2Vzc2lv blN0YXRlQ29kaW5nLmNwcDoKKyAgICAgICAgKFdlYktpdDo6SGlzdG9yeUVudHJ5RGF0YURlY29k ZXI6Om9wZXJhdG9yPj4pOgorICAgICAgICAoV2ViS2l0OjpkZWNvZGVGb3JtRGF0YUVsZW1lbnQp OgorICAgICAgICAoV2ViS2l0OjpkZWNvZGVGb3JtRGF0YSk6CisgICAgICAgIChXZWJLaXQ6OmRl Y29kZUJhY2tGb3J3YXJkVHJlZU5vZGUpOgorCiAyMDE0LTA2LTIxICBEYW4gQmVybnN0ZWluICA8 bWl0ekBhcHBsZS5jb20+CiAKICAgICAgICAgQ2FsbGJhY2tNYXA6OnB1dCBzaG91bGQgYmUgYWJs ZSB0byB0YWtlIGFuIHVud3JhcHBlZCBmdW5jdGlvbgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL21hYy9MZWdhY3lTZXNzaW9uU3RhdGVDb2RpbmcuY3BwIGIvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL21hYy9MZWdhY3lTZXNzaW9uU3RhdGVDb2RpbmcuY3BwCmluZGV4IDhl MDVmY2EzNjdkNTVjMDZlMmMwYzMzZjU2NjRjNDMxZmJlYmM4MTYuLjI3NmY4M2QwODFhNDIyNzhh OGM1NjBmMWIyM2VhN2RmOWI4YjEwMjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9tYWMvTGVnYWN5U2Vzc2lvblN0YXRlQ29kaW5nLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvbWFjL0xlZ2FjeVNlc3Npb25TdGF0ZUNvZGluZy5jcHAKQEAgLTI0MSw2ICsy NDEsMTEgQEAgcHVibGljOgogICAgICAgICByZXR1cm4gZGVjb2RlQXJpdGhtZXRpY1R5cGUodmFs dWUpOwogICAgIH0KIAorICAgIEhpc3RvcnlFbnRyeURhdGFEZWNvZGVyJiBvcGVyYXRvcj4+KGRv dWJsZSYgdmFsdWUpCisgICAgeworICAgICAgICByZXR1cm4gZGVjb2RlQXJpdGhtZXRpY1R5cGUo dmFsdWUpOworICAgIH0KKwogICAgIEhpc3RvcnlFbnRyeURhdGFEZWNvZGVyJiBvcGVyYXRvcj4+ KFN0cmluZyYgdmFsdWUpCiAgICAgewogICAgICAgICB2YWx1ZSA9IFN0cmluZygpOwpAQCAtNDI2 LDEwICs0MzEsNDAgQEAgc3RhdGljIHZvaWQgZGVjb2RlRm9ybURhdGFFbGVtZW50KEhpc3RvcnlF bnRyeURhdGFEZWNvZGVyJiBkZWNvZGVyLCBIVFRQQm9keTo6RWwKICAgICAgICAgZGVjb2RlciA+ PiBmb3JtRGF0YUVsZW1lbnQuZGF0YTsKICAgICAgICAgYnJlYWs7CiAKLSAgICBjYXNlIEZvcm1E YXRhRWxlbWVudFR5cGU6OkVuY29kZWRGaWxlOgorICAgIGNhc2UgRm9ybURhdGFFbGVtZW50VHlw ZTo6RW5jb2RlZEZpbGU6IHsKKyAgICAgICAgZGVjb2RlciA+PiBmb3JtRGF0YUVsZW1lbnQuZmls ZVBhdGg7CisKKyAgICAgICAgU3RyaW5nIGdlbmVyYXRlZEZpbGVuYW1lOworICAgICAgICBkZWNv ZGVyID4+IGdlbmVyYXRlZEZpbGVuYW1lOworCisgICAgICAgIGJvb2wgc2hvdWxkR2VuZXJhdGVG aWxlOworICAgICAgICBkZWNvZGVyID4+IHNob3VsZEdlbmVyYXRlRmlsZTsKKworICAgICAgICBk ZWNvZGVyID4+IGZvcm1EYXRhRWxlbWVudC5maWxlU3RhcnQ7CisgICAgICAgIGlmIChmb3JtRGF0 YUVsZW1lbnQuZmlsZVN0YXJ0IDwgMCkKKyAgICAgICAgICAgIHJldHVybjsKKworICAgICAgICBp bnQ2NF90IGZpbGVMZW5ndGg7CisgICAgICAgIGRlY29kZXIgPj4gZmlsZUxlbmd0aDsKKyAgICAg ICAgaWYgKGZpbGVMZW5ndGggIT0gLTEpIHsKKyAgICAgICAgICAgIGlmIChmaWxlTGVuZ3RoIDwg Zm9ybURhdGFFbGVtZW50LmZpbGVTdGFydCkKKyAgICAgICAgICAgICAgICByZXR1cm47CisKKyAg ICAgICAgICAgIGZvcm1EYXRhRWxlbWVudC5maWxlTGVuZ3RoID0gZmlsZUxlbmd0aDsKKyAgICAg ICAgfQorCisKKyAgICAgICAgZG91YmxlIGV4cGVjdGVkRmlsZU1vZGlmaWNhdGlvblRpbWU7Cisg ICAgICAgIGRlY29kZXIgPj4gZXhwZWN0ZWRGaWxlTW9kaWZpY2F0aW9uVGltZTsKKyAgICAgICAg aWYgKGV4cGVjdGVkRmlsZU1vZGlmaWNhdGlvblRpbWUgIT0gc3RkOjpudW1lcmljX2xpbWl0czxk b3VibGU+OjpxdWlldF9OYU4oKSkKKyAgICAgICAgICAgIGZvcm1EYXRhRWxlbWVudC5leHBlY3Rl ZEZpbGVNb2RpZmljYXRpb25UaW1lID0gZXhwZWN0ZWRGaWxlTW9kaWZpY2F0aW9uVGltZTsKKwor ICAgICAgICBicmVhazsKKyAgICB9CisKICAgICBjYXNlIEZvcm1EYXRhRWxlbWVudFR5cGU6OkVu Y29kZWRCbG9iOgotICAgICAgICAvLyBGSVhNRTogSW1wbGVtZW50LgotICAgICAgICBBU1NFUlRf Tk9UX1JFQUNIRUQoKTsKKyAgICAgICAgZGVjb2RlciA+PiBmb3JtRGF0YUVsZW1lbnQuYmxvYlVS TFN0cmluZzsKKyAgICAgICAgYnJlYWs7CiAgICAgfQogfQogCkBAIC00NTAsNiArNDg1LDEyIEBA IHN0YXRpYyB2b2lkIGRlY29kZUZvcm1EYXRhKEhpc3RvcnlFbnRyeURhdGFEZWNvZGVyJiBkZWNv ZGVyLCBIVFRQQm9keSYgZm9ybURhdGEpCiAKICAgICAgICAgZm9ybURhdGEuZWxlbWVudHMuYXBw ZW5kKHN0ZDo6bW92ZShmb3JtRGF0YUVsZW1lbnQpKTsKICAgICB9CisKKyAgICBib29sIGR1bW15 OworICAgIGRlY29kZXIgPj4gZHVtbXk7CisKKyAgICBpbnQ2NF90IGlkZW50aWZpZXI7CisgICAg ZGVjb2RlciA+PiBpZGVudGlmaWVyOwogfQogCiBzdGF0aWMgdm9pZCBkZWNvZGVCYWNrRm9yd2Fy ZFRyZWVOb2RlKEhpc3RvcnlFbnRyeURhdGFEZWNvZGVyJiBkZWNvZGVyLCBGcmFtZVN0YXRlJiBm cmFtZVN0YXRlKQpAQCAtNDcyLDggKzUxMywxMCBAQCBzdGF0aWMgdm9pZCBkZWNvZGVCYWNrRm9y d2FyZFRyZWVOb2RlKEhpc3RvcnlFbnRyeURhdGFEZWNvZGVyJiBkZWNvZGVyLCBGcmFtZVN0YQog ICAgIGRlY29kZXIgPj4gZG9jdW1lbnRTdGF0ZVZlY3RvclNpemU7CiAKICAgICBmb3IgKHVpbnQ2 NF90IGkgPSAwOyBpIDwgZG9jdW1lbnRTdGF0ZVZlY3RvclNpemU7ICsraSkgewotICAgICAgICAv LyBGSVhNRTogSW1wbGVtZW50LgotICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKKyAgICAg ICAgU3RyaW5nIHN0YXRlOworICAgICAgICBkZWNvZGVyID4+IHN0YXRlOworCisgICAgICAgIGZy YW1lU3RhdGUuZG9jdW1lbnRTdGF0ZS5hcHBlbmQoc3RkOjptb3ZlKHN0YXRlKSk7CiAgICAgfQog CiAgICAgU3RyaW5nIGZvcm1Db250ZW50VHlwZTsKQEAgLTUwOCwxMCArNTUxLDggQEAgc3RhdGlj IHZvaWQgZGVjb2RlQmFja0ZvcndhcmRUcmVlTm9kZShIaXN0b3J5RW50cnlEYXRhRGVjb2RlciYg ZGVjb2RlciwgRnJhbWVTdGEKICAgICBib29sIGhhc1N0YXRlT2JqZWN0OwogICAgIGRlY29kZXIg Pj4gaGFzU3RhdGVPYmplY3Q7CiAKLSAgICBpZiAoaGFzU3RhdGVPYmplY3QpIHsKLSAgICAgICAg Ly8gRklYTUU6IEltcGxlbWVudC4KLSAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7Ci0gICAg fQorICAgIGlmIChoYXNTdGF0ZU9iamVjdCkKKyAgICAgICAgZGVjb2RlciA+PiBmcmFtZVN0YXRl LnN0YXRlT2JqZWN0RGF0YTsKIAogICAgIGRlY29kZXIgPj4gZnJhbWVTdGF0ZS50YXJnZXQ7CiB9 Cg==