39520 2010-05-21 16:59:56 -0700 Parse attributes with HTML5 lexer 2010-05-22 00:43:27 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 39259 1 abarth webkit-unassigned eric webkit-ews oldest_to_newest 229174 0 abarth 2010-05-21 16:59:56 -0700 Parse attributes with HTML5 lexer 229176 1 56764 abarth 2010-05-21 17:01:53 -0700 Created attachment 56764 Patch 229177 2 eric 2010-05-21 17:06:51 -0700 Attachment 56764 did not build on mac: Build output: http://webkit-commit-queue.appspot.com/results/2301422 229179 3 webkit-ews 2010-05-21 17:07:44 -0700 Attachment 56764 did not build on qt: Build output: http://webkit-commit-queue.appspot.com/results/2287384 229180 4 56764 eric 2010-05-21 17:09:25 -0700 Comment on attachment 56764 Patch If you don't break the builds, sure, this looks fine. 229182 5 abarth 2010-05-21 17:10:14 -0700 ../../../WebCore/html/HTML5Tokenizer.cpp:34:29: error: MappedAttribute.h: No such file or directory Looks like something changed in the tree since I last updated. 229241 6 abarth 2010-05-22 00:43:27 -0700 Committed r60001: <http://trac.webkit.org/changeset/60001> 56764 2010-05-21 17:01:53 -0700 2010-05-21 17:09:25 -0700 Patch bug-39520-20100521170152.patch text/plain 9720 abarth ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MDdhN2FlMGFkZTk5NzM2MDE3OGRjNTE2NDAxNTY5YmIxY2FmOTIwYy4uYzZlYzI2YTMyNTVmZmI2 M2RjZGYyZWI2ZjMzOTc2OTUyOTU2ZDFkYiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNyBAQAorMjAxMC0wNS0yMSAgQWRh bSBCYXJ0aCAgPGFiYXJ0aEB3ZWJraXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFBhcnNlIGF0dHJpYnV0ZXMgd2l0aCBIVE1MNSBsZXhlcgor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Mzk1MjAKKwor ICAgICAgICBUaGlzIHBhdGNoIGxldHMgdGhlIEhUTUw1IGxleGVyIHBhcnNlIGF0dHJpYnV0ZXMs IGFzIGluCisgICAgICAgIDxkaXYgYXR0cj0iZm9vIj48L2Rpdj4uICBUaGlzIHBhdGNoIGlzIG9u IHRoZSBjcml0aWNhbCBwYXRoIHRvIHJ1bm5pbmcKKyAgICAgICAgdGhlIGh0bWw1bGliIHRlc3Rz LgorCisgICAgICAgICogaHRtbC9IVE1MNUxleGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkhU TUw1TGV4ZXI6Om5leHRUb2tlbik6CisgICAgICAgICogaHRtbC9IVE1MNUxleGVyLmg6CisgICAg ICAgICogaHRtbC9IVE1MNVRva2VuLmg6CisgICAgICAgIChXZWJDb3JlOjpIVE1MNVRva2VuOjpi ZWdpblN0YXJ0VGFnKToKKyAgICAgICAgKFdlYkNvcmU6OkhUTUw1VG9rZW46OmJlZ2luRW5kVGFn KToKKyAgICAgICAgKFdlYkNvcmU6OkhUTUw1VG9rZW46OmFkZE5ld0F0dHJpYnV0ZSk6CisgICAg ICAgIChXZWJDb3JlOjpIVE1MNVRva2VuOjphcHBlbmRUb0F0dHJpYnV0ZU5hbWUpOgorICAgICAg ICAoV2ViQ29yZTo6SFRNTDVUb2tlbjo6YXBwZW5kVG9BdHRyaWJ1dGVWYWx1ZSk6CisgICAgICAg IChXZWJDb3JlOjpIVE1MNVRva2VuOjphdHRyaWJ1dGVzKToKKyAgICAgICAgKiBodG1sL0hUTUw1 VG9rZW5pemVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmNvbnZlcnRUb09sZFN0eWxlKToKKwog MjAxMC0wNS0xOSAgSnVzdGluIFNjaHVoICA8anNjaHVoQGNocm9taXVtLm9yZz4KIAogICAgICAg ICBSZXZpZXdlZCBieSBBZGFtIEJhcnRoLgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9odG1sL0hUTUw1 TGV4ZXIuY3BwIGIvV2ViQ29yZS9odG1sL0hUTUw1TGV4ZXIuY3BwCmluZGV4IDA0NjQzOWNjMDcy NzZjYTc1Mzk3MWJhOTcyZTM2ZGI4NjdiMGI4YzYuLjhhZjU1N2NkOWI2NDQ3NGJlN2VlOTU4NjY3 OWExNzhkNzVkMDkwYWUgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaHRtbC9IVE1MNUxleGVyLmNwcAor KysgYi9XZWJDb3JlL2h0bWwvSFRNTDVMZXhlci5jcHAKQEAgLTY4NSwxMiArNjg1LDE0IEBAIGJv b2wgSFRNTDVMZXhlcjo6bmV4dFRva2VuKFNlZ21lbnRlZFN0cmluZyYgc291cmNlLCBIVE1MNVRv a2VuJiB0b2tlbikKICAgICAgICAgICAgICAgICBlbWl0Q3VycmVudFRhZ1Rva2VuKCk7CiAgICAg ICAgICAgICAgICAgbV9zdGF0ZSA9IERhdGFTdGF0ZTsKICAgICAgICAgICAgIH0gZWxzZSBpZiAo Y2MgPj0gJ0EnICYmIGNjIDw9ICdaJykgewotICAgICAgICAgICAgICAgIG5vdEltcGxlbWVudGVk KCk7CisgICAgICAgICAgICAgICAgbV90b2tlbi0+YWRkTmV3QXR0cmlidXRlKCk7CisgICAgICAg ICAgICAgICAgbV90b2tlbi0+YXBwZW5kVG9BdHRyaWJ1dGVOYW1lKHRvTG93ZXJDYXNlKGNjKSk7 CiAgICAgICAgICAgICAgICAgbV9zdGF0ZSA9IEF0dHJpYnV0ZU5hbWVTdGF0ZTsKICAgICAgICAg ICAgIH0gZWxzZSB7CiAgICAgICAgICAgICAgICAgaWYgKGNjID09ICciJyB8fCBjYyA9PSAnXCcn IHx8IGNjID09ICc8JyB8fCBjYyA9PSAnPScpCiAgICAgICAgICAgICAgICAgICAgIGVtaXRQYXJz ZUVycm9yKCk7Ci0gICAgICAgICAgICAgICAgbm90SW1wbGVtZW50ZWQoKTsKKyAgICAgICAgICAg ICAgICBtX3Rva2VuLT5hZGROZXdBdHRyaWJ1dGUoKTsKKyAgICAgICAgICAgICAgICBtX3Rva2Vu LT5hcHBlbmRUb0F0dHJpYnV0ZU5hbWUoY2MpOwogICAgICAgICAgICAgICAgIG1fc3RhdGUgPSBB dHRyaWJ1dGVOYW1lU3RhdGU7CiAgICAgICAgICAgICB9CiAgICAgICAgICAgICAvLyBGSVhNRTog SGFuZGxlIEVPRiBwcm9wZXJseS4KQEAgLTcwNywxMSArNzA5LDExIEBAIGJvb2wgSFRNTDVMZXhl cjo6bmV4dFRva2VuKFNlZ21lbnRlZFN0cmluZyYgc291cmNlLCBIVE1MNVRva2VuJiB0b2tlbikK ICAgICAgICAgICAgICAgICBlbWl0Q3VycmVudFRhZ1Rva2VuKCk7CiAgICAgICAgICAgICAgICAg bV9zdGF0ZSA9IERhdGFTdGF0ZTsKICAgICAgICAgICAgIH0gZWxzZSBpZiAoY2MgPj0gJ0EnICYm IGNjIDw9ICdaJykKLSAgICAgICAgICAgICAgICBub3RJbXBsZW1lbnRlZCgpOworICAgICAgICAg ICAgICAgIG1fdG9rZW4tPmFwcGVuZFRvQXR0cmlidXRlTmFtZSh0b0xvd2VyQ2FzZShjYykpOwog ICAgICAgICAgICAgZWxzZSB7CiAgICAgICAgICAgICAgICAgaWYgKGNjID09ICciJyB8fCBjYyA9 PSAnXCcnIHx8IGNjID09ICc8JyB8fCBjYyA9PSAnPScpCiAgICAgICAgICAgICAgICAgICAgIGVt aXRQYXJzZUVycm9yKCk7Ci0gICAgICAgICAgICAgICAgbm90SW1wbGVtZW50ZWQoKTsKKyAgICAg ICAgICAgICAgICBtX3Rva2VuLT5hcHBlbmRUb0F0dHJpYnV0ZU5hbWUoY2MpOwogICAgICAgICAg ICAgICAgIG1fc3RhdGUgPSBBdHRyaWJ1dGVOYW1lU3RhdGU7CiAgICAgICAgICAgICB9CiAgICAg ICAgICAgICAvLyBGSVhNRTogSGFuZGxlIEVPRiBwcm9wZXJseS4KQEAgLTcyOCwxMiArNzMwLDE0 IEBAIGJvb2wgSFRNTDVMZXhlcjo6bmV4dFRva2VuKFNlZ21lbnRlZFN0cmluZyYgc291cmNlLCBI VE1MNVRva2VuJiB0b2tlbikKICAgICAgICAgICAgICAgICBlbWl0Q3VycmVudFRhZ1Rva2VuKCk7 CiAgICAgICAgICAgICAgICAgbV9zdGF0ZSA9IERhdGFTdGF0ZTsKICAgICAgICAgICAgIH0gZWxz ZSBpZiAoY2MgPj0gJ0EnICYmIGNjIDw9ICdaJykgewotICAgICAgICAgICAgICAgIG5vdEltcGxl bWVudGVkKCk7CisgICAgICAgICAgICAgICAgbV90b2tlbi0+YWRkTmV3QXR0cmlidXRlKCk7Cisg ICAgICAgICAgICAgICAgbV90b2tlbi0+YXBwZW5kVG9BdHRyaWJ1dGVOYW1lKHRvTG93ZXJDYXNl KGNjKSk7CiAgICAgICAgICAgICAgICAgbV9zdGF0ZSA9IEF0dHJpYnV0ZU5hbWVTdGF0ZTsKICAg ICAgICAgICAgIH0gZWxzZSB7CiAgICAgICAgICAgICAgICAgaWYgKGNjID09ICciJyB8fCBjYyA9 PSAnXCcnIHx8IGNjID09ICc8JykKICAgICAgICAgICAgICAgICAgICAgZW1pdFBhcnNlRXJyb3Io KTsKLSAgICAgICAgICAgICAgICBub3RJbXBsZW1lbnRlZCgpOworICAgICAgICAgICAgICAgIG1f dG9rZW4tPmFkZE5ld0F0dHJpYnV0ZSgpOworICAgICAgICAgICAgICAgIG1fdG9rZW4tPmFwcGVu ZFRvQXR0cmlidXRlTmFtZShjYyk7CiAgICAgICAgICAgICAgICAgbV9zdGF0ZSA9IEF0dHJpYnV0 ZU5hbWVTdGF0ZTsKICAgICAgICAgICAgIH0KICAgICAgICAgICAgIC8vIEZJWE1FOiBIYW5kbGUg RU9GIHByb3Blcmx5LgpAQCAtNzU2LDcgKzc2MCw3IEBAIGJvb2wgSFRNTDVMZXhlcjo6bmV4dFRv a2VuKFNlZ21lbnRlZFN0cmluZyYgc291cmNlLCBIVE1MNVRva2VuJiB0b2tlbikKICAgICAgICAg ICAgIH0gZWxzZSB7CiAgICAgICAgICAgICAgICAgaWYgKGNjID09ICc8JyB8fCBjYyA9PSAnPScg fHwgY2MgPT0gJ2AnKQogICAgICAgICAgICAgICAgICAgICBlbWl0UGFyc2VFcnJvcigpOwotICAg ICAgICAgICAgICAgIG5vdEltcGxlbWVudGVkKCk7CisgICAgICAgICAgICAgICAgbV90b2tlbi0+ YXBwZW5kVG9BdHRyaWJ1dGVWYWx1ZShjYyk7CiAgICAgICAgICAgICAgICAgbV9zdGF0ZSA9IEF0 dHJpYnV0ZVZhbHVlVW5xdW90ZWRTdGF0ZTsKICAgICAgICAgICAgIH0KICAgICAgICAgICAgIGJy ZWFrOwpAQCAtNzY4LDcgKzc3Miw3IEBAIGJvb2wgSFRNTDVMZXhlcjo6bmV4dFRva2VuKFNlZ21l bnRlZFN0cmluZyYgc291cmNlLCBIVE1MNVRva2VuJiB0b2tlbikKICAgICAgICAgICAgICAgICBt X3N0YXRlID0gQ2hhcmFjdGVyUmVmZXJlbmNlSW5BdHRyaWJ1dGVWYWx1ZVN0YXRlOwogICAgICAg ICAgICAgICAgIG1fYWRkaXRpb25hbEFsbG93ZWRDaGFyYWN0ZXIgPSAnIic7CiAgICAgICAgICAg ICB9IGVsc2UKLSAgICAgICAgICAgICAgICBub3RJbXBsZW1lbnRlZCgpOworICAgICAgICAgICAg ICAgIG1fdG9rZW4tPmFwcGVuZFRvQXR0cmlidXRlVmFsdWUoY2MpOwogICAgICAgICAgICAgLy8g RklYTUU6IEhhbmRsZSBFT0YgcHJvcGVybHkuCiAgICAgICAgICAgICBicmVhazsKICAgICAgICAg fQpAQCAtNzc5LDcgKzc4Myw3IEBAIGJvb2wgSFRNTDVMZXhlcjo6bmV4dFRva2VuKFNlZ21lbnRl ZFN0cmluZyYgc291cmNlLCBIVE1MNVRva2VuJiB0b2tlbikKICAgICAgICAgICAgICAgICBtX3N0 YXRlID0gQ2hhcmFjdGVyUmVmZXJlbmNlSW5BdHRyaWJ1dGVWYWx1ZVN0YXRlOwogICAgICAgICAg ICAgICAgIG1fYWRkaXRpb25hbEFsbG93ZWRDaGFyYWN0ZXIgPSAnXCcnOwogICAgICAgICAgICAg fSBlbHNlCi0gICAgICAgICAgICAgICAgbm90SW1wbGVtZW50ZWQoKTsKKyAgICAgICAgICAgICAg ICBtX3Rva2VuLT5hcHBlbmRUb0F0dHJpYnV0ZVZhbHVlKGNjKTsKICAgICAgICAgICAgIC8vIEZJ WE1FOiBIYW5kbGUgRU9GIHByb3Blcmx5LgogICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIH0K QEAgLTc5NSw3ICs3OTksNyBAQCBib29sIEhUTUw1TGV4ZXI6Om5leHRUb2tlbihTZWdtZW50ZWRT dHJpbmcmIHNvdXJjZSwgSFRNTDVUb2tlbiYgdG9rZW4pCiAgICAgICAgICAgICB9IGVsc2Ugewog ICAgICAgICAgICAgICAgIGlmIChjYyA9PSAnIicgfHwgY2MgPT0gJ1wnJyB8fCBjYyA9PSAnPCcg fHwgY2MgPT0gJz0nIHx8IGNjID09ICdgJykKICAgICAgICAgICAgICAgICAgICAgZW1pdFBhcnNl RXJyb3IoKTsKLSAgICAgICAgICAgICAgICBub3RJbXBsZW1lbnRlZCgpOworICAgICAgICAgICAg ICAgIG1fdG9rZW4tPmFwcGVuZFRvQXR0cmlidXRlVmFsdWUoY2MpOwogICAgICAgICAgICAgfQog ICAgICAgICAgICAgLy8gRklYTUU6IEhhbmRsZSBFT0YgcHJvcGVybHkuCiAgICAgICAgICAgICBi cmVhazsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaHRtbC9IVE1MNUxleGVyLmggYi9XZWJDb3JlL2h0 bWwvSFRNTDVMZXhlci5oCmluZGV4IDUwZDc4ZjY4NGNlODA4Y2Q1NzVhOGZjNzY4YmRmYzU2MmI4 YmRhODUuLjkxYmNkNzIxNzU5ZDc4YmNiYzhkMmYzM2Y4MTBlMmQwNTQ1YjViNzQgMTAwNjQ0Ci0t LSBhL1dlYkNvcmUvaHRtbC9IVE1MNUxleGVyLmgKKysrIGIvV2ViQ29yZS9odG1sL0hUTUw1TGV4 ZXIuaApAQCAtMTQwLDYgKzE0MCw5IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogICAgICAgICBi b29sIG1fZW1pdFBlbmRpbmc7CiAKKyAgICAgICAgVmVjdG9yPFVDaGFyLCAzMj4gbV9hdHRyaWJ1 dGVOYW1lOworICAgICAgICBWZWN0b3I8VUNoYXIsIDMyPiBtX2F0dHJpYnV0ZVZhbHVlOworCiAg ICAgICAgIC8vIGh0dHA6Ly93d3cud2hhdHdnLm9yZy9zcGVjcy93ZWItYXBwcy9jdXJyZW50LXdv cmsvI3RlbXBvcmFyeS1idWZmZXIKICAgICAgICAgVmVjdG9yPFVDaGFyLCAxMDI0PiBtX3RlbXBv cmFyeUJ1ZmZlcjsKIApkaWZmIC0tZ2l0IGEvV2ViQ29yZS9odG1sL0hUTUw1VG9rZW4uaCBiL1dl YkNvcmUvaHRtbC9IVE1MNVRva2VuLmgKaW5kZXggZDcyZGU1NDUyOTE3YWEwYTRlY2JkOTgwY2Rh Mzg4YjJjZThmZTU5Zi4uOTk0MGQ3ZTY3YmM5NTY0Zjk1MmVhNTQ4YWQ2YTk0ZTM4NzUyMjkwYyAx MDA2NDQKLS0tIGEvV2ViQ29yZS9odG1sL0hUTUw1VG9rZW4uaAorKysgYi9XZWJDb3JlL2h0bWwv SFRNTDVUb2tlbi5oCkBAIC00NCw2ICs0NCwxNCBAQCBwdWJsaWM6CiAgICAgICAgIEVuZE9mRmls ZSwKICAgICB9OwogCisgICAgY2xhc3MgQXR0cmlidXRlIHsKKyAgICBwdWJsaWM6CisgICAgICAg IFdURjo6VmVjdG9yPFVDaGFyLCAzMj4gbV9uYW1lOworICAgICAgICBXVEY6OlZlY3RvcjxVQ2hh ciwgMzI+IG1fdmFsdWU7CisgICAgfTsKKworICAgIHR5cGVkZWYgV1RGOjpWZWN0b3I8QXR0cmli dXRlPiBBdHRyaWJ1dGVMaXN0OworCiAgICAgSFRNTDVUb2tlbigpIHsgY2xlYXIoKTsgfQogCiAg ICAgdm9pZCBjbGVhcigpIHsgbV90eXBlID0gVW5pbml0aWFsaXplZDsgfQpAQCAtNTQsNyArNjIs NyBAQCBwdWJsaWM6CiAgICAgICAgIG1fdHlwZSA9IFN0YXJ0VGFnOwogICAgICAgICBtX2RhdGEu Y2xlYXIoKTsKICAgICAgICAgbV9zZWxmQ2xvc2luZyA9IGZhbHNlOwotICAgICAgICBtX2F0dHJz ID0gMDsKKyAgICAgICAgbV9jdXJyZW50QXR0cmlidXRlID0gMDsKIAogICAgICAgICBtX2RhdGEu YXBwZW5kKGNoYXJhY3Rlcik7CiAgICAgfQpAQCAtNjUsNyArNzMsNyBAQCBwdWJsaWM6CiAgICAg ICAgIG1fdHlwZSA9IEVuZFRhZzsKICAgICAgICAgbV9kYXRhLmNsZWFyKCk7CiAgICAgICAgIG1f c2VsZkNsb3NpbmcgPSBmYWxzZTsKLSAgICAgICAgbV9hdHRycyA9IDA7CisgICAgICAgIG1fY3Vy cmVudEF0dHJpYnV0ZSA9IDA7CiAKICAgICAgICAgbV9kYXRhLmFwcGVuZChjaGFyYWN0ZXIpOwog ICAgIH0KQEAgLTkwLDYgKzk4LDI1IEBAIHB1YmxpYzoKICAgICAgICAgbV9kYXRhLmFwcGVuZChj aGFyYWN0ZXIpOwogICAgIH0KIAorICAgIHZvaWQgYWRkTmV3QXR0cmlidXRlKCkKKyAgICB7Cisg ICAgICAgIEFTU0VSVChtX3R5cGUgPT0gU3RhcnRUYWcgfHwgbV90eXBlID09IEVuZFRhZyk7Cisg ICAgICAgIG1fYXR0cmlidXRlcy5ncm93KG1fYXR0cmlidXRlcy5zaXplKCkgKyAxKTsKKyAgICAg ICAgbV9jdXJyZW50QXR0cmlidXRlID0gJm1fYXR0cmlidXRlcy5sYXN0KCk7CisgICAgfQorCisg ICAgdm9pZCBhcHBlbmRUb0F0dHJpYnV0ZU5hbWUoVUNoYXIgY2hhcmFjdGVyKQorICAgIHsKKyAg ICAgICAgQVNTRVJUKG1fdHlwZSA9PSBTdGFydFRhZyB8fCBtX3R5cGUgPT0gRW5kVGFnKTsKKyAg ICAgICAgbV9jdXJyZW50QXR0cmlidXRlLT5tX25hbWUuYXBwZW5kKGNoYXJhY3Rlcik7CisgICAg fQorCisgICAgdm9pZCBhcHBlbmRUb0F0dHJpYnV0ZVZhbHVlKFVDaGFyIGNoYXJhY3RlcikKKyAg ICB7CisgICAgICAgIEFTU0VSVChtX3R5cGUgPT0gU3RhcnRUYWcgfHwgbV90eXBlID09IEVuZFRh Zyk7CisgICAgICAgIG1fY3VycmVudEF0dHJpYnV0ZS0+bV92YWx1ZS5hcHBlbmQoY2hhcmFjdGVy KTsKKyAgICB9CisKICAgICBUeXBlIHR5cGUoKSBjb25zdCB7IHJldHVybiBtX3R5cGU7IH0KIAog ICAgIEF0b21pY1N0cmluZyBuYW1lKCkKQEAgLTEwNCwxMCArMTMxLDEwIEBAIHB1YmxpYzoKICAg ICAgICAgcmV0dXJuIG1fc2VsZkNsb3Npbmc7CiAgICAgfQogCi0gICAgTmFtZWRNYXBwZWRBdHRy TWFwKiBhdHRycygpIGNvbnN0CisgICAgQXR0cmlidXRlTGlzdCYgYXR0cmlidXRlcygpCiAgICAg ewogICAgICAgICBBU1NFUlQobV90eXBlID09IFN0YXJ0VGFnIHx8IG1fdHlwZSA9PSBFbmRUYWcp OwotICAgICAgICByZXR1cm4gbV9hdHRycy5nZXQoKTsKKyAgICAgICAgcmV0dXJuIG1fYXR0cmli dXRlczsKICAgICB9CiAKICAgICBTdHJpbmcgY2hhcmFjdGVycygpCkBAIC0xMzEsNyArMTU4LDEw IEBAIHByaXZhdGU6CiAKICAgICAvLyBGb3IgU3RhcnRUYWcgYW5kIEVuZFRhZwogICAgIGJvb2wg bV9zZWxmQ2xvc2luZzsKLSAgICBSZWZQdHI8TmFtZWRNYXBwZWRBdHRyTWFwPiBtX2F0dHJzOwor ICAgIEF0dHJpYnV0ZUxpc3QgbV9hdHRyaWJ1dGVzOyAvLyBPbGQgdG9rZW5pemVyIHJlc2VydmVz IDEwLgorCisgICAgLy8gQSBwb2ludGVyIGludG8gbV9hdHRyaWJ1dGVzIHVzZWQgZHVyaW5nIGxl eGluZy4KKyAgICBBdHRyaWJ1dGUqIG1fY3VycmVudEF0dHJpYnV0ZTsKIH07CiAKIH0KZGlmZiAt LWdpdCBhL1dlYkNvcmUvaHRtbC9IVE1MNVRva2VuaXplci5jcHAgYi9XZWJDb3JlL2h0bWwvSFRN TDVUb2tlbml6ZXIuY3BwCmluZGV4IDNhMDIyZDMwMjMwYTQ2OTU5MjA4ZmEwMGVhNmNhNzdlNTNi NjRhNjEuLmM3YTliYjk2YTgzOTk5NThjNGNkOWIxNmFiMWMxYTc0YTRiMWRkMDEgMTAwNjQ0Ci0t LSBhL1dlYkNvcmUvaHRtbC9IVE1MNVRva2VuaXplci5jcHAKKysrIGIvV2ViQ29yZS9odG1sL0hU TUw1VG9rZW5pemVyLmNwcApAQCAtMzEsNiArMzEsNyBAQAogI2luY2x1ZGUgIkhUTUxEb2N1bWVu dC5oIgogI2luY2x1ZGUgIkhUTUxQYXJzZXIuaCIKICNpbmNsdWRlICJIVE1MVG9rZW5pemVyLmgi CisjaW5jbHVkZSAiTWFwcGVkQXR0cmlidXRlLmgiCiAjaW5jbHVkZSAiTm90SW1wbGVtZW50ZWQu aCIKIAogbmFtZXNwYWNlIFdlYkNvcmUgewpAQCAtMzksMTIgKzQwLDI0IEBAIHN0YXRpYyB2b2lk IGNvbnZlcnRUb09sZFN0eWxlKEhUTUw1VG9rZW4mIHRva2VuLCBUb2tlbiYgb2xkU3R5bGVUb2tl bikKIHsKICAgICBzd2l0Y2ggKHRva2VuLnR5cGUoKSkgewogICAgIGNhc2UgSFRNTDVUb2tlbjo6 U3RhcnRUYWc6Ci0gICAgY2FzZSBIVE1MNVRva2VuOjpFbmRUYWc6CisgICAgY2FzZSBIVE1MNVRv a2VuOjpFbmRUYWc6IHsKICAgICAgICAgb2xkU3R5bGVUb2tlbi5iZWdpblRhZyA9ICh0b2tlbi50 eXBlKCkgPT0gSFRNTDVUb2tlbjo6U3RhcnRUYWcpOwogICAgICAgICBvbGRTdHlsZVRva2VuLnNl bGZDbG9zaW5nVGFnID0gdG9rZW4uc2VsZkNsb3NpbmcoKTsKICAgICAgICAgb2xkU3R5bGVUb2tl bi50YWdOYW1lID0gdG9rZW4ubmFtZSgpOwotICAgICAgICBvbGRTdHlsZVRva2VuLmF0dHJzID0g dG9rZW4uYXR0cnMoKTsKKyAgICAgICAgSFRNTDVUb2tlbjo6QXR0cmlidXRlTGlzdCYgYXR0cmli dXRlcyA9IHRva2VuLmF0dHJpYnV0ZXMoKTsKKyAgICAgICAgZm9yIChIVE1MNVRva2VuOjpBdHRy aWJ1dGVMaXN0OjppdGVyYXRvciBpdGVyID0gYXR0cmlidXRlcy5iZWdpbigpOworICAgICAgICAg ICAgIGl0ZXIgIT0gYXR0cmlidXRlcy5lbmQoKTsgKytpdGVyKSB7CisgICAgICAgICAgICBpZiAo IWl0ZXItPm1fbmFtZS5pc0VtcHR5KCkpIHsKKyAgICAgICAgICAgICAgICBTdHJpbmcgbmFtZSA9 IFN0cmluZyhTdHJpbmdJbXBsOjphZG9wdChpdGVyLT5tX25hbWUpKTsKKyAgICAgICAgICAgICAg ICBTdHJpbmcgdmFsdWUgPSBTdHJpbmcoU3RyaW5nSW1wbDo6YWRvcHQoaXRlci0+bV92YWx1ZSkp OworICAgICAgICAgICAgICAgIFJlZlB0cjxNYXBwZWRBdHRyaWJ1dGU+IG1hcHBlZEF0dHJpYnV0 ZSA9IE1hcHBlZEF0dHJpYnV0ZTo6Y3JlYXRlKG5hbWUsIHZhbHVlKTsKKyAgICAgICAgICAgICAg ICBpZiAoIW9sZFN0eWxlVG9rZW4uYXR0cnMpCisgICAgICAgICAgICAgICAgICAgIG9sZFN0eWxl VG9rZW4uYXR0cnMgPSBOYW1lZE1hcHBlZEF0dHJNYXA6OmNyZWF0ZSgpOworICAgICAgICAgICAg ICAgIG9sZFN0eWxlVG9rZW4uYXR0cnMtPmluc2VydEF0dHJpYnV0ZShtYXBwZWRBdHRyaWJ1dGUu cmVsZWFzZSgpLCBmYWxzZSk7CisgICAgICAgICAgICB9CisgICAgICAgIH0KICAgICAgICAgYnJl YWs7CisgICAgfQogICAgIGNhc2UgSFRNTDVUb2tlbjo6Q2hhcmFjdGVyOgogICAgICAgICBvbGRT dHlsZVRva2VuLnRhZ05hbWUgPSB0ZXh0QXRvbTsKICAgICAgICAgb2xkU3R5bGVUb2tlbi50ZXh0 ID0gdG9rZW4uY2hhcmFjdGVycygpLmltcGwoKTsK