41659 2010-07-06 00:21:39 -0700 Implement bookmarking for HTML5 Adoption Agency algorithm 2010-07-06 01:54:57 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 41123 1 eric eric abarth eric webkit.review.bot oldest_to_newest 246907 0 eric 2010-07-06 00:21:39 -0700 Implement bookmarking for HTML5 Adoption Agency algorithm 246909 1 60596 eric 2010-07-06 00:23:37 -0700 Created attachment 60596 Patch 246914 2 eric 2010-07-06 00:26:44 -0700 Attachment 60596 did not build on mac: Build output: http://webkit-commit-queue.appspot.com/results/3403276 246917 3 60596 abarth 2010-07-06 00:30:06 -0700 Comment on attachment 60596 Patch Your patch needs some work. :) 246928 4 60601 eric 2010-07-06 01:06:48 -0700 Created attachment 60601 Patch 246929 5 eric 2010-07-06 01:07:16 -0700 Yay for fixing 11 tests! 246931 6 60601 abarth 2010-07-06 01:10:28 -0700 Comment on attachment 60601 Patch Awesome test progression. :) WebCore/html/HTMLFormattingElementList.cpp:140 + // Bookmarks are not general purpose, only for Adoption Agency. This isn't really proper english... 246932 7 eric 2010-07-06 01:17:10 -0700 Committed r62537: <http://trac.webkit.org/changeset/62537> 246942 8 webkit.review.bot 2010-07-06 01:39:32 -0700 http://trac.webkit.org/changeset/62537 might have broken Qt Linux Release 246949 9 eric 2010-07-06 01:54:57 -0700 Committed r62539: <http://trac.webkit.org/changeset/62539> 60596 2010-07-06 00:23:37 -0700 2010-07-06 01:06:45 -0700 Patch bug-41659-20100706002335.patch text/plain 10306 eric ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBlNzkyYmNlOWEzNjkyZWJiMjNhNzQyM2EzZmY2M2RhMGI0NTk1N2U4Li4xMjc5ZDE0 MjM0NmVlODcyNWMxNjhmMzAxMGVlNGQzYjM5ZGRhMWUyIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAK KzIwMTAtMDctMDYgIEVyaWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEltcGxlbWVudCBib29rbWFya2lu ZyBmb3IgSFRNTDUgQWRvcHRpb24gQWdlbmN5IGFsZ29yaXRobQorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDE2NTkKKworICAgICAgICAqIGh0bWw1bGli L3J1bm5lci1leHBlY3RlZC1odG1sNS50eHQ6CisgICAgICAgICAtIEZpeGVzIHRlc3RzIQorCiAy MDEwLTA3LTA1ICBFcmljIFNlaWRlbCAgPGVyaWNAd2Via2l0Lm9yZz4KIAogICAgICAgICBSZXZp ZXdlZCBieSBBZGFtIEJhcnRoLgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaHRtbDVsaWIvcnVu bmVyLWV4cGVjdGVkLWh0bWw1LnR4dCBiL0xheW91dFRlc3RzL2h0bWw1bGliL3J1bm5lci1leHBl Y3RlZC1odG1sNS50eHQKaW5kZXggNDQ5ZjM4MWYyNjUwZGI2NTNmYWJhNmQ4NTFhYzU2Njg3ZDEw ZTVmNS4uMGEzYTJmMDk4N2UwNTY5MDM1YTlkYTE3ZGZjMDk0NTBlMTc2YjIyYSAxMDA2NDQKLS0t IGEvTGF5b3V0VGVzdHMvaHRtbDVsaWIvcnVubmVyLWV4cGVjdGVkLWh0bWw1LnR4dAorKysgYi9M YXlvdXRUZXN0cy9odG1sNWxpYi9ydW5uZXItZXhwZWN0ZWQtaHRtbDUudHh0CkBAIC0xNCw3ICsx NCw2IEBAIHJlc291cmNlcy90ZXN0czEuZGF0OgogMzIKIDMzCiA1MAotNTEKIDUzCiA1NgogNTgK QEAgLTMyNSwyNSArMzI0LDYgQEAgRXhwZWN0ZWQ6CiB8ICAgPGJvZHk+CiB8ICAgICAiLS0+ICBF T0YiCiAKLVRlc3QgNTEgb2YgMTEzIGluIHJlc291cmNlcy90ZXN0czEuZGF0IGZhaWxlZC4gSW5w dXQ6Ci08Yj48cD48L2I+VEVTVAotR290OgotfCA8aHRtbD4KLXwgICA8aGVhZD4KLXwgICA8Ym9k eT4KLXwgICAgIDxiPgotfCAgICAgPHA+Ci18ICAgICAgIDxiPgotfCAgICAgICAgICJURVNUIgot RXhwZWN0ZWQ6Ci18IDxodG1sPgotfCAgIDxoZWFkPgotfCAgIDxib2R5PgotfCAgICAgPGI+Ci18 ICAgICA8cD4KLXwgICAgICAgPGI+Ci18ICAgICAgICJURVNUIgotCiBUZXN0IDUzIG9mIDExMyBp biByZXNvdXJjZXMvdGVzdHMxLmRhdCBmYWlsZWQuIElucHV0OgogPGIgaWQ9YT48cD48YiBpZD1i PjwvcD48L2I+VEVTVAogR290OgpAQCAtNDU1LDcgKzQzNSw4IEBAIEdvdDoKIHwgICAgICAgICAg ICJCIgogfCAgICAgICA8ZGl2PgogfCAgICAgICAgIDxiPgotfCAgICAgICAgICAgIkNEIgorfCAg ICAgICAgICAgIkMiCit8ICAgICAgICAgIkQiCiBFeHBlY3RlZDoKIHwgPGh0bWw+CiB8ICAgPGhl YWQ+CkBAIC00OTQsNyArNDc1LDggQEAgR290OgogfCAgICAgICAgICAgICAgICAgPGk+CiB8ICAg ICAgICAgICAgICAgICAgIDxkaXY+CiB8ICAgICAgICAgICAgICAgICAgICAgPGI+Ci18ICAgICAg ICAgICAgICAgICAgICAgICAiWFRFU1QiCit8ICAgICAgICAgICAgICAgICAgICAgICAiWCIKK3wg ICAgICAgICAgICAgICAgICAgICAiVEVTVCIKIEV4cGVjdGVkOgogfCA8aHRtbD4KIHwgICA8aGVh ZD4KQEAgLTY2Myw3ICs2NDUsOCBAQCBHb3Q6CiB8ICAgICAgICAgPGk+CiB8ICAgICAgICAgICA8 cD4KIHwgICAgICAgICAgICAgPGI+Ci18ICAgICAgICAgICAgICAgIiBqa2wgIG1ubyIKK3wgICAg ICAgICAgICAgICAiIGprbCAiCit8ICAgICAgICAgICAgICIgbW5vIgogRXhwZWN0ZWQ6CiB8IDxo dG1sPgogfCAgIDxoZWFkPgpAQCAtNjk3LDcgKzY4MCw4IEBAIEdvdDoKIHwgICAgICAgICA8cD4K IHwgICAgICAgICAgIDxpPgogfCAgICAgICAgICAgICA8Yj4KLXwgICAgICAgICAgICAgICAiIGpr bCAgbW5vICIKK3wgICAgICAgICAgICAgICAiIGprbCAiCit8ICAgICAgICAgICAgICIgbW5vICIK IEV4cGVjdGVkOgogfCA8aHRtbD4KIHwgICA8aGVhZD4KQEAgLTczMiw3ICs3MTYsOSBAQCBHb3Q6 CiB8ICAgICAgICAgPHA+CiB8ICAgICAgICAgICA8aT4KIHwgICAgICAgICAgICAgPGI+Ci18ICAg ICAgICAgICAgICAgIiBqa2wgIG1ubyAgcHFyIgorfCAgICAgICAgICAgICAgICIgamtsICIKK3wg ICAgICAgICAgICAgIiBtbm8gIgorfCAgICAgICAgICAgIiBwcXIiCiBFeHBlY3RlZDoKIHwgPGh0 bWw+CiB8ICAgPGhlYWQ+CkBAIC03NjgsNyArNzU0LDkgQEAgR290OgogfCAgICAgICAgIDxwPgog fCAgICAgICAgICAgPGk+CiB8ICAgICAgICAgICAgIDxiPgotfCAgICAgICAgICAgICAgICIgamts ICBtbm8gIHBxciAiCit8ICAgICAgICAgICAgICAgIiBqa2wgIgorfCAgICAgICAgICAgICAiIG1u byAiCit8ICAgICAgICAgICAiIHBxciAiCiBFeHBlY3RlZDoKIHwgPGh0bWw+CiB8ICAgPGhlYWQ+ CkBAIC04MDQsNyArNzkyLDkgQEAgR290OgogfCAgICAgICAgIDxwPgogfCAgICAgICAgICAgPGk+ CiB8ICAgICAgICAgICAgIDxiPgotfCAgICAgICAgICAgICAgICIgamtsICBtbm8gIHBxciAiCit8 ICAgICAgICAgICAgICAgIiBqa2wgIgorfCAgICAgICAgICAgICAiIG1ubyAiCit8ICAgICAgICAg ICAiIHBxciAiCiB8ICAgICAgICAgIiBzdHUiCiBFeHBlY3RlZDoKIHwgPGh0bWw+CkBAIC0yNTc1 LDggKzI1NjUsNiBAQCByZXNvdXJjZXMvdGVzdHM4LmRhdDoKIDUKIDYKIDcKLTgKLTkKIAogVGVz dCAxIG9mIDkgaW4gcmVzb3VyY2VzL3Rlc3RzOC5kYXQgZmFpbGVkLiBJbnB1dDoKIDxkaXY+CkBA IC0yNzExLDQ5ICsyNjk5LDYgQEAgRXhwZWN0ZWQ6CiB8ICAgICA8dGFibGU+CiB8ICAgICAieCIK IHwgICAgIDx0YWJsZT4KLQotVGVzdCA4IG9mIDkgaW4gcmVzb3VyY2VzL3Rlc3RzOC5kYXQgZmFp bGVkLiBJbnB1dDoKLTxiPmE8ZGl2PjwvZGl2PjxkaXY+PC9iPnkKLUdvdDoKLXwgPGh0bWw+Ci18 ICAgPGhlYWQ+Ci18ICAgPGJvZHk+Ci18ICAgICA8Yj4KLXwgICAgICAgImEiCi18ICAgICAgIDxk aXY+Ci18ICAgICA8ZGl2PgotfCAgICAgICA8Yj4KLXwgICAgICAgICAieSIKLUV4cGVjdGVkOgot fCA8aHRtbD4KLXwgICA8aGVhZD4KLXwgICA8Ym9keT4KLXwgICAgIDxiPgotfCAgICAgICAiYSIK LXwgICAgICAgPGRpdj4KLXwgICAgIDxkaXY+Ci18ICAgICAgIDxiPgotfCAgICAgICAieSIKLQot VGVzdCA5IG9mIDkgaW4gcmVzb3VyY2VzL3Rlc3RzOC5kYXQgZmFpbGVkLiBJbnB1dDoKLTxhPjxk aXY+PHA+PC9hPgotR290OgotfCA8aHRtbD4KLXwgICA8aGVhZD4KLXwgICA8Ym9keT4KLXwgICAg IDxhPgotfCAgICAgPGRpdj4KLXwgICAgICAgPGE+Ci18ICAgICAgICAgPHA+Ci1FeHBlY3RlZDoK LXwgPGh0bWw+Ci18ICAgPGhlYWQ+Ci18ICAgPGJvZHk+Ci18ICAgICA8YT4KLXwgICAgIDxkaXY+ Ci18ICAgICAgIDxhPgotfCAgICAgICA8cD4KLXwgICAgICAgICA8YT4KIHJlc291cmNlcy90ZXN0 czkuZGF0OgogMQogMgpAQCAtNTExNSwzNCArNTA2MCwxMSBAQCByZXNvdXJjZXMvZW50aXRpZXMw Mi5kYXQ6IFBBU1MKIHJlc291cmNlcy9jb21tZW50czAxLmRhdDogUEFTUwogCiByZXNvdXJjZXMv YWRvcHRpb24wMS5kYXQ6Ci0yCiAzCiA0CiA1CiA2CiAKLVRlc3QgMiBvZiA2IGluIHJlc291cmNl cy9hZG9wdGlvbjAxLmRhdCBmYWlsZWQuIElucHV0OgotPGE+MTxwPjI8L2E+MzwvcD4KLUdvdDoK LXwgPGh0bWw+Ci18ICAgPGhlYWQ+Ci18ICAgPGJvZHk+Ci18ICAgICA8YT4KLXwgICAgICAgIjEi Ci18ICAgICA8cD4KLXwgICAgICAgPGE+Ci18ICAgICAgICAgIjIzIgotRXhwZWN0ZWQ6Ci18IDxo dG1sPgotfCAgIDxoZWFkPgotfCAgIDxib2R5PgotfCAgICAgPGE+Ci18ICAgICAgICIxIgotfCAg ICAgPHA+Ci18ICAgICAgIDxhPgotfCAgICAgICAgICIyIgotfCAgICAgICAiMyIKLQogVGVzdCAz IG9mIDYgaW4gcmVzb3VyY2VzL2Fkb3B0aW9uMDEuZGF0IGZhaWxlZC4gSW5wdXQ6CiA8YT4xPGJ1 dHRvbj4yPC9hPjM8L2J1dHRvbj4KIEdvdDoKQEAgLTUxOTgsOCArNTEyMCwxMCBAQCBHb3Q6CiB8 ICAgICA8ZGl2PgogfCAgICAgICA8YT4KIHwgICAgICAgICAiMiIKLXwgICAgICAgICA8ZGl2Pgot fCAgICAgICAgICAgIjM0IgorfCAgICAgICA8ZGl2PgorfCAgICAgICAgIDxhPgorfCAgICAgICAg ICAgIjMiCit8ICAgICAgICAgIjQiCiB8ICAgICAiNSIKIEV4cGVjdGVkOgogfCA8aHRtbD4KZGlm ZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggN2Ez ZDRiNDU4NDA1NmRiMDJlYjRiYWJhMWZjMzk0OGFiNGU3YzM0My4uODBkODAwODE3NjE2Mzg1M2U0 OTQ3MzBhNjYxMjBlOTQyMDExZWMzNCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysr IGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNCBAQAorMjAxMC0wNy0wNiAgRXJpYyBT ZWlkZWwgIDxlcmljQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgSW1wbGVtZW50IGJvb2ttYXJraW5nIGZvciBIVE1MNSBBZG9wdGlv biBBZ2VuY3kgYWxnb3JpdGhtCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD00MTY1OQorCisgICAgICAgIFdhcyBlYXNpZXIgdGhhbiBJIGV4cGVjdGVkIGl0 IHRvIGJlLgorICAgICAgICBGaXhlcyBhIGJ1bmNoIG9mIGh0bWw1bGliL3J1bm5lci5odG1sIHRl c3RzLgorCisgICAgICAgICogaHRtbC9IVE1MRm9ybWF0dGluZ0VsZW1lbnRMaXN0LmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OkhUTUxGb3JtYXR0aW5nRWxlbWVudExpc3Q6OmJvb2ttYXJrRm9yKToK KyAgICAgICAgKFdlYkNvcmU6OkhUTUxGb3JtYXR0aW5nRWxlbWVudExpc3Q6Omluc2VydEF0KToK KyAgICAgICAgKiBodG1sL0hUTUxGb3JtYXR0aW5nRWxlbWVudExpc3QuaDoKKyAgICAgICAgKFdl YkNvcmU6OkhUTUxGb3JtYXR0aW5nRWxlbWVudExpc3Q6OkJvb2ttYXJrOjpCb29rbWFyayk6Cisg ICAgICAgIChXZWJDb3JlOjpIVE1MRm9ybWF0dGluZ0VsZW1lbnRMaXN0OjpCb29rbWFyazo6bW92 ZVRvQWZ0ZXIpOgorICAgICAgICAoV2ViQ29yZTo6SFRNTEZvcm1hdHRpbmdFbGVtZW50TGlzdDo6 Qm9va21hcms6OmVsZW1lbnRCZWZvcmUpOgorICAgICAgICAoV2ViQ29yZTo6SFRNTEZvcm1hdHRp bmdFbGVtZW50TGlzdDo6Qm9va21hcms6OmVsZW1lbnRBZnRlcik6CisgICAgICAgICogaHRtbC9I VE1MVHJlZUJ1aWxkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SFRNTFRyZWVCdWlsZGVyOjpj YWxsVGhlQWRvcHRpb25BZ2VuY3kpOgorCiAyMDEwLTA3LTA1ICBFcmljIFNlaWRlbCAgPGVyaWNA d2Via2l0Lm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBBZGFtIEJhcnRoLgpkaWZmIC0tZ2l0 IGEvV2ViQ29yZS9odG1sL0hUTUxGb3JtYXR0aW5nRWxlbWVudExpc3QuY3BwIGIvV2ViQ29yZS9o dG1sL0hUTUxGb3JtYXR0aW5nRWxlbWVudExpc3QuY3BwCmluZGV4IDAxOTgyNjE4ZDQ2NjAyMjlm NmY3OTU0YTc3ZDE4YzAxMjdhZDQ2NjYuLjRhYWVlZjZkN2ZkMTE1ZjIyMDM1NTViNWM1ZWVmNWQy NjdmNTFkMGQgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaHRtbC9IVE1MRm9ybWF0dGluZ0VsZW1lbnRM aXN0LmNwcAorKysgYi9XZWJDb3JlL2h0bWwvSFRNTEZvcm1hdHRpbmdFbGVtZW50TGlzdC5jcHAK QEAgLTEwOSw2ICsxMDksNDIgQEAgSFRNTEZvcm1hdHRpbmdFbGVtZW50TGlzdDo6RW50cnkqIEhU TUxGb3JtYXR0aW5nRWxlbWVudExpc3Q6OmZpbmQoRWxlbWVudCogZWxlbWUKICAgICByZXR1cm4g MDsKIH0KIAorSFRNTEZvcm1hdHRpbmdFbGVtZW50TGlzdDo6Qm9va21hcmsgSFRNTEZvcm1hdHRp bmdFbGVtZW50TGlzdDo6Ym9va21hcmtGb3IoRWxlbWVudCogZWxlbWVudCkKK3sKKyAgICBzaXpl X3QgaW5kZXggPSBtX2VudHJpZXMuZmluZChlbGVtZW50KTsKKyAgICBBU1NFUlQoaW5kZXggIT0g bm90Rm91bmQpOworICAgIEVsZW1lbnQqIGVsZW1lbnRCZWZvcmUgPSAoaW5kZXggPiAxKSA/IG1f ZW50cmllc1tpbmRleCAtIDFdLmVsZW1lbnQoKSA6IDA7CisgICAgRWxlbWVudCogZWxlbWVudEFm dGVyID0gKGluZGV4IDwgbV9lbnRyaWVzLnNpemUoKSAtIDEpID8gbV9lbnRyaWVzW2luZGV4ICsg MV0uZWxlbWVudCgpIDogMDsKKyAgICByZXR1cm4gQm9va21hcmsoZWxlbWVudEJlZm9yZSwgZWxl bWVudEFmdGVyKTsKK30KKwordm9pZCBIVE1MRm9ybWF0dGluZ0VsZW1lbnRMaXN0OjppbnNlcnRB dChFbGVtZW50KiBlbGVtZW50LCBjb25zdCBCb29rbWFyayYgYm9va21hcmspCit7CisgICAgc2l6 ZV90IGJlZm9yZUluZGV4ID0gMDsKKyAgICBpZiAoYm9va21hcmsuZWxlbWVudEJlZm9yZSgpKSB7 CisgICAgICAgIG1fZW50cmllcy5maW5kKGJvb2ttYXJrLmVsZW1lbnRCZWZvcmUoKSk7CisgICAg ICAgIEFTU0VSVChiZWZvcmVJbmRleCAhPSBub3RGb3VuZCk7CisgICAgfQorICAgIHNpemVfdCBh ZnRlckluZGV4ID0gMDsKKyAgICBpZiAoYm9va21hcmsuZWxlbWVudEFmdGVyKCkpIHsKKyAgICAg ICAgbV9lbnRyaWVzLmZpbmQoYm9va21hcmsuZWxlbWVudEFmdGVyKCkpOworICAgICAgICBBU1NF UlQoYWZ0ZXJJbmRleCAhPSBub3RGb3VuZCk7CisgICAgfQorCisgICAgaWYgKCFib29rbWFyay5l bGVtZW50QmVmb3JlKCkpIHsKKyAgICAgICAgaWYgKGJvb2ttYXJrLmVsZW1lbnRBZnRlcigpKQor ICAgICAgICAgICAgQVNTRVJUKGFmdGVySW5kZXggPT0gMSk7CisgICAgICAgIG1fZW50cmllcy5w cmVwZW5kKGVsZW1lbnQpOworICAgIH0gZWxzZSB7CisgICAgICAgIGlmIChib29rbWFyay5lbGVt ZW50QWZ0ZXIoKSkgeworICAgICAgICAgICAgLy8gQm9va21hcmtzIGFyZSBub3QgZ2VuZXJhbCBw dXJwb3NlLCBvbmx5IGZvciBBZG9wdGlvbiBBZ2VuY3kuCisgICAgICAgICAgICAvLyBBc3N1bWUg dGhhdCB0aGUgYm9va21hcmtlZCBlbGVtZW50IHdhcyBhbHJlYWR5IHJlbW92ZWQuCisgICAgICAg ICAgICBBU1NFUlQoYmVmb3JlSW5kZXggKyAxID09IGFmdGVySW5kZXgpOworICAgICAgICB9Cisg ICAgICAgIG1fZW50cmllcy5pbnNlcnQoYmVmb3JlSW5kZXggKyAxLCBlbGVtZW50KTsKKyAgICB9 Cit9CisKIHZvaWQgSFRNTEZvcm1hdHRpbmdFbGVtZW50TGlzdDo6YXBwZW5kKEVsZW1lbnQqIGVs ZW1lbnQpCiB7CiAgICAgbV9lbnRyaWVzLmFwcGVuZChlbGVtZW50KTsKZGlmZiAtLWdpdCBhL1dl YkNvcmUvaHRtbC9IVE1MRm9ybWF0dGluZ0VsZW1lbnRMaXN0LmggYi9XZWJDb3JlL2h0bWwvSFRN TEZvcm1hdHRpbmdFbGVtZW50TGlzdC5oCmluZGV4IGRhMzBmNzViYjQ0YmJiMmY5ZjIyZGUxMjAz YTYxMmI0ZTBkMWRmNDkuLmE2M2NjZWExM2ZkNzlhYWZhNGU0MWRlODE1NDg0YmY3YTA5NzU3M2Qg MTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaHRtbC9IVE1MRm9ybWF0dGluZ0VsZW1lbnRMaXN0LmgKKysr IGIvV2ViQ29yZS9odG1sL0hUTUxGb3JtYXR0aW5nRWxlbWVudExpc3QuaApAQCAtNjQsNiArNjQs MjggQEAgcHVibGljOgogICAgICAgICBSZWZQdHI8RWxlbWVudD4gbV9lbGVtZW50OwogICAgIH07 CiAKKyAgICBjbGFzcyBCb29rbWFyayB7CisgICAgcHVibGljOgorICAgICAgICBCb29rbWFyayhF bGVtZW50KiBiZWZvcmUsIEVsZW1lbnQqIGFmdGVyKQorICAgICAgICAgICAgOiBtX2JlZm9yZShi ZWZvcmUpCisgICAgICAgICAgICAsIG1fYWZ0ZXIoYWZ0ZXIpCisgICAgICAgIHsKKyAgICAgICAg fQorCisgICAgICAgIHZvaWQgbW92ZVRvQWZ0ZXIoRWxlbWVudCogYmVmb3JlKQorICAgICAgICB7 CisgICAgICAgICAgICBtX2JlZm9yZSA9IGJlZm9yZTsKKyAgICAgICAgICAgIG1fYWZ0ZXIgPSAw OworICAgICAgICB9CisKKyAgICAgICAgRWxlbWVudCogZWxlbWVudEJlZm9yZSgpIGNvbnN0IHsg cmV0dXJuIG1fYmVmb3JlOyB9CisgICAgICAgIEVsZW1lbnQqIGVsZW1lbnRBZnRlcigpIGNvbnN0 IHsgcmV0dXJuIG1fYWZ0ZXI7IH0KKworICAgIHByaXZhdGU6CisgICAgICAgIEVsZW1lbnQqIG1f YmVmb3JlOworICAgICAgICBFbGVtZW50KiBtX2FmdGVyOworICAgIH07CisKICAgICBib29sIGlz RW1wdHkoKSBjb25zdCB7IHJldHVybiAhc2l6ZSgpOyB9CiAgICAgc2l6ZV90IHNpemUoKSBjb25z dCB7IHJldHVybiBtX2VudHJpZXMuc2l6ZSgpOyB9CiAKQEAgLTc0LDYgKzk2LDkgQEAgcHVibGlj OgogICAgIHZvaWQgYXBwZW5kKEVsZW1lbnQqKTsKICAgICB2b2lkIHJlbW92ZShFbGVtZW50Kik7 CiAKKyAgICBCb29rbWFyayBib29rbWFya0ZvcihFbGVtZW50Kik7CisgICAgdm9pZCBpbnNlcnRB dChFbGVtZW50KiwgY29uc3QgQm9va21hcmsmKTsKKwogICAgIHZvaWQgYXBwZW5kTWFya2VyKCk7 CiAgICAgdm9pZCBjbGVhclRvTGFzdE1hcmtlcigpOwogCmRpZmYgLS1naXQgYS9XZWJDb3JlL2h0 bWwvSFRNTFRyZWVCdWlsZGVyLmNwcCBiL1dlYkNvcmUvaHRtbC9IVE1MVHJlZUJ1aWxkZXIuY3Bw CmluZGV4IDVkYjFmN2JkY2FkZTNiYWRkOTYyZmM0NTY2OTUyNjAzNmQ0MzFmZWIuLjZhZTlmYTNm Y2JjNzllYmNmOTMyYTcyZGMwMDNjMTljMjA0OWQ4ZGUgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaHRt bC9IVE1MVHJlZUJ1aWxkZXIuY3BwCisrKyBiL1dlYkNvcmUvaHRtbC9IVE1MVHJlZUJ1aWxkZXIu Y3BwCkBAIC0xMTU0LDcgKzExNTQsNyBAQCB2b2lkIEhUTUxUcmVlQnVpbGRlcjo6Y2FsbFRoZUFk b3B0aW9uQWdlbmN5KEF0b21pY0hUTUxUb2tlbiYgdG9rZW4pCiAgICAgICAgIEFTU0VSVChmdXJ0 aGVzdEJsb2NrLT5pc0Fib3ZlKGZvcm1hdHRpbmdFbGVtZW50UmVjb3JkKSk7CiAgICAgICAgIEVs ZW1lbnQqIGNvbW1vbkFuY2VzdG9yID0gZm9ybWF0dGluZ0VsZW1lbnRSZWNvcmQtPm5leHQoKS0+ ZWxlbWVudCgpOwogICAgICAgICAvLyA1LgotICAgICAgICBub3RJbXBsZW1lbnRlZCgpOyAvLyBi b29rbWFyaz8KKyAgICAgICAgSFRNTEZvcm1hdHRpbmdFbGVtZW50TGlzdDo6Qm9va21hcmsgYm9v a21hcmsgPSBtX2FjdGl2ZUZvcm1hdHRpbmdFbGVtZW50cy5ib29rbWFya0Zvcihmb3JtYXR0aW5n RWxlbWVudCk7CiAgICAgICAgIC8vIDYuCiAgICAgICAgIEhUTUxFbGVtZW50U3RhY2s6OkVsZW1l bnRSZWNvcmQqIG5vZGUgPSBmdXJ0aGVzdEJsb2NrOwogICAgICAgICBIVE1MRWxlbWVudFN0YWNr OjpFbGVtZW50UmVjb3JkKiBuZXh0Tm9kZSA9IG5vZGUtPm5leHQoKTsKQEAgLTExNzUsNyArMTE3 NSw3IEBAIHZvaWQgSFRNTFRyZWVCdWlsZGVyOjpjYWxsVGhlQWRvcHRpb25BZ2VuY3koQXRvbWlj SFRNTFRva2VuJiB0b2tlbikKICAgICAgICAgICAgICAgICBicmVhazsKICAgICAgICAgICAgIC8v IDYuNAogICAgICAgICAgICAgaWYgKGxhc3ROb2RlID09IGZ1cnRoZXN0QmxvY2spCi0gICAgICAg ICAgICAgICAgbm90SW1wbGVtZW50ZWQoKTsgLy8gbW92ZSBib29rbWFyay4KKyAgICAgICAgICAg ICAgICBib29rbWFyay5tb3ZlVG9BZnRlcihub2RlLT5lbGVtZW50KCkpOwogICAgICAgICAgICAg Ly8gNi41CiAgICAgICAgICAgICAvLyBGSVhNRTogV2UncmUgc3VwcG9zZWQgdG8gc2F2ZSB0aGUg b3JpZ2luYWwgdG9rZW4gaW4gdGhlIGVudHJ5LgogICAgICAgICAgICAgQXRvbWljSFRNTFRva2Vu IGZha2VUb2tlbihIVE1MVG9rZW46OlN0YXJ0VGFnLCBub2RlLT5lbGVtZW50KCktPmxvY2FsTmFt ZSgpKTsKQEAgLTEyMTQsNyArMTIxNCw3IEBAIHZvaWQgSFRNTFRyZWVCdWlsZGVyOjpjYWxsVGhl QWRvcHRpb25BZ2VuY3koQXRvbWljSFRNTFRva2VuJiB0b2tlbikKICAgICAgICAgZnVydGhlc3RC bG9jay0+ZWxlbWVudCgpLT5wYXJzZXJBZGRDaGlsZChuZXdFbGVtZW50KTsKICAgICAgICAgLy8g MTEKICAgICAgICAgbV9hY3RpdmVGb3JtYXR0aW5nRWxlbWVudHMucmVtb3ZlKGZvcm1hdHRpbmdF bGVtZW50KTsKLSAgICAgICAgbm90SW1wbGVtZW50ZWQoKTsgLy8gaW5zZXJ0IG5ldyBlbGVtZW50 IGF0IGJvb2ttYXJrCisgICAgICAgIG1fYWN0aXZlRm9ybWF0dGluZ0VsZW1lbnRzLmluc2VydEF0 KG5ld0VsZW1lbnQuZ2V0KCksIGJvb2ttYXJrKTsKICAgICAgICAgLy8gMTIKICAgICAgICAgbV9v cGVuRWxlbWVudHMucmVtb3ZlKGZvcm1hdHRpbmdFbGVtZW50KTsKICAgICAgICAgbV9vcGVuRWxl bWVudHMuaW5zZXJ0QWJvdmUobmV3RWxlbWVudCwgZnVydGhlc3RCbG9jayk7Cg== 60601 2010-07-06 01:06:48 -0700 2010-07-06 01:10:28 -0700 Patch bug-41659-20100706010647.patch text/plain 16063 eric ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCAwNzU3MTBlYjExYmE2Y2JlZTAxYjUwMmI0MmNiMzYxNGEzNDUzMDE5Li5hYTU3ZDFh YzJiM2M2MzQyZWFjMjQ0MTNkOTJlMTRhZjFlM2QxM2UwIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAK KzIwMTAtMDctMDYgIEVyaWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEltcGxlbWVudCBib29rbWFya2lu ZyBmb3IgSFRNTDUgQWRvcHRpb24gQWdlbmN5IGFsZ29yaXRobQorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDE2NTkKKworICAgICAgICBBZGRlZCAzIG5l dyBhZG9wdGlvbiB0ZXN0cyBiZWNhdXNlIHRoZSBzdWl0ZSBkaWRuJ3QKKyAgICAgICAgY292ZXIg YWxsIHRoZSBib29rbWFya2luZyBjYXNlcy4KKworICAgICAgICAqIGh0bWw1bGliL3J1bm5lci1l eHBlY3RlZC1odG1sNS50eHQ6CisgICAgICAgICAtIEZpeGVzIHRlc3RzIQorICAgICAgICAqIGh0 bWw1bGliL3Jlc291cmNlcy9hZG9wdGlvbjAxLmRhdAorCiAyMDEwLTA3LTA2ICBOaWtvbGFzIFpp bW1lcm1hbm4gIDxuemltbWVybWFubkByaW0uY29tPgogCiAgICAgICAgIE5vdCByZXZpZXdlZC4g QWRkIG1pc3NpbmcgbGF5b3V0IHRlc3QgcmVzdWx0LgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMv aHRtbDVsaWIvcmVzb3VyY2VzL2Fkb3B0aW9uMDEuZGF0IGIvTGF5b3V0VGVzdHMvaHRtbDVsaWIv cmVzb3VyY2VzL2Fkb3B0aW9uMDEuZGF0CmluZGV4IDY3NGY3YWY3M2Q1Y2MwYmIxNTk4ZDgxNjli NmQyODkyMGY2ZTA5OWYuLmY4MGM0YzYyYjA1ZTJiNDNiNTM0MzVhZWVhNDc2NTNmOWIwZThlMTEg MTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2h0bWw1bGliL3Jlc291cmNlcy9hZG9wdGlvbjAxLmRh dAorKysgYi9MYXlvdXRUZXN0cy9odG1sNWxpYi9yZXNvdXJjZXMvYWRvcHRpb24wMS5kYXQKQEAg LTgyLDMgKzgyLDQ1IEBACiB8ICAgICAgICAgIjIiCiB8ICAgICAgICIzIgogfCAgICAgPHRhYmxl PgorCisjZGF0YQorPGI+PGI+PGE+PHA+PC9hPgorI2Vycm9ycworI2RvY3VtZW50Cit8IDxodG1s PgorfCAgIDxoZWFkPgorfCAgIDxib2R5PgorfCAgICAgPGI+Cit8ICAgICAgIDxiPgorfCAgICAg ICAgIDxhPgorfCAgICAgICAgIDxwPgorfCAgICAgICAgICAgPGE+CisKKyNkYXRhCis8Yj48YT48 Yj48cD48L2E+CisjZXJyb3JzCisjZG9jdW1lbnQKK3wgPGh0bWw+Cit8ICAgPGhlYWQ+Cit8ICAg PGJvZHk+Cit8ICAgICA8Yj4KK3wgICAgICAgPGE+Cit8ICAgICAgICAgPGI+Cit8ICAgICAgIDxi PgorfCAgICAgICAgIDxwPgorfCAgICAgICAgICAgPGE+CisKKyNkYXRhCis8YT48Yj48Yj48cD48 L2E+CisjZXJyb3JzCisjZG9jdW1lbnQKK3wgPGh0bWw+Cit8ICAgPGhlYWQ+Cit8ICAgPGJvZHk+ Cit8ICAgICA8YT4KK3wgICAgICAgPGI+Cit8ICAgICAgICAgPGI+Cit8ICAgICA8Yj4KK3wgICAg ICAgPGI+Cit8ICAgICAgICAgPHA+Cit8ICAgICAgICAgICA8YT4KZGlmZiAtLWdpdCBhL0xheW91 dFRlc3RzL2h0bWw1bGliL3J1bm5lci1leHBlY3RlZC1odG1sNS50eHQgYi9MYXlvdXRUZXN0cy9o dG1sNWxpYi9ydW5uZXItZXhwZWN0ZWQtaHRtbDUudHh0CmluZGV4IDg0N2M3NWVlZDYyOGNmYTky YjhjODkwMzNmOWVhY2QxZGRhYWVhNTYuLjVmNzY5OTQxYzZlYWUzZWU5N2ExN2E1NDk5NjAwNmY0 NjIxZThlN2MgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2h0bWw1bGliL3J1bm5lci1leHBlY3Rl ZC1odG1sNS50eHQKKysrIGIvTGF5b3V0VGVzdHMvaHRtbDVsaWIvcnVubmVyLWV4cGVjdGVkLWh0 bWw1LnR4dApAQCAtMTMsMTUgKzEzLDcgQEAgcmVzb3VyY2VzL3Rlc3RzMS5kYXQ6CiAzMgogMzMK IDUwCi01MQogNTYKLTYwCi02MQotNzIKLTczCi03NAotNzUKLTc2CiA3OAogNzkKIDgwCkBAIC0y OTgsMjUgKzI5MCw2IEBAIEV4cGVjdGVkOgogfCAgIDxib2R5PgogfCAgICAgIi0tPiAgRU9GIgog Ci1UZXN0IDUxIG9mIDExMyBpbiByZXNvdXJjZXMvdGVzdHMxLmRhdCBmYWlsZWQuIElucHV0Ogot PGI+PHA+PC9iPlRFU1QKLUdvdDoKLXwgPGh0bWw+Ci18ICAgPGhlYWQ+Ci18ICAgPGJvZHk+Ci18 ICAgICA8Yj4KLXwgICAgIDxwPgotfCAgICAgICA8Yj4KLXwgICAgICAgICAiVEVTVCIKLUV4cGVj dGVkOgotfCA8aHRtbD4KLXwgICA8aGVhZD4KLXwgICA8Ym9keT4KLXwgICAgIDxiPgotfCAgICAg PHA+Ci18ICAgICAgIDxiPgotfCAgICAgICAiVEVTVCIKLQogVGVzdCA1NiBvZiAxMTMgaW4gcmVz b3VyY2VzL3Rlc3RzMS5kYXQgZmFpbGVkLiBJbnB1dDoKIDxmb250PjxwPmhlbGxvPGI+Y3J1ZWw8 L2ZvbnQ+d29ybGQKIEdvdDoKQEAgLTMyOCw3ICszMDEsOCBAQCBHb3Q6CiB8ICAgICAgIDxmb250 PgogfCAgICAgICAgICJoZWxsbyIKIHwgICAgICAgICA8Yj4KLXwgICAgICAgICAgICJjcnVlbHdv cmxkIgorfCAgICAgICAgICAgImNydWVsIgorfCAgICAgICAid29ybGQiCiBFeHBlY3RlZDoKIHwg PGh0bWw+CiB8ICAgPGhlYWQ+CkBAIC0zNDIsMjQ1ICszMTYsNiBAQCBFeHBlY3RlZDoKIHwgICAg ICAgPGI+CiB8ICAgICAgICAgIndvcmxkIgogCi1UZXN0IDYwIG9mIDExMyBpbiByZXNvdXJjZXMv dGVzdHMxLmRhdCBmYWlsZWQuIElucHV0OgotPGI+QTxjaXRlPkI8ZGl2PkM8L2I+RAotR290Ogot fCA8aHRtbD4KLXwgICA8aGVhZD4KLXwgICA8Ym9keT4KLXwgICAgIDxiPgotfCAgICAgICAiQSIK LXwgICAgICAgPGNpdGU+Ci18ICAgICAgICAgIkIiCi18ICAgICA8ZGl2PgotfCAgICAgICA8Yj4K LXwgICAgICAgICAiQ0QiCi1FeHBlY3RlZDoKLXwgPGh0bWw+Ci18ICAgPGhlYWQ+Ci18ICAgPGJv ZHk+Ci18ICAgICA8Yj4KLXwgICAgICAgIkEiCi18ICAgICAgIDxjaXRlPgotfCAgICAgICAgICJC IgotfCAgICAgPGRpdj4KLXwgICAgICAgPGI+Ci18ICAgICAgICAgIkMiCi18ICAgICAgICJEIgot Ci1UZXN0IDYxIG9mIDExMyBpbiByZXNvdXJjZXMvdGVzdHMxLmRhdCBmYWlsZWQuIElucHV0Ogot PGNpdGU+PGI+PGNpdGU+PGk+PGNpdGU+PGk+PGNpdGU+PGk+PGRpdj5YPC9iPlRFU1QKLUdvdDoK LXwgPGh0bWw+Ci18ICAgPGhlYWQ+Ci18ICAgPGJvZHk+Ci18ICAgICA8Y2l0ZT4KLXwgICAgICAg PGI+Ci18ICAgICAgICAgPGNpdGU+Ci18ICAgICAgICAgICA8aT4KLXwgICAgICAgICAgICAgPGNp dGU+Ci18ICAgICAgICAgICAgICAgPGk+Ci18ICAgICAgICAgICAgICAgICA8Y2l0ZT4KLXwgICAg ICAgICAgICAgICAgICAgPGk+Ci18ICAgICAgIDxpPgotfCAgICAgICAgIDxpPgotfCAgICAgICAg ICAgPGk+Ci18ICAgICAgICAgICAgIDxkaXY+Ci18ICAgICAgICAgICAgICAgPGI+Ci18ICAgICAg ICAgICAgICAgICAiWFRFU1QiCi1FeHBlY3RlZDoKLXwgPGh0bWw+Ci18ICAgPGhlYWQ+Ci18ICAg PGJvZHk+Ci18ICAgICA8Y2l0ZT4KLXwgICAgICAgPGI+Ci18ICAgICAgICAgPGNpdGU+Ci18ICAg ICAgICAgICA8aT4KLXwgICAgICAgICAgICAgPGNpdGU+Ci18ICAgICAgICAgICAgICAgPGk+Ci18 ICAgICAgICAgICAgICAgICA8Y2l0ZT4KLXwgICAgICAgICAgICAgICAgICAgPGk+Ci18ICAgICAg IDxpPgotfCAgICAgICAgIDxpPgotfCAgICAgICAgICAgPGk+Ci18ICAgICAgICAgICAgIDxkaXY+ Ci18ICAgICAgICAgICAgICAgPGI+Ci18ICAgICAgICAgICAgICAgICAiWCIKLXwgICAgICAgICAg ICAgICAiVEVTVCIKLQotVGVzdCA3MiBvZiAxMTMgaW4gcmVzb3VyY2VzL3Rlc3RzMS5kYXQgZmFp bGVkLiBJbnB1dDoKLTxESVY+IGFiYyA8Qj4gZGVmIDxJPiBnaGkgPFA+IGprbCA8L0I+IG1ubwot R290OgotfCA8aHRtbD4KLXwgICA8aGVhZD4KLXwgICA8Ym9keT4KLXwgICAgIDxkaXY+Ci18ICAg ICAgICIgYWJjICIKLXwgICAgICAgPGI+Ci18ICAgICAgICAgIiBkZWYgIgotfCAgICAgICAgIDxp PgotfCAgICAgICAgICAgIiBnaGkgIgotfCAgICAgICA8aT4KLXwgICAgICAgICA8cD4KLXwgICAg ICAgICAgIDxiPgotfCAgICAgICAgICAgICAiIGprbCAgbW5vIgotRXhwZWN0ZWQ6Ci18IDxodG1s PgotfCAgIDxoZWFkPgotfCAgIDxib2R5PgotfCAgICAgPGRpdj4KLXwgICAgICAgIiBhYmMgIgot fCAgICAgICA8Yj4KLXwgICAgICAgICAiIGRlZiAiCi18ICAgICAgICAgPGk+Ci18ICAgICAgICAg ICAiIGdoaSAiCi18ICAgICAgIDxpPgotfCAgICAgICAgIDxwPgotfCAgICAgICAgICAgPGI+Ci18 ICAgICAgICAgICAgICIgamtsICIKLXwgICAgICAgICAgICIgbW5vIgotCi1UZXN0IDczIG9mIDEx MyBpbiByZXNvdXJjZXMvdGVzdHMxLmRhdCBmYWlsZWQuIElucHV0OgotPERJVj4gYWJjIDxCPiBk ZWYgPEk+IGdoaSA8UD4gamtsIDwvQj4gbW5vIDwvST4KLUdvdDoKLXwgPGh0bWw+Ci18ICAgPGhl YWQ+Ci18ICAgPGJvZHk+Ci18ICAgICA8ZGl2PgotfCAgICAgICAiIGFiYyAiCi18ICAgICAgIDxi PgotfCAgICAgICAgICIgZGVmICIKLXwgICAgICAgICA8aT4KLXwgICAgICAgICAgICIgZ2hpICIK LXwgICAgICAgPGk+Ci18ICAgICAgIDxwPgotfCAgICAgICAgIDxpPgotfCAgICAgICAgICAgPGI+ Ci18ICAgICAgICAgICAgICIgamtsICBtbm8gIgotRXhwZWN0ZWQ6Ci18IDxodG1sPgotfCAgIDxo ZWFkPgotfCAgIDxib2R5PgotfCAgICAgPGRpdj4KLXwgICAgICAgIiBhYmMgIgotfCAgICAgICA8 Yj4KLXwgICAgICAgICAiIGRlZiAiCi18ICAgICAgICAgPGk+Ci18ICAgICAgICAgICAiIGdoaSAi Ci18ICAgICAgIDxpPgotfCAgICAgICA8cD4KLXwgICAgICAgICA8aT4KLXwgICAgICAgICAgIDxi PgotfCAgICAgICAgICAgICAiIGprbCAiCi18ICAgICAgICAgICAiIG1ubyAiCi0KLVRlc3QgNzQg b2YgMTEzIGluIHJlc291cmNlcy90ZXN0czEuZGF0IGZhaWxlZC4gSW5wdXQ6Ci08RElWPiBhYmMg PEI+IGRlZiA8ST4gZ2hpIDxQPiBqa2wgPC9CPiBtbm8gPC9JPiBwcXIKLUdvdDoKLXwgPGh0bWw+ Ci18ICAgPGhlYWQ+Ci18ICAgPGJvZHk+Ci18ICAgICA8ZGl2PgotfCAgICAgICAiIGFiYyAiCi18 ICAgICAgIDxiPgotfCAgICAgICAgICIgZGVmICIKLXwgICAgICAgICA8aT4KLXwgICAgICAgICAg ICIgZ2hpICIKLXwgICAgICAgPGk+Ci18ICAgICAgIDxwPgotfCAgICAgICAgIDxpPgotfCAgICAg ICAgICAgPGI+Ci18ICAgICAgICAgICAgICIgamtsICBtbm8gIHBxciIKLUV4cGVjdGVkOgotfCA8 aHRtbD4KLXwgICA8aGVhZD4KLXwgICA8Ym9keT4KLXwgICAgIDxkaXY+Ci18ICAgICAgICIgYWJj ICIKLXwgICAgICAgPGI+Ci18ICAgICAgICAgIiBkZWYgIgotfCAgICAgICAgIDxpPgotfCAgICAg ICAgICAgIiBnaGkgIgotfCAgICAgICA8aT4KLXwgICAgICAgPHA+Ci18ICAgICAgICAgPGk+Ci18 ICAgICAgICAgICA8Yj4KLXwgICAgICAgICAgICAgIiBqa2wgIgotfCAgICAgICAgICAgIiBtbm8g IgotfCAgICAgICAgICIgcHFyIgotCi1UZXN0IDc1IG9mIDExMyBpbiByZXNvdXJjZXMvdGVzdHMx LmRhdCBmYWlsZWQuIElucHV0OgotPERJVj4gYWJjIDxCPiBkZWYgPEk+IGdoaSA8UD4gamtsIDwv Qj4gbW5vIDwvST4gcHFyIDwvUD4KLUdvdDoKLXwgPGh0bWw+Ci18ICAgPGhlYWQ+Ci18ICAgPGJv ZHk+Ci18ICAgICA8ZGl2PgotfCAgICAgICAiIGFiYyAiCi18ICAgICAgIDxiPgotfCAgICAgICAg ICIgZGVmICIKLXwgICAgICAgICA8aT4KLXwgICAgICAgICAgICIgZ2hpICIKLXwgICAgICAgPGk+ Ci18ICAgICAgIDxwPgotfCAgICAgICAgIDxpPgotfCAgICAgICAgICAgPGI+Ci18ICAgICAgICAg ICAgICIgamtsICBtbm8gIHBxciAiCi1FeHBlY3RlZDoKLXwgPGh0bWw+Ci18ICAgPGhlYWQ+Ci18 ICAgPGJvZHk+Ci18ICAgICA8ZGl2PgotfCAgICAgICAiIGFiYyAiCi18ICAgICAgIDxiPgotfCAg ICAgICAgICIgZGVmICIKLXwgICAgICAgICA8aT4KLXwgICAgICAgICAgICIgZ2hpICIKLXwgICAg ICAgPGk+Ci18ICAgICAgIDxwPgotfCAgICAgICAgIDxpPgotfCAgICAgICAgICAgPGI+Ci18ICAg ICAgICAgICAgICIgamtsICIKLXwgICAgICAgICAgICIgbW5vICIKLXwgICAgICAgICAiIHBxciAi Ci0KLVRlc3QgNzYgb2YgMTEzIGluIHJlc291cmNlcy90ZXN0czEuZGF0IGZhaWxlZC4gSW5wdXQ6 Ci08RElWPiBhYmMgPEI+IGRlZiA8ST4gZ2hpIDxQPiBqa2wgPC9CPiBtbm8gPC9JPiBwcXIgPC9Q PiBzdHUKLUdvdDoKLXwgPGh0bWw+Ci18ICAgPGhlYWQ+Ci18ICAgPGJvZHk+Ci18ICAgICA8ZGl2 PgotfCAgICAgICAiIGFiYyAiCi18ICAgICAgIDxiPgotfCAgICAgICAgICIgZGVmICIKLXwgICAg ICAgICA8aT4KLXwgICAgICAgICAgICIgZ2hpICIKLXwgICAgICAgPGk+Ci18ICAgICAgIDxwPgot fCAgICAgICAgIDxpPgotfCAgICAgICAgICAgPGI+Ci18ICAgICAgICAgICAgICIgamtsICBtbm8g IHBxciAiCi18ICAgICAgICIgc3R1IgotRXhwZWN0ZWQ6Ci18IDxodG1sPgotfCAgIDxoZWFkPgot fCAgIDxib2R5PgotfCAgICAgPGRpdj4KLXwgICAgICAgIiBhYmMgIgotfCAgICAgICA8Yj4KLXwg ICAgICAgICAiIGRlZiAiCi18ICAgICAgICAgPGk+Ci18ICAgICAgICAgICAiIGdoaSAiCi18ICAg ICAgIDxpPgotfCAgICAgICA8cD4KLXwgICAgICAgICA8aT4KLXwgICAgICAgICAgIDxiPgotfCAg ICAgICAgICAgICAiIGprbCAiCi18ICAgICAgICAgICAiIG1ubyAiCi18ICAgICAgICAgIiBwcXIg IgotfCAgICAgICAiIHN0dSIKLQogVGVzdCA3OCBvZiAxMTMgaW4gcmVzb3VyY2VzL3Rlc3RzMS5k YXQgZmFpbGVkLiBJbnB1dDoKIDxhIGhyZWY9ImJsYWgiPmFiYTx0YWJsZT48YSBocmVmPSJmb28i PmJyPHRyPjx0ZD48L3RkPjwvdHI+eDwvdGFibGU+YW9lCiBHb3Q6CkBAIC0yMTYxLDggKzE4OTYs NiBAQCByZXNvdXJjZXMvdGVzdHM4LmRhdDoKIDUKIDYKIDcKLTgKLTkKIAogVGVzdCAxIG9mIDkg aW4gcmVzb3VyY2VzL3Rlc3RzOC5kYXQgZmFpbGVkLiBJbnB1dDoKIDxkaXY+CkBAIC0yMzAzLDQ5 ICsyMDM2LDYgQEAgRXhwZWN0ZWQ6CiB8ICAgICA8dGFibGU+CiB8ICAgICAieCIKIHwgICAgIDx0 YWJsZT4KLQotVGVzdCA4IG9mIDkgaW4gcmVzb3VyY2VzL3Rlc3RzOC5kYXQgZmFpbGVkLiBJbnB1 dDoKLTxiPmE8ZGl2PjwvZGl2PjxkaXY+PC9iPnkKLUdvdDoKLXwgPGh0bWw+Ci18ICAgPGhlYWQ+ Ci18ICAgPGJvZHk+Ci18ICAgICA8Yj4KLXwgICAgICAgImEiCi18ICAgICAgIDxkaXY+Ci18ICAg ICA8ZGl2PgotfCAgICAgICA8Yj4KLXwgICAgICAgICAieSIKLUV4cGVjdGVkOgotfCA8aHRtbD4K LXwgICA8aGVhZD4KLXwgICA8Ym9keT4KLXwgICAgIDxiPgotfCAgICAgICAiYSIKLXwgICAgICAg PGRpdj4KLXwgICAgIDxkaXY+Ci18ICAgICAgIDxiPgotfCAgICAgICAieSIKLQotVGVzdCA5IG9m IDkgaW4gcmVzb3VyY2VzL3Rlc3RzOC5kYXQgZmFpbGVkLiBJbnB1dDoKLTxhPjxkaXY+PHA+PC9h PgotR290OgotfCA8aHRtbD4KLXwgICA8aGVhZD4KLXwgICA8Ym9keT4KLXwgICAgIDxhPgotfCAg ICAgPGRpdj4KLXwgICAgICAgPGE+Ci18ICAgICAgICAgPHA+Ci1FeHBlY3RlZDoKLXwgPGh0bWw+ Ci18ICAgPGhlYWQ+Ci18ICAgPGJvZHk+Ci18ICAgICA8YT4KLXwgICAgIDxkaXY+Ci18ICAgICAg IDxhPgotfCAgICAgICA8cD4KLXwgICAgICAgICA8YT4KIHJlc291cmNlcy90ZXN0czkuZGF0Ogog MQogMgpAQCAtNDc0NCwzNSArNDQzNCwxMiBAQCByZXNvdXJjZXMvZW50aXRpZXMwMi5kYXQ6IFBB U1MKIHJlc291cmNlcy9jb21tZW50czAxLmRhdDogUEFTUwogCiByZXNvdXJjZXMvYWRvcHRpb24w MS5kYXQ6Ci0yCiAzCiA0CiA1CiA2CiAKLVRlc3QgMiBvZiA2IGluIHJlc291cmNlcy9hZG9wdGlv bjAxLmRhdCBmYWlsZWQuIElucHV0OgotPGE+MTxwPjI8L2E+MzwvcD4KLUdvdDoKLXwgPGh0bWw+ Ci18ICAgPGhlYWQ+Ci18ICAgPGJvZHk+Ci18ICAgICA8YT4KLXwgICAgICAgIjEiCi18ICAgICA8 cD4KLXwgICAgICAgPGE+Ci18ICAgICAgICAgIjIzIgotRXhwZWN0ZWQ6Ci18IDxodG1sPgotfCAg IDxoZWFkPgotfCAgIDxib2R5PgotfCAgICAgPGE+Ci18ICAgICAgICIxIgotfCAgICAgPHA+Ci18 ICAgICAgIDxhPgotfCAgICAgICAgICIyIgotfCAgICAgICAiMyIKLQotVGVzdCAzIG9mIDYgaW4g cmVzb3VyY2VzL2Fkb3B0aW9uMDEuZGF0IGZhaWxlZC4gSW5wdXQ6CitUZXN0IDMgb2YgOSBpbiBy ZXNvdXJjZXMvYWRvcHRpb24wMS5kYXQgZmFpbGVkLiBJbnB1dDoKIDxhPjE8YnV0dG9uPjI8L2E+ MzwvYnV0dG9uPgogR290OgogfCA8aHRtbD4KQEAgLTQ3OTIsNyArNDQ1OSw3IEBAIEV4cGVjdGVk OgogfCAgICAgICAgICIyIgogfCAgICAgIjMiCiAKLVRlc3QgNCBvZiA2IGluIHJlc291cmNlcy9h ZG9wdGlvbjAxLmRhdCBmYWlsZWQuIElucHV0OgorVGVzdCA0IG9mIDkgaW4gcmVzb3VyY2VzL2Fk b3B0aW9uMDEuZGF0IGZhaWxlZC4gSW5wdXQ6CiA8YT4xPGI+MjwvYT4zPC9iPgogR290OgogfCA8 aHRtbD4KQEAgLTQ4MTQsNyArNDQ4MSw3IEBAIEV4cGVjdGVkOgogfCAgICAgPGI+CiB8ICAgICAg ICIzIgogCi1UZXN0IDUgb2YgNiBpbiByZXNvdXJjZXMvYWRvcHRpb24wMS5kYXQgZmFpbGVkLiBJ bnB1dDoKK1Rlc3QgNSBvZiA5IGluIHJlc291cmNlcy9hZG9wdGlvbjAxLmRhdCBmYWlsZWQuIElu cHV0OgogPGE+MTxkaXY+MjxkaXY+MzwvYT40PC9kaXY+NTwvZGl2PgogR290OgogfCA8aHRtbD4K QEAgLTQ4MjUsOCArNDQ5MiwxMCBAQCBHb3Q6CiB8ICAgICA8ZGl2PgogfCAgICAgICA8YT4KIHwg ICAgICAgICAiMiIKLXwgICAgICAgICA8ZGl2PgotfCAgICAgICAgICAgIjM0IgorfCAgICAgICA8 ZGl2PgorfCAgICAgICAgIDxhPgorfCAgICAgICAgICAgIjMiCit8ICAgICAgICAgIjQiCiB8ICAg ICAiNSIKIEV4cGVjdGVkOgogfCA8aHRtbD4KQEAgLTQ4NDMsNyArNDUxMiw3IEBAIEV4cGVjdGVk OgogfCAgICAgICAgICI0IgogfCAgICAgICAiNSIKIAotVGVzdCA2IG9mIDYgaW4gcmVzb3VyY2Vz L2Fkb3B0aW9uMDEuZGF0IGZhaWxlZC4gSW5wdXQ6CitUZXN0IDYgb2YgOSBpbiByZXNvdXJjZXMv YWRvcHRpb24wMS5kYXQgZmFpbGVkLiBJbnB1dDoKIDx0YWJsZT48YT4xPHA+MjwvYT4zPC9wPgog R290OgogfCA8aHRtbD4KQEAgLTQ4NTEsNyArNDUyMCw4IEBAIEdvdDoKIHwgICA8Ym9keT4KIHwg ICAgIDxwPgogfCAgICAgICA8YT4KLXwgICAgICAgICAiMjMiCit8ICAgICAgICAgIjIiCit8ICAg ICAgICIzIgogfCAgICAgPHRhYmxlPgogfCAgICAgICA8YT4KIHwgICAgICAgICAiMSIKZGlmZiAt LWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzRmMTQz NjlkZjE2ZTU4ZTY3OWE5MDFmNjNjMGZiZTFiZDUxYTdmNy4uYzIwYjk2MDVjMjZhY2RmMmQxZWRi ZTVjNWQ4NTgyMzZiNjMwZDhmMSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIv V2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNCBAQAorMjAxMC0wNy0wNiAgRXJpYyBTZWlk ZWwgIDxlcmljQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgSW1wbGVtZW50IGJvb2ttYXJraW5nIGZvciBIVE1MNSBBZG9wdGlvbiBB Z2VuY3kgYWxnb3JpdGhtCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD00MTY1OQorCisgICAgICAgIFdhcyBlYXNpZXIgdGhhbiBJIGV4cGVjdGVkIGl0IHRv IGJlLgorICAgICAgICBGaXhlcyBhIGJ1bmNoIG9mIGh0bWw1bGliL3J1bm5lci5odG1sIHRlc3Rz LgorCisgICAgICAgICogaHRtbC9IVE1MRm9ybWF0dGluZ0VsZW1lbnRMaXN0LmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OkhUTUxGb3JtYXR0aW5nRWxlbWVudExpc3Q6OmJvb2ttYXJrRm9yKToKKyAg ICAgICAgKFdlYkNvcmU6OkhUTUxGb3JtYXR0aW5nRWxlbWVudExpc3Q6Omluc2VydEF0KToKKyAg ICAgICAgKiBodG1sL0hUTUxGb3JtYXR0aW5nRWxlbWVudExpc3QuaDoKKyAgICAgICAgKFdlYkNv cmU6OkhUTUxGb3JtYXR0aW5nRWxlbWVudExpc3Q6OkJvb2ttYXJrOjpCb29rbWFyayk6CisgICAg ICAgIChXZWJDb3JlOjpIVE1MRm9ybWF0dGluZ0VsZW1lbnRMaXN0OjpCb29rbWFyazo6bW92ZVRv QWZ0ZXIpOgorICAgICAgICAoV2ViQ29yZTo6SFRNTEZvcm1hdHRpbmdFbGVtZW50TGlzdDo6Qm9v a21hcms6OmVsZW1lbnRCZWZvcmUpOgorICAgICAgICAoV2ViQ29yZTo6SFRNTEZvcm1hdHRpbmdF bGVtZW50TGlzdDo6Qm9va21hcms6OmVsZW1lbnRBZnRlcik6CisgICAgICAgICogaHRtbC9IVE1M VHJlZUJ1aWxkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SFRNTFRyZWVCdWlsZGVyOjpjYWxs VGhlQWRvcHRpb25BZ2VuY3kpOgorCiAyMDEwLTA3LTA2ICBTaGVyaWZmIEJvdCAgPHdlYmtpdC5y ZXZpZXcuYm90QGdtYWlsLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLCByb2xsaW5nIG91dCBy NjI1MjkuCmRpZmYgLS1naXQgYS9XZWJDb3JlL2h0bWwvSFRNTEZvcm1hdHRpbmdFbGVtZW50TGlz dC5jcHAgYi9XZWJDb3JlL2h0bWwvSFRNTEZvcm1hdHRpbmdFbGVtZW50TGlzdC5jcHAKaW5kZXgg MDE5ODI2MThkNDY2MDIyOWY2Zjc5NTRhNzdkMThjMDEyN2FkNDY2Ni4uZGExNzQxNjQ5NzAxN2Nm NmUwOTI4MjZlMjk4ZDIyYTk2MGEyMTYwYyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9odG1sL0hUTUxG b3JtYXR0aW5nRWxlbWVudExpc3QuY3BwCisrKyBiL1dlYkNvcmUvaHRtbC9IVE1MRm9ybWF0dGlu Z0VsZW1lbnRMaXN0LmNwcApAQCAtMTA5LDYgKzEwOSw0MiBAQCBIVE1MRm9ybWF0dGluZ0VsZW1l bnRMaXN0OjpFbnRyeSogSFRNTEZvcm1hdHRpbmdFbGVtZW50TGlzdDo6ZmluZChFbGVtZW50KiBl bGVtZQogICAgIHJldHVybiAwOwogfQogCitIVE1MRm9ybWF0dGluZ0VsZW1lbnRMaXN0OjpCb29r bWFyayBIVE1MRm9ybWF0dGluZ0VsZW1lbnRMaXN0Ojpib29rbWFya0ZvcihFbGVtZW50KiBlbGVt ZW50KQoreworICAgIHNpemVfdCBpbmRleCA9IG1fZW50cmllcy5maW5kKGVsZW1lbnQpOworICAg IEFTU0VSVChpbmRleCAhPSBub3RGb3VuZCk7CisgICAgRWxlbWVudCogZWxlbWVudEJlZm9yZSA9 IChpbmRleCA+IDEpID8gbV9lbnRyaWVzW2luZGV4IC0gMV0uZWxlbWVudCgpIDogMDsKKyAgICBF bGVtZW50KiBlbGVtZW50QWZ0ZXIgPSAoaW5kZXggPCBtX2VudHJpZXMuc2l6ZSgpIC0gMSkgPyBt X2VudHJpZXNbaW5kZXggKyAxXS5lbGVtZW50KCkgOiAwOworICAgIHJldHVybiBCb29rbWFyayhl bGVtZW50QmVmb3JlLCBlbGVtZW50QWZ0ZXIpOworfQorCit2b2lkIEhUTUxGb3JtYXR0aW5nRWxl bWVudExpc3Q6Omluc2VydEF0KEVsZW1lbnQqIGVsZW1lbnQsIGNvbnN0IEJvb2ttYXJrJiBib29r bWFyaykKK3sKKyAgICBzaXplX3QgYmVmb3JlSW5kZXggPSBub3RGb3VuZDsKKyAgICBpZiAoYm9v a21hcmsuZWxlbWVudEJlZm9yZSgpKSB7CisgICAgICAgIGJlZm9yZUluZGV4ID0gbV9lbnRyaWVz LmZpbmQoYm9va21hcmsuZWxlbWVudEJlZm9yZSgpKTsKKyAgICAgICAgQVNTRVJUKGJlZm9yZUlu ZGV4ICE9IG5vdEZvdW5kKTsKKyAgICB9CisgICAgc2l6ZV90IGFmdGVySW5kZXggPSBub3RGb3Vu ZDsKKyAgICBpZiAoYm9va21hcmsuZWxlbWVudEFmdGVyKCkpIHsKKyAgICAgICAgYWZ0ZXJJbmRl eCA9IG1fZW50cmllcy5maW5kKGJvb2ttYXJrLmVsZW1lbnRBZnRlcigpKTsKKyAgICAgICAgQVNT RVJUKGFmdGVySW5kZXggIT0gbm90Rm91bmQpOworICAgIH0KKworICAgIGlmICghYm9va21hcmsu ZWxlbWVudEJlZm9yZSgpKSB7CisgICAgICAgIGlmIChib29rbWFyay5lbGVtZW50QWZ0ZXIoKSkK KyAgICAgICAgICAgIEFTU0VSVCghYWZ0ZXJJbmRleCk7CisgICAgICAgIG1fZW50cmllcy5wcmVw ZW5kKGVsZW1lbnQpOworICAgIH0gZWxzZSB7CisgICAgICAgIGlmIChib29rbWFyay5lbGVtZW50 QWZ0ZXIoKSkgeworICAgICAgICAgICAgLy8gQm9va21hcmtzIGFyZSBub3QgZ2VuZXJhbCBwdXJw b3NlLCBvbmx5IGZvciBBZG9wdGlvbiBBZ2VuY3kuCisgICAgICAgICAgICAvLyBBc3N1bWUgdGhh dCB0aGUgYm9va21hcmtlZCBlbGVtZW50IHdhcyBhbHJlYWR5IHJlbW92ZWQuCisgICAgICAgICAg ICBBU1NFUlQoYmVmb3JlSW5kZXggKyAxID09IGFmdGVySW5kZXgpOworICAgICAgICB9CisgICAg ICAgIG1fZW50cmllcy5pbnNlcnQoYmVmb3JlSW5kZXggKyAxLCBlbGVtZW50KTsKKyAgICB9Cit9 CisKIHZvaWQgSFRNTEZvcm1hdHRpbmdFbGVtZW50TGlzdDo6YXBwZW5kKEVsZW1lbnQqIGVsZW1l bnQpCiB7CiAgICAgbV9lbnRyaWVzLmFwcGVuZChlbGVtZW50KTsKZGlmZiAtLWdpdCBhL1dlYkNv cmUvaHRtbC9IVE1MRm9ybWF0dGluZ0VsZW1lbnRMaXN0LmggYi9XZWJDb3JlL2h0bWwvSFRNTEZv cm1hdHRpbmdFbGVtZW50TGlzdC5oCmluZGV4IGRhMzBmNzViYjQ0YmJiMmY5ZjIyZGUxMjAzYTYx MmI0ZTBkMWRmNDkuLmE2M2NjZWExM2ZkNzlhYWZhNGU0MWRlODE1NDg0YmY3YTA5NzU3M2QgMTAw NjQ0Ci0tLSBhL1dlYkNvcmUvaHRtbC9IVE1MRm9ybWF0dGluZ0VsZW1lbnRMaXN0LmgKKysrIGIv V2ViQ29yZS9odG1sL0hUTUxGb3JtYXR0aW5nRWxlbWVudExpc3QuaApAQCAtNjQsNiArNjQsMjgg QEAgcHVibGljOgogICAgICAgICBSZWZQdHI8RWxlbWVudD4gbV9lbGVtZW50OwogICAgIH07CiAK KyAgICBjbGFzcyBCb29rbWFyayB7CisgICAgcHVibGljOgorICAgICAgICBCb29rbWFyayhFbGVt ZW50KiBiZWZvcmUsIEVsZW1lbnQqIGFmdGVyKQorICAgICAgICAgICAgOiBtX2JlZm9yZShiZWZv cmUpCisgICAgICAgICAgICAsIG1fYWZ0ZXIoYWZ0ZXIpCisgICAgICAgIHsKKyAgICAgICAgfQor CisgICAgICAgIHZvaWQgbW92ZVRvQWZ0ZXIoRWxlbWVudCogYmVmb3JlKQorICAgICAgICB7Cisg ICAgICAgICAgICBtX2JlZm9yZSA9IGJlZm9yZTsKKyAgICAgICAgICAgIG1fYWZ0ZXIgPSAwOwor ICAgICAgICB9CisKKyAgICAgICAgRWxlbWVudCogZWxlbWVudEJlZm9yZSgpIGNvbnN0IHsgcmV0 dXJuIG1fYmVmb3JlOyB9CisgICAgICAgIEVsZW1lbnQqIGVsZW1lbnRBZnRlcigpIGNvbnN0IHsg cmV0dXJuIG1fYWZ0ZXI7IH0KKworICAgIHByaXZhdGU6CisgICAgICAgIEVsZW1lbnQqIG1fYmVm b3JlOworICAgICAgICBFbGVtZW50KiBtX2FmdGVyOworICAgIH07CisKICAgICBib29sIGlzRW1w dHkoKSBjb25zdCB7IHJldHVybiAhc2l6ZSgpOyB9CiAgICAgc2l6ZV90IHNpemUoKSBjb25zdCB7 IHJldHVybiBtX2VudHJpZXMuc2l6ZSgpOyB9CiAKQEAgLTc0LDYgKzk2LDkgQEAgcHVibGljOgog ICAgIHZvaWQgYXBwZW5kKEVsZW1lbnQqKTsKICAgICB2b2lkIHJlbW92ZShFbGVtZW50Kik7CiAK KyAgICBCb29rbWFyayBib29rbWFya0ZvcihFbGVtZW50Kik7CisgICAgdm9pZCBpbnNlcnRBdChF bGVtZW50KiwgY29uc3QgQm9va21hcmsmKTsKKwogICAgIHZvaWQgYXBwZW5kTWFya2VyKCk7CiAg ICAgdm9pZCBjbGVhclRvTGFzdE1hcmtlcigpOwogCmRpZmYgLS1naXQgYS9XZWJDb3JlL2h0bWwv SFRNTFRyZWVCdWlsZGVyLmNwcCBiL1dlYkNvcmUvaHRtbC9IVE1MVHJlZUJ1aWxkZXIuY3BwCmlu ZGV4IDBkNzYwZjAxMGU2YjIxZjM5NjY0MmRkODBiNTg5YWE2N2U4MzQxYWQuLjMzOWY0MTE4ZTI3 YWUwYzIzOTI0YmNjNjRmYTc5YWMyNDZkZGEwOWIgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaHRtbC9I VE1MVHJlZUJ1aWxkZXIuY3BwCisrKyBiL1dlYkNvcmUvaHRtbC9IVE1MVHJlZUJ1aWxkZXIuY3Bw CkBAIC0xMTc2LDcgKzExNzYsNyBAQCB2b2lkIEhUTUxUcmVlQnVpbGRlcjo6Y2FsbFRoZUFkb3B0 aW9uQWdlbmN5KEF0b21pY0hUTUxUb2tlbiYgdG9rZW4pCiAgICAgICAgIEFTU0VSVChmdXJ0aGVz dEJsb2NrLT5pc0Fib3ZlKGZvcm1hdHRpbmdFbGVtZW50UmVjb3JkKSk7CiAgICAgICAgIEVsZW1l bnQqIGNvbW1vbkFuY2VzdG9yID0gZm9ybWF0dGluZ0VsZW1lbnRSZWNvcmQtPm5leHQoKS0+ZWxl bWVudCgpOwogICAgICAgICAvLyA1LgotICAgICAgICBub3RJbXBsZW1lbnRlZCgpOyAvLyBib29r bWFyaz8KKyAgICAgICAgSFRNTEZvcm1hdHRpbmdFbGVtZW50TGlzdDo6Qm9va21hcmsgYm9va21h cmsgPSBtX2FjdGl2ZUZvcm1hdHRpbmdFbGVtZW50cy5ib29rbWFya0Zvcihmb3JtYXR0aW5nRWxl bWVudCk7CiAgICAgICAgIC8vIDYuCiAgICAgICAgIEhUTUxFbGVtZW50U3RhY2s6OkVsZW1lbnRS ZWNvcmQqIG5vZGUgPSBmdXJ0aGVzdEJsb2NrOwogICAgICAgICBIVE1MRWxlbWVudFN0YWNrOjpF bGVtZW50UmVjb3JkKiBuZXh0Tm9kZSA9IG5vZGUtPm5leHQoKTsKQEAgLTExOTUsOSArMTE5NSw2 IEBAIHZvaWQgSFRNTFRyZWVCdWlsZGVyOjpjYWxsVGhlQWRvcHRpb25BZ2VuY3koQXRvbWljSFRN TFRva2VuJiB0b2tlbikKICAgICAgICAgICAgIC8vIDYuMwogICAgICAgICAgICAgaWYgKG5vZGUg PT0gZm9ybWF0dGluZ0VsZW1lbnRSZWNvcmQpCiAgICAgICAgICAgICAgICAgYnJlYWs7Ci0gICAg ICAgICAgICAvLyA2LjQKLSAgICAgICAgICAgIGlmIChsYXN0Tm9kZSA9PSBmdXJ0aGVzdEJsb2Nr KQotICAgICAgICAgICAgICAgIG5vdEltcGxlbWVudGVkKCk7IC8vIG1vdmUgYm9va21hcmsuCiAg ICAgICAgICAgICAvLyA2LjUKICAgICAgICAgICAgIC8vIEZJWE1FOiBXZSdyZSBzdXBwb3NlZCB0 byBzYXZlIHRoZSBvcmlnaW5hbCB0b2tlbiBpbiB0aGUgZW50cnkuCiAgICAgICAgICAgICBBdG9t aWNIVE1MVG9rZW4gZmFrZVRva2VuKEhUTUxUb2tlbjo6U3RhcnRUYWcsIG5vZGUtPmVsZW1lbnQo KS0+bG9jYWxOYW1lKCkpOwpAQCAtMTIwNyw2ICsxMjA0LDEwIEBAIHZvaWQgSFRNTFRyZWVCdWls ZGVyOjpjYWxsVGhlQWRvcHRpb25BZ2VuY3koQXRvbWljSFRNTFRva2VuJiB0b2tlbikKICAgICAg ICAgICAgIEhUTUxGb3JtYXR0aW5nRWxlbWVudExpc3Q6OkVudHJ5KiBub2RlRW50cnkgPSBtX2Fj dGl2ZUZvcm1hdHRpbmdFbGVtZW50cy5maW5kKG5vZGUtPmVsZW1lbnQoKSk7CiAgICAgICAgICAg ICBub2RlRW50cnktPnJlcGxhY2VFbGVtZW50KG5ld0VsZW1lbnQuZ2V0KCkpOwogICAgICAgICAg ICAgbm9kZS0+cmVwbGFjZUVsZW1lbnQobmV3RWxlbWVudC5yZWxlYXNlKCkpOworICAgICAgICAg ICAgLy8gNi40IC0tIEludGVudGlvbmFsbHkgb3V0IG9mIG9yZGVyIHRvIGhhbmRsZSB0aGUgY2Fz ZSB3aGVyZSBub2RlCisgICAgICAgICAgICAvLyB3YXMgcmVwbGFjZWQgaW4gNi41LgorICAgICAg ICAgICAgaWYgKGxhc3ROb2RlID09IGZ1cnRoZXN0QmxvY2spCisgICAgICAgICAgICAgICAgYm9v a21hcmsubW92ZVRvQWZ0ZXIobm9kZS0+ZWxlbWVudCgpKTsKICAgICAgICAgICAgIC8vIDYuNgog ICAgICAgICAgICAgLy8gVXNlIGFwcGVuZENoaWxkIGluc3RlYWQgb2YgcGFyc2VyQWRkQ2hpbGQg dG8gaGFuZGxlIHBvc3NpYmxlIHJlcGFyZW50aW5nLgogICAgICAgICAgICAgRXhjZXB0aW9uQ29k ZSBlYzsKQEAgLTEyMzYsNyArMTIzNyw3IEBAIHZvaWQgSFRNTFRyZWVCdWlsZGVyOjpjYWxsVGhl QWRvcHRpb25BZ2VuY3koQXRvbWljSFRNTFRva2VuJiB0b2tlbikKICAgICAgICAgZnVydGhlc3RC bG9jay0+ZWxlbWVudCgpLT5wYXJzZXJBZGRDaGlsZChuZXdFbGVtZW50KTsKICAgICAgICAgLy8g MTEKICAgICAgICAgbV9hY3RpdmVGb3JtYXR0aW5nRWxlbWVudHMucmVtb3ZlKGZvcm1hdHRpbmdF bGVtZW50KTsKLSAgICAgICAgbm90SW1wbGVtZW50ZWQoKTsgLy8gaW5zZXJ0IG5ldyBlbGVtZW50 IGF0IGJvb2ttYXJrCisgICAgICAgIG1fYWN0aXZlRm9ybWF0dGluZ0VsZW1lbnRzLmluc2VydEF0 KG5ld0VsZW1lbnQuZ2V0KCksIGJvb2ttYXJrKTsKICAgICAgICAgLy8gMTIKICAgICAgICAgbV9v cGVuRWxlbWVudHMucmVtb3ZlKGZvcm1hdHRpbmdFbGVtZW50KTsKICAgICAgICAgbV9vcGVuRWxl bWVudHMuaW5zZXJ0QWJvdmUobmV3RWxlbWVudCwgZnVydGhlc3RCbG9jayk7Cg==