40284 2010-06-07 23:53:32 -0700 Implement HTML5's forceQuirks flag 2010-06-08 00:16:05 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 39259 1 abarth abarth eric oldest_to_newest 235153 0 abarth 2010-06-07 23:53:32 -0700 Implement HTML5's forceQuirks flag 235154 1 58115 abarth 2010-06-07 23:55:34 -0700 Created attachment 58115 Patch 235160 2 58115 eric 2010-06-08 00:00:07 -0700 Comment on attachment 58115 Patch WebCore/html/HTMLParser.cpp:349 + if (t->m_forceQuirks) We should add some comment(s) here about how the two parsers work. You should reference the FIXME inside Document::addChild and how the legacy parser had intended to move the logic out here. How's our test coverage here? Do we feel it's sufficient? 235165 3 58120 abarth 2010-06-08 00:04:14 -0700 Created attachment 58120 Patch for landing 235170 4 abarth 2010-06-08 00:16:05 -0700 Committed r60826: <http://trac.webkit.org/changeset/60826> 58115 2010-06-07 23:55:34 -0700 2010-06-08 00:04:07 -0700 Patch bug-40284-20100607235533.patch text/plain 9790 abarth ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MmUwNzM1NjIyZjg2ZDcyMGE2MWU1MTZmNWE1ZDgwYjQ1ZWRjMzU2OS4uZTVmMGNhZjcxNTVjYmNi ZWM2ODNmYmMzMWRiYTAyYWY1NGE5NjRlYSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTIsNiArMiwzNCBAQAogCiAgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgogCisgICAgICAgIEltcGxlbWVudCBIVE1MNSdzIGZvcmNl UXVpcmtzIGZsYWcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTQwMjg0CisKKyAgICAgICAgSSBkaWRuJ3QgaW1wbGVtZW50IHRoaXMgYmVmb3JlIGJlY2F1 c2UgSSBkaWRuJ3Qga25vdyBob3cgdG8gdGVzdCBpdCwKKyAgICAgICAgYnV0IG5vdyBJIGRvLgor ICAgICAgICAKKyAgICAgICAgVGVzdHM6CisgICAgICAgICAgKiBmYXN0L2RvY3R5cGVzL2RvY3R5 cGUtcGFyc2luZy5odG1sLgorCisgICAgICAgIFdoZW4gd2UgYWN0dWFsbHkgaW1wbGVtZW50IHRo ZSBxdWlya3MgbW9kZSBoYW5kbGluZyBpbiB0aGUgdHJlZQorICAgICAgICBidWlsZGVyLCB3ZSds bCBwcm9iYWJseSB3YW50IHRvIGFkZCB0byB0aGlzIHRlc3QuCisKKyAgICAgICAgKiBodG1sL0hU TUw1TGV4ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SFRNTDVMZXhlcjo6bmV4dFRva2VuKToK KyAgICAgICAgKiBodG1sL0hUTUw1VG9rZW4uaDoKKyAgICAgICAgKFdlYkNvcmU6OkhUTUw1VG9r ZW46OmZvcmNlUXVpcmtzKToKKyAgICAgICAgKFdlYkNvcmU6OkhUTUw1VG9rZW46OnNldEZvcmNl UXVpcmtzKToKKyAgICAgICAgKiBodG1sL0hUTUw1VHJlZUJ1aWxkZXIuY3BwOgorICAgICAgICAo V2ViQ29yZTo6SFRNTDVUcmVlQnVpbGRlcjo6cGFzc1Rva2VuVG9MZWdhY3lQYXJzZXIpOgorICAg ICAgICAqIGh0bWwvSFRNTFBhcnNlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1MUGFyc2Vy OjpwYXJzZURvY3R5cGVUb2tlbik6CisgICAgICAgICogaHRtbC9IVE1MVG9rZW5pemVyLmg6Cisg ICAgICAgIChXZWJDb3JlOjpEb2N0eXBlVG9rZW46OnJlc2V0KToKKworMjAxMC0wNi0wNyAgQWRh bSBCYXJ0aCAgPGFiYXJ0aEB3ZWJraXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCiAgICAgICAgIFJlbW92ZSBBU1NFUlQgaW4gfkhUTUw1VG9rZW5pemVyCiAg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00MDI4MgogCmRp ZmYgLS1naXQgYS9XZWJDb3JlL2h0bWwvSFRNTDVMZXhlci5jcHAgYi9XZWJDb3JlL2h0bWwvSFRN TDVMZXhlci5jcHAKaW5kZXggYTIyY2JkOWNhZmQwYjRjYTQzNmM1NGRhZjU2M2Y0ZWUyMTg5ZGY2 NC4uZDQ2MjVmMjU3OWRjZTA3MzUwNzRkY2YzMzk0ODljZjc5Zjc5MGI0NSAxMDA2NDQKLS0tIGEv V2ViQ29yZS9odG1sL0hUTUw1TGV4ZXIuY3BwCisrKyBiL1dlYkNvcmUvaHRtbC9IVE1MNUxleGVy LmNwcApAQCAtMTM1MSw3ICsxMzUxLDcgQEAgYm9vbCBIVE1MNUxleGVyOjpuZXh0VG9rZW4oU2Vn bWVudGVkU3RyaW5nJiBzb3VyY2UsIEhUTUw1VG9rZW4mIHRva2VuKQogICAgICAgICB9IGVsc2Ug aWYgKGNjID09ICc+JykgewogICAgICAgICAgICAgZW1pdFBhcnNlRXJyb3IoKTsKICAgICAgICAg ICAgIG1fdG9rZW4tPmJlZ2luRE9DVFlQRSgpOwotICAgICAgICAgICAgbm90SW1wbGVtZW50ZWQo KTsKKyAgICAgICAgICAgIG1fdG9rZW4tPnNldEZvcmNlUXVpcmtzKCk7CiAgICAgICAgICAgICBF TUlUX0FORF9SRVNVTUVfSU4oRGF0YVN0YXRlKTsKICAgICAgICAgfSBlbHNlIHsKICAgICAgICAg ICAgIG1fdG9rZW4tPmJlZ2luRE9DVFlQRShjYyk7CkBAIC0xNDAxLDcgKzE0MDEsNyBAQCBib29s IEhUTUw1TGV4ZXI6Om5leHRUb2tlbihTZWdtZW50ZWRTdHJpbmcmIHNvdXJjZSwgSFRNTDVUb2tl biYgdG9rZW4pCiAgICAgICAgICAgICAgICAgICAgIHJldHVybiBzaG91bGRFbWl0QnVmZmVyZWRD aGFyYWN0ZXJUb2tlbihzb3VyY2UpOwogICAgICAgICAgICAgfQogICAgICAgICAgICAgZW1pdFBh cnNlRXJyb3IoKTsKLSAgICAgICAgICAgIG5vdEltcGxlbWVudGVkKCk7CisgICAgICAgICAgICBt X3Rva2VuLT5zZXRGb3JjZVF1aXJrcygpOwogICAgICAgICAgICAgQURWQU5DRV9UTyhCb2d1c0RP Q1RZUEVTdGF0ZSk7CiAgICAgICAgIH0KICAgICAgICAgLy8gRklYTUU6IEhhbmRsZSBFT0YgcHJv cGVybHkuCkBAIC0xNDIxLDExICsxNDIxLDExIEBAIGJvb2wgSFRNTDVMZXhlcjo6bmV4dFRva2Vu KFNlZ21lbnRlZFN0cmluZyYgc291cmNlLCBIVE1MNVRva2VuJiB0b2tlbikKICAgICAgICAgICAg IEFEVkFOQ0VfVE8oRE9DVFlQRVB1YmxpY0lkZW50aWZpZXJTaW5nbGVRdW90ZWRTdGF0ZSk7CiAg ICAgICAgIH0gZWxzZSBpZiAoY2MgPT0gJz4nKSB7CiAgICAgICAgICAgICBlbWl0UGFyc2VFcnJv cigpOwotICAgICAgICAgICAgbm90SW1wbGVtZW50ZWQoKTsKKyAgICAgICAgICAgIG1fdG9rZW4t PnNldEZvcmNlUXVpcmtzKCk7CiAgICAgICAgICAgICBFTUlUX0FORF9SRVNVTUVfSU4oRGF0YVN0 YXRlKTsKICAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAgIGVtaXRQYXJzZUVycm9yKCk7Ci0g ICAgICAgICAgICBub3RJbXBsZW1lbnRlZCgpOworICAgICAgICAgICAgbV90b2tlbi0+c2V0Rm9y Y2VRdWlya3MoKTsKICAgICAgICAgICAgIEFEVkFOQ0VfVE8oQm9ndXNET0NUWVBFU3RhdGUpOwog ICAgICAgICB9CiAgICAgICAgIC8vIEZJWE1FOiBIYW5kbGUgRU9GIHByb3Blcmx5LgpAQCAtMTQ0 MywxMSArMTQ0MywxMSBAQCBib29sIEhUTUw1TGV4ZXI6Om5leHRUb2tlbihTZWdtZW50ZWRTdHJp bmcmIHNvdXJjZSwgSFRNTDVUb2tlbiYgdG9rZW4pCiAgICAgICAgICAgICBBRFZBTkNFX1RPKERP Q1RZUEVQdWJsaWNJZGVudGlmaWVyU2luZ2xlUXVvdGVkU3RhdGUpOwogICAgICAgICB9IGVsc2Ug aWYgKGNjID09ICc+JykgewogICAgICAgICAgICAgZW1pdFBhcnNlRXJyb3IoKTsKLSAgICAgICAg ICAgIG5vdEltcGxlbWVudGVkKCk7CisgICAgICAgICAgICBtX3Rva2VuLT5zZXRGb3JjZVF1aXJr cygpOwogICAgICAgICAgICAgRU1JVF9BTkRfUkVTVU1FX0lOKERhdGFTdGF0ZSk7CiAgICAgICAg IH0gZWxzZSB7CiAgICAgICAgICAgICBlbWl0UGFyc2VFcnJvcigpOwotICAgICAgICAgICAgbm90 SW1wbGVtZW50ZWQoKTsKKyAgICAgICAgICAgIG1fdG9rZW4tPnNldEZvcmNlUXVpcmtzKCk7CiAg ICAgICAgICAgICBBRFZBTkNFX1RPKEJvZ3VzRE9DVFlQRVN0YXRlKTsKICAgICAgICAgfQogICAg ICAgICAvLyBGSVhNRTogSGFuZGxlIEVPRiBwcm9wZXJseS4KQEAgLTE0NTksNyArMTQ1OSw3IEBA IGJvb2wgSFRNTDVMZXhlcjo6bmV4dFRva2VuKFNlZ21lbnRlZFN0cmluZyYgc291cmNlLCBIVE1M NVRva2VuJiB0b2tlbikKICAgICAgICAgICAgIEFEVkFOQ0VfVE8oQWZ0ZXJET0NUWVBFUHVibGlj SWRlbnRpZmllclN0YXRlKTsKICAgICAgICAgZWxzZSBpZiAoY2MgPT0gJz4nKSB7CiAgICAgICAg ICAgICBlbWl0UGFyc2VFcnJvcigpOwotICAgICAgICAgICAgbm90SW1wbGVtZW50ZWQoKTsKKyAg ICAgICAgICAgIG1fdG9rZW4tPnNldEZvcmNlUXVpcmtzKCk7CiAgICAgICAgICAgICBFTUlUX0FO RF9SRVNVTUVfSU4oRGF0YVN0YXRlKTsKICAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAgIG1f dG9rZW4tPmFwcGVuZFRvUHVibGljSWRlbnRpZmllcihjYyk7CkBAIC0xNDc0LDcgKzE0NzQsNyBA QCBib29sIEhUTUw1TGV4ZXI6Om5leHRUb2tlbihTZWdtZW50ZWRTdHJpbmcmIHNvdXJjZSwgSFRN TDVUb2tlbiYgdG9rZW4pCiAgICAgICAgICAgICBBRFZBTkNFX1RPKEFmdGVyRE9DVFlQRVB1Ymxp Y0lkZW50aWZpZXJTdGF0ZSk7CiAgICAgICAgIGVsc2UgaWYgKGNjID09ICc+JykgewogICAgICAg ICAgICAgZW1pdFBhcnNlRXJyb3IoKTsKLSAgICAgICAgICAgIG5vdEltcGxlbWVudGVkKCk7Cisg ICAgICAgICAgICBtX3Rva2VuLT5zZXRGb3JjZVF1aXJrcygpOwogICAgICAgICAgICAgRU1JVF9B TkRfUkVTVU1FX0lOKERhdGFTdGF0ZSk7CiAgICAgICAgIH0gZWxzZSB7CiAgICAgICAgICAgICBt X3Rva2VuLT5hcHBlbmRUb1B1YmxpY0lkZW50aWZpZXIoY2MpOwpAQCAtMTQ5OSw3ICsxNDk5LDcg QEAgYm9vbCBIVE1MNUxleGVyOjpuZXh0VG9rZW4oU2VnbWVudGVkU3RyaW5nJiBzb3VyY2UsIEhU TUw1VG9rZW4mIHRva2VuKQogICAgICAgICAgICAgQURWQU5DRV9UTyhET0NUWVBFU3lzdGVtSWRl bnRpZmllclNpbmdsZVF1b3RlZFN0YXRlKTsKICAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAg IGVtaXRQYXJzZUVycm9yKCk7Ci0gICAgICAgICAgICBub3RJbXBsZW1lbnRlZCgpOworICAgICAg ICAgICAgbV90b2tlbi0+c2V0Rm9yY2VRdWlya3MoKTsKICAgICAgICAgICAgIEFEVkFOQ0VfVE8o Qm9ndXNET0NUWVBFU3RhdGUpOwogICAgICAgICB9CiAgICAgICAgIC8vIEZJWE1FOiBIYW5kbGUg RU9GIHByb3Blcmx5LgpAQCAtMTUxOSw3ICsxNTE5LDcgQEAgYm9vbCBIVE1MNUxleGVyOjpuZXh0 VG9rZW4oU2VnbWVudGVkU3RyaW5nJiBzb3VyY2UsIEhUTUw1VG9rZW4mIHRva2VuKQogICAgICAg ICAgICAgQURWQU5DRV9UTyhET0NUWVBFU3lzdGVtSWRlbnRpZmllclNpbmdsZVF1b3RlZFN0YXRl KTsKICAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAgIGVtaXRQYXJzZUVycm9yKCk7Ci0gICAg ICAgICAgICBub3RJbXBsZW1lbnRlZCgpOworICAgICAgICAgICAgbV90b2tlbi0+c2V0Rm9yY2VR dWlya3MoKTsKICAgICAgICAgICAgIEFEVkFOQ0VfVE8oQm9ndXNET0NUWVBFU3RhdGUpOwogICAg ICAgICB9CiAgICAgICAgIC8vIEZJWE1FOiBIYW5kbGUgRU9GIHByb3Blcmx5LgpAQCAtMTUzOSwx MSArMTUzOSwxMSBAQCBib29sIEhUTUw1TGV4ZXI6Om5leHRUb2tlbihTZWdtZW50ZWRTdHJpbmcm IHNvdXJjZSwgSFRNTDVUb2tlbiYgdG9rZW4pCiAgICAgICAgICAgICBBRFZBTkNFX1RPKERPQ1RZ UEVTeXN0ZW1JZGVudGlmaWVyU2luZ2xlUXVvdGVkU3RhdGUpOwogICAgICAgICB9IGVsc2UgaWYg KGNjID09ICc+JykgewogICAgICAgICAgICAgZW1pdFBhcnNlRXJyb3IoKTsKLSAgICAgICAgICAg IG5vdEltcGxlbWVudGVkKCk7CisgICAgICAgICAgICBtX3Rva2VuLT5zZXRGb3JjZVF1aXJrcygp OwogICAgICAgICAgICAgRU1JVF9BTkRfUkVTVU1FX0lOKERhdGFTdGF0ZSk7CiAgICAgICAgIH0g ZWxzZSB7CiAgICAgICAgICAgICBlbWl0UGFyc2VFcnJvcigpOwotICAgICAgICAgICAgbm90SW1w bGVtZW50ZWQoKTsKKyAgICAgICAgICAgIG1fdG9rZW4tPnNldEZvcmNlUXVpcmtzKCk7CiAgICAg ICAgICAgICBBRFZBTkNFX1RPKEJvZ3VzRE9DVFlQRVN0YXRlKTsKICAgICAgICAgfQogICAgICAg ICAvLyBGSVhNRTogSGFuZGxlIEVPRiBwcm9wZXJseS4KQEAgLTE1NjEsMTEgKzE1NjEsMTEgQEAg Ym9vbCBIVE1MNUxleGVyOjpuZXh0VG9rZW4oU2VnbWVudGVkU3RyaW5nJiBzb3VyY2UsIEhUTUw1 VG9rZW4mIHRva2VuKQogICAgICAgICAgICAgQURWQU5DRV9UTyhET0NUWVBFU3lzdGVtSWRlbnRp ZmllclNpbmdsZVF1b3RlZFN0YXRlKTsKICAgICAgICAgfSBlbHNlIGlmIChjYyA9PSAnPicpIHsK ICAgICAgICAgICAgIGVtaXRQYXJzZUVycm9yKCk7Ci0gICAgICAgICAgICBub3RJbXBsZW1lbnRl ZCgpOworICAgICAgICAgICAgbV90b2tlbi0+c2V0Rm9yY2VRdWlya3MoKTsKICAgICAgICAgICAg IEVNSVRfQU5EX1JFU1VNRV9JTihEYXRhU3RhdGUpOwogICAgICAgICB9IGVsc2UgewogICAgICAg ICAgICAgZW1pdFBhcnNlRXJyb3IoKTsKLSAgICAgICAgICAgIG5vdEltcGxlbWVudGVkKCk7Cisg ICAgICAgICAgICBtX3Rva2VuLT5zZXRGb3JjZVF1aXJrcygpOwogICAgICAgICAgICAgQURWQU5D RV9UTyhCb2d1c0RPQ1RZUEVTdGF0ZSk7CiAgICAgICAgIH0KICAgICAgICAgLy8gRklYTUU6IEhh bmRsZSBFT0YgcHJvcGVybHkuCkBAIC0xNTc3LDcgKzE1NzcsNyBAQCBib29sIEhUTUw1TGV4ZXI6 Om5leHRUb2tlbihTZWdtZW50ZWRTdHJpbmcmIHNvdXJjZSwgSFRNTDVUb2tlbiYgdG9rZW4pCiAg ICAgICAgICAgICBBRFZBTkNFX1RPKEFmdGVyRE9DVFlQRVN5c3RlbUlkZW50aWZpZXJTdGF0ZSk7 CiAgICAgICAgIGVsc2UgaWYgKGNjID09ICc+JykgewogICAgICAgICAgICAgZW1pdFBhcnNlRXJy b3IoKTsKLSAgICAgICAgICAgIG5vdEltcGxlbWVudGVkKCk7CisgICAgICAgICAgICBtX3Rva2Vu LT5zZXRGb3JjZVF1aXJrcygpOwogICAgICAgICAgICAgRU1JVF9BTkRfUkVTVU1FX0lOKERhdGFT dGF0ZSk7CiAgICAgICAgIH0gZWxzZSB7CiAgICAgICAgICAgICBtX3Rva2VuLT5hcHBlbmRUb1N5 c3RlbUlkZW50aWZpZXIoY2MpOwpAQCAtMTU5Miw3ICsxNTkyLDcgQEAgYm9vbCBIVE1MNUxleGVy OjpuZXh0VG9rZW4oU2VnbWVudGVkU3RyaW5nJiBzb3VyY2UsIEhUTUw1VG9rZW4mIHRva2VuKQog ICAgICAgICAgICAgQURWQU5DRV9UTyhBZnRlckRPQ1RZUEVTeXN0ZW1JZGVudGlmaWVyU3RhdGUp OwogICAgICAgICBlbHNlIGlmIChjYyA9PSAnPicpIHsKICAgICAgICAgICAgIGVtaXRQYXJzZUVy cm9yKCk7Ci0gICAgICAgICAgICBub3RJbXBsZW1lbnRlZCgpOworICAgICAgICAgICAgbV90b2tl bi0+c2V0Rm9yY2VRdWlya3MoKTsKICAgICAgICAgICAgIEVNSVRfQU5EX1JFU1VNRV9JTihEYXRh U3RhdGUpOwogICAgICAgICB9IGVsc2UgewogICAgICAgICAgICAgbV90b2tlbi0+YXBwZW5kVG9T eXN0ZW1JZGVudGlmaWVyKGNjKTsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaHRtbC9IVE1MNVRva2Vu LmggYi9XZWJDb3JlL2h0bWwvSFRNTDVUb2tlbi5oCmluZGV4IDFiNWVlOWE5OTZiNGEyNTliMzky YmI4Y2FlNjNjZDNiZTM1NzU5YWYuLjZiMGZkYzgxOTAzYjUwNGNiZjlmNDc0NzU2NDBiNzhmMjg1 MDY0YmIgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaHRtbC9IVE1MNVRva2VuLmgKKysrIGIvV2ViQ29y ZS9odG1sL0hUTUw1VG9rZW4uaApAQCAtMjEyLDYgKzIxMiwxOCBAQCBwdWJsaWM6CiAgICAgICAg IG1fZG9jdHlwZURhdGEtPm1fc3lzdGVtSWRlbnRpZmllci5jbGVhcigpOwogICAgIH0KIAorICAg IGJvb2wgZm9yY2VRdWlya3MoKQorICAgIHsKKyAgICAgICAgQVNTRVJUKG1fdHlwZSA9PSBET0NU WVBFKTsKKyAgICAgICAgcmV0dXJuIG1fZG9jdHlwZURhdGEtPm1fZm9yY2VRdWlya3M7CisgICAg fQorCisgICAgdm9pZCBzZXRGb3JjZVF1aXJrcygpCisgICAgeworICAgICAgICBBU1NFUlQobV90 eXBlID09IERPQ1RZUEUpOworICAgICAgICBtX2RvY3R5cGVEYXRhLT5tX2ZvcmNlUXVpcmtzID0g dHJ1ZTsKKyAgICB9CisKICAgICB2b2lkIGFwcGVuZFRvUHVibGljSWRlbnRpZmllcihVQ2hhciBj aGFyYWN0ZXIpCiAgICAgewogICAgICAgICBBU1NFUlQobV90eXBlID09IERPQ1RZUEUpOwpkaWZm IC0tZ2l0IGEvV2ViQ29yZS9odG1sL0hUTUw1VHJlZUJ1aWxkZXIuY3BwIGIvV2ViQ29yZS9odG1s L0hUTUw1VHJlZUJ1aWxkZXIuY3BwCmluZGV4IGQ5OTc2NWEyNGM4MzA1YzNkMzE4OWM4ODYyYTM4 MDViMDJiZjM2NjguLjk1ODFhNmM5ZmViMzkyYjZhMjJmN2IzMGFjN2U1YzUyOTM5MTE5MGYgMTAw NjQ0Ci0tLSBhL1dlYkNvcmUvaHRtbC9IVE1MNVRyZWVCdWlsZGVyLmNwcAorKysgYi9XZWJDb3Jl L2h0bWwvSFRNTDVUcmVlQnVpbGRlci5jcHAKQEAgLTEzOCw2ICsxMzgsNyBAQCBQYXNzUmVmUHRy PE5vZGU+IEhUTUw1VHJlZUJ1aWxkZXI6OnBhc3NUb2tlblRvTGVnYWN5UGFyc2VyKEhUTUw1VG9r ZW4mIHRva2VuKQogICAgICAgICBkb2N0eXBlVG9rZW4ubV9uYW1lLmFwcGVuZCh0b2tlbi5uYW1l KCkuZGF0YSgpLCB0b2tlbi5uYW1lKCkuc2l6ZSgpKTsKICAgICAgICAgZG9jdHlwZVRva2VuLm1f cHVibGljSUQgPSB0b2tlbi5wdWJsaWNJZGVudGlmaWVyKCk7CiAgICAgICAgIGRvY3R5cGVUb2tl bi5tX3N5c3RlbUlEID0gdG9rZW4uc3lzdGVtSWRlbnRpZmllcigpOworICAgICAgICBkb2N0eXBl VG9rZW4ubV9mb3JjZVF1aXJrcyA9IHRva2VuLmZvcmNlUXVpcmtzKCk7CiAKICAgICAgICAgbV9s ZWdhY3lIVE1MUGFyc2VyLT5wYXJzZURvY3R5cGVUb2tlbigmZG9jdHlwZVRva2VuKTsKICAgICAg ICAgcmV0dXJuIDA7CmRpZmYgLS1naXQgYS9XZWJDb3JlL2h0bWwvSFRNTFBhcnNlci5jcHAgYi9X ZWJDb3JlL2h0bWwvSFRNTFBhcnNlci5jcHAKaW5kZXggZGQ4MjJjZjdjMjU0MjE0ZjA1ZWYwODU5 YzExZWMwMTcyMWE3ZmNhNy4uNDVhMGFhZDg0NGQwZmY2YmI1NzYwYWM3YjU1ZGIyNmY4MWE5ZmYx MCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9odG1sL0hUTUxQYXJzZXIuY3BwCisrKyBiL1dlYkNvcmUv aHRtbC9IVE1MUGFyc2VyLmNwcApAQCAtMzQzLDkgKzM0MywxMSBAQCB2b2lkIEhUTUxQYXJzZXI6 OnBhcnNlRG9jdHlwZVRva2VuKERvY3R5cGVUb2tlbiogdCkKICAgICAvLyBJZ25vcmUgYW55IGRv Y3R5cGUgYWZ0ZXIgdGhlIGZpcnN0LiAgSWdub3JlIGRvY3R5cGVzIGluIGZyYWdtZW50cy4KICAg ICBpZiAobV9kb2N1bWVudC0+ZG9jdHlwZSgpIHx8IG1faXNQYXJzaW5nRnJhZ21lbnQgfHwgbV9j dXJyZW50ICE9IG1fZG9jdW1lbnQpCiAgICAgICAgIHJldHVybjsKLSAgICAgICAgCisKICAgICAv LyBNYWtlIGEgbmV3IGRvY3R5cGUgbm9kZSBhbmQgc2V0IGl0IGFzIG91ciBkb2N0eXBlLgogICAg IG1fZG9jdW1lbnQtPmFkZENoaWxkKERvY3VtZW50VHlwZTo6Y3JlYXRlKG1fZG9jdW1lbnQsIFN0 cmluZzo6YWRvcHQodC0+bV9uYW1lKSwgU3RyaW5nOjphZG9wdCh0LT5tX3B1YmxpY0lEKSwgU3Ry aW5nOjphZG9wdCh0LT5tX3N5c3RlbUlEKSkpOworICAgIGlmICh0LT5tX2ZvcmNlUXVpcmtzKQor ICAgICAgICBtX2RvY3VtZW50LT5zZXRQYXJzZU1vZGUoRG9jdW1lbnQ6OkNvbXBhdCk7CiB9CiAK IHN0YXRpYyBib29sIGlzVGFibGVTZWN0aW9uKGNvbnN0IE5vZGUqIG4pCmRpZmYgLS1naXQgYS9X ZWJDb3JlL2h0bWwvSFRNTFRva2VuaXplci5oIGIvV2ViQ29yZS9odG1sL0hUTUxUb2tlbml6ZXIu aAppbmRleCBkYzAzY2YyNWQ4OTk2ZDg5NzZiNmRjNGJmNzM1NGU0ZTljNjgzYmE2Li43ZGYzZWNi Y2EzMjAzMDI3OGIxYWQxMzA0YmMwY2JhMzljMzQxZDNlIDEwMDY0NAotLS0gYS9XZWJDb3JlL2h0 bWwvSFRNTFRva2VuaXplci5oCisrKyBiL1dlYkNvcmUvaHRtbC9IVE1MVG9rZW5pemVyLmgKQEAg LTExNyw2ICsxMTcsNyBAQCBwdWJsaWM6CiAgICAgICAgIG1fc3lzdGVtSUQuY2xlYXIoKTsKICAg ICAgICAgbV9zdGF0ZSA9IERvY3R5cGVCZWdpbjsKICAgICAgICAgbV9zb3VyY2UuY2xlYXIoKTsK KyAgICAgICAgbV9mb3JjZVF1aXJrcyA9IGZhbHNlOwogICAgIH0KIAogICAgIERvY3R5cGVTdGF0 ZSBzdGF0ZSgpIHsgcmV0dXJuIG1fc3RhdGU7IH0KQEAgLTEyNiw4ICsxMjcsMTAgQEAgcHVibGlj OgogICAgIFZlY3RvcjxVQ2hhcj4gbV9wdWJsaWNJRDsKICAgICBWZWN0b3I8VUNoYXI+IG1fc3lz dGVtSUQ7CiAgICAgRG9jdHlwZVN0YXRlIG1fc3RhdGU7Ci0gICAgCisKICAgICBWZWN0b3I8VUNo YXI+IG1fc291cmNlOworCisgICAgYm9vbCBtX2ZvcmNlUXVpcmtzOyAvLyBVc2VkIGJ5IHRoZSBI VE1MNSBwYXJzZXIuCiB9OwogCiAvLy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCg== 58120 2010-06-08 00:04:14 -0700 2010-06-08 00:04:14 -0700 Patch for landing bug-40284-20100608000413.patch text/plain 10183 abarth ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MmUwNzM1NjIyZjg2ZDcyMGE2MWU1MTZmNWE1ZDgwYjQ1ZWRjMzU2OS4uNmRiYmI1ZGNjYTU2MThj MWQ5YWViNzNjZjJiOGM1ODRhMjM2ODNiNSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsNiArMSwzNCBAQAogMjAxMC0wNi0wNyAgQWRh bSBCYXJ0aCAgPGFiYXJ0aEB3ZWJraXQub3JnPgogCi0gICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorICAgICAgICBSZXZpZXdlZCBieSBFcmljIFNlaWRlbC4KKworICAgICAgICBJ bXBsZW1lbnQgSFRNTDUncyBmb3JjZVF1aXJrcyBmbGFnCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00MDI4NAorCisgICAgICAgIEkgZGlkbid0IGltcGxl bWVudCB0aGlzIGJlZm9yZSBiZWNhdXNlIEkgZGlkbid0IGtub3cgaG93IHRvIHRlc3QgaXQsCisg ICAgICAgIGJ1dCBub3cgSSBkby4KKyAgICAgICAgCisgICAgICAgIFRlc3RzOgorICAgICAgICAg ICogZmFzdC9kb2N0eXBlcy9kb2N0eXBlLXBhcnNpbmcuaHRtbC4KKworICAgICAgICBXaGVuIHdl IGFjdHVhbGx5IGltcGxlbWVudCB0aGUgcXVpcmtzIG1vZGUgaGFuZGxpbmcgaW4gdGhlIHRyZWUK KyAgICAgICAgYnVpbGRlciwgd2UnbGwgcHJvYmFibHkgd2FudCB0byBhZGQgdG8gdGhpcyB0ZXN0 LgorCisgICAgICAgICogaHRtbC9IVE1MNUxleGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkhU TUw1TGV4ZXI6Om5leHRUb2tlbik6CisgICAgICAgICogaHRtbC9IVE1MNVRva2VuLmg6CisgICAg ICAgIChXZWJDb3JlOjpIVE1MNVRva2VuOjpmb3JjZVF1aXJrcyk6CisgICAgICAgIChXZWJDb3Jl OjpIVE1MNVRva2VuOjpzZXRGb3JjZVF1aXJrcyk6CisgICAgICAgICogaHRtbC9IVE1MNVRyZWVC dWlsZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkhUTUw1VHJlZUJ1aWxkZXI6OnBhc3NUb2tl blRvTGVnYWN5UGFyc2VyKToKKyAgICAgICAgKiBodG1sL0hUTUxQYXJzZXIuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6SFRNTFBhcnNlcjo6cGFyc2VEb2N0eXBlVG9rZW4pOgorICAgICAgICAqIGh0 bWwvSFRNTFRva2VuaXplci5oOgorICAgICAgICAoV2ViQ29yZTo6RG9jdHlwZVRva2VuOjpyZXNl dCk6CisKKzIwMTAtMDYtMDcgIEFkYW0gQmFydGggIDxhYmFydGhAd2Via2l0Lm9yZz4KKworICAg ICAgICBSZXZpZXdlZCBieSBFcmljIFNlaWRlbC4KIAogICAgICAgICBSZW1vdmUgQVNTRVJUIGlu IH5IVE1MNVRva2VuaXplcgogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9NDAyODIKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaHRtbC9IVE1MNUxleGVyLmNwcCBi L1dlYkNvcmUvaHRtbC9IVE1MNUxleGVyLmNwcAppbmRleCBhMjJjYmQ5Y2FmZDBiNGNhNDM2YzU0 ZGFmNTYzZjRlZTIxODlkZjY0Li5kNDYyNWYyNTc5ZGNlMDczNTA3NGRjZjMzOTQ4OWNmNzlmNzkw YjQ1IDEwMDY0NAotLS0gYS9XZWJDb3JlL2h0bWwvSFRNTDVMZXhlci5jcHAKKysrIGIvV2ViQ29y ZS9odG1sL0hUTUw1TGV4ZXIuY3BwCkBAIC0xMzUxLDcgKzEzNTEsNyBAQCBib29sIEhUTUw1TGV4 ZXI6Om5leHRUb2tlbihTZWdtZW50ZWRTdHJpbmcmIHNvdXJjZSwgSFRNTDVUb2tlbiYgdG9rZW4p CiAgICAgICAgIH0gZWxzZSBpZiAoY2MgPT0gJz4nKSB7CiAgICAgICAgICAgICBlbWl0UGFyc2VF cnJvcigpOwogICAgICAgICAgICAgbV90b2tlbi0+YmVnaW5ET0NUWVBFKCk7Ci0gICAgICAgICAg ICBub3RJbXBsZW1lbnRlZCgpOworICAgICAgICAgICAgbV90b2tlbi0+c2V0Rm9yY2VRdWlya3Mo KTsKICAgICAgICAgICAgIEVNSVRfQU5EX1JFU1VNRV9JTihEYXRhU3RhdGUpOwogICAgICAgICB9 IGVsc2UgewogICAgICAgICAgICAgbV90b2tlbi0+YmVnaW5ET0NUWVBFKGNjKTsKQEAgLTE0MDEs NyArMTQwMSw3IEBAIGJvb2wgSFRNTDVMZXhlcjo6bmV4dFRva2VuKFNlZ21lbnRlZFN0cmluZyYg c291cmNlLCBIVE1MNVRva2VuJiB0b2tlbikKICAgICAgICAgICAgICAgICAgICAgcmV0dXJuIHNo b3VsZEVtaXRCdWZmZXJlZENoYXJhY3RlclRva2VuKHNvdXJjZSk7CiAgICAgICAgICAgICB9CiAg ICAgICAgICAgICBlbWl0UGFyc2VFcnJvcigpOwotICAgICAgICAgICAgbm90SW1wbGVtZW50ZWQo KTsKKyAgICAgICAgICAgIG1fdG9rZW4tPnNldEZvcmNlUXVpcmtzKCk7CiAgICAgICAgICAgICBB RFZBTkNFX1RPKEJvZ3VzRE9DVFlQRVN0YXRlKTsKICAgICAgICAgfQogICAgICAgICAvLyBGSVhN RTogSGFuZGxlIEVPRiBwcm9wZXJseS4KQEAgLTE0MjEsMTEgKzE0MjEsMTEgQEAgYm9vbCBIVE1M NUxleGVyOjpuZXh0VG9rZW4oU2VnbWVudGVkU3RyaW5nJiBzb3VyY2UsIEhUTUw1VG9rZW4mIHRv a2VuKQogICAgICAgICAgICAgQURWQU5DRV9UTyhET0NUWVBFUHVibGljSWRlbnRpZmllclNpbmds ZVF1b3RlZFN0YXRlKTsKICAgICAgICAgfSBlbHNlIGlmIChjYyA9PSAnPicpIHsKICAgICAgICAg ICAgIGVtaXRQYXJzZUVycm9yKCk7Ci0gICAgICAgICAgICBub3RJbXBsZW1lbnRlZCgpOworICAg ICAgICAgICAgbV90b2tlbi0+c2V0Rm9yY2VRdWlya3MoKTsKICAgICAgICAgICAgIEVNSVRfQU5E X1JFU1VNRV9JTihEYXRhU3RhdGUpOwogICAgICAgICB9IGVsc2UgewogICAgICAgICAgICAgZW1p dFBhcnNlRXJyb3IoKTsKLSAgICAgICAgICAgIG5vdEltcGxlbWVudGVkKCk7CisgICAgICAgICAg ICBtX3Rva2VuLT5zZXRGb3JjZVF1aXJrcygpOwogICAgICAgICAgICAgQURWQU5DRV9UTyhCb2d1 c0RPQ1RZUEVTdGF0ZSk7CiAgICAgICAgIH0KICAgICAgICAgLy8gRklYTUU6IEhhbmRsZSBFT0Yg cHJvcGVybHkuCkBAIC0xNDQzLDExICsxNDQzLDExIEBAIGJvb2wgSFRNTDVMZXhlcjo6bmV4dFRv a2VuKFNlZ21lbnRlZFN0cmluZyYgc291cmNlLCBIVE1MNVRva2VuJiB0b2tlbikKICAgICAgICAg ICAgIEFEVkFOQ0VfVE8oRE9DVFlQRVB1YmxpY0lkZW50aWZpZXJTaW5nbGVRdW90ZWRTdGF0ZSk7 CiAgICAgICAgIH0gZWxzZSBpZiAoY2MgPT0gJz4nKSB7CiAgICAgICAgICAgICBlbWl0UGFyc2VF cnJvcigpOwotICAgICAgICAgICAgbm90SW1wbGVtZW50ZWQoKTsKKyAgICAgICAgICAgIG1fdG9r ZW4tPnNldEZvcmNlUXVpcmtzKCk7CiAgICAgICAgICAgICBFTUlUX0FORF9SRVNVTUVfSU4oRGF0 YVN0YXRlKTsKICAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAgIGVtaXRQYXJzZUVycm9yKCk7 Ci0gICAgICAgICAgICBub3RJbXBsZW1lbnRlZCgpOworICAgICAgICAgICAgbV90b2tlbi0+c2V0 Rm9yY2VRdWlya3MoKTsKICAgICAgICAgICAgIEFEVkFOQ0VfVE8oQm9ndXNET0NUWVBFU3RhdGUp OwogICAgICAgICB9CiAgICAgICAgIC8vIEZJWE1FOiBIYW5kbGUgRU9GIHByb3Blcmx5LgpAQCAt MTQ1OSw3ICsxNDU5LDcgQEAgYm9vbCBIVE1MNUxleGVyOjpuZXh0VG9rZW4oU2VnbWVudGVkU3Ry aW5nJiBzb3VyY2UsIEhUTUw1VG9rZW4mIHRva2VuKQogICAgICAgICAgICAgQURWQU5DRV9UTyhB ZnRlckRPQ1RZUEVQdWJsaWNJZGVudGlmaWVyU3RhdGUpOwogICAgICAgICBlbHNlIGlmIChjYyA9 PSAnPicpIHsKICAgICAgICAgICAgIGVtaXRQYXJzZUVycm9yKCk7Ci0gICAgICAgICAgICBub3RJ bXBsZW1lbnRlZCgpOworICAgICAgICAgICAgbV90b2tlbi0+c2V0Rm9yY2VRdWlya3MoKTsKICAg ICAgICAgICAgIEVNSVRfQU5EX1JFU1VNRV9JTihEYXRhU3RhdGUpOwogICAgICAgICB9IGVsc2Ug ewogICAgICAgICAgICAgbV90b2tlbi0+YXBwZW5kVG9QdWJsaWNJZGVudGlmaWVyKGNjKTsKQEAg LTE0NzQsNyArMTQ3NCw3IEBAIGJvb2wgSFRNTDVMZXhlcjo6bmV4dFRva2VuKFNlZ21lbnRlZFN0 cmluZyYgc291cmNlLCBIVE1MNVRva2VuJiB0b2tlbikKICAgICAgICAgICAgIEFEVkFOQ0VfVE8o QWZ0ZXJET0NUWVBFUHVibGljSWRlbnRpZmllclN0YXRlKTsKICAgICAgICAgZWxzZSBpZiAoY2Mg PT0gJz4nKSB7CiAgICAgICAgICAgICBlbWl0UGFyc2VFcnJvcigpOwotICAgICAgICAgICAgbm90 SW1wbGVtZW50ZWQoKTsKKyAgICAgICAgICAgIG1fdG9rZW4tPnNldEZvcmNlUXVpcmtzKCk7CiAg ICAgICAgICAgICBFTUlUX0FORF9SRVNVTUVfSU4oRGF0YVN0YXRlKTsKICAgICAgICAgfSBlbHNl IHsKICAgICAgICAgICAgIG1fdG9rZW4tPmFwcGVuZFRvUHVibGljSWRlbnRpZmllcihjYyk7CkBA IC0xNDk5LDcgKzE0OTksNyBAQCBib29sIEhUTUw1TGV4ZXI6Om5leHRUb2tlbihTZWdtZW50ZWRT dHJpbmcmIHNvdXJjZSwgSFRNTDVUb2tlbiYgdG9rZW4pCiAgICAgICAgICAgICBBRFZBTkNFX1RP KERPQ1RZUEVTeXN0ZW1JZGVudGlmaWVyU2luZ2xlUXVvdGVkU3RhdGUpOwogICAgICAgICB9IGVs c2UgewogICAgICAgICAgICAgZW1pdFBhcnNlRXJyb3IoKTsKLSAgICAgICAgICAgIG5vdEltcGxl bWVudGVkKCk7CisgICAgICAgICAgICBtX3Rva2VuLT5zZXRGb3JjZVF1aXJrcygpOwogICAgICAg ICAgICAgQURWQU5DRV9UTyhCb2d1c0RPQ1RZUEVTdGF0ZSk7CiAgICAgICAgIH0KICAgICAgICAg Ly8gRklYTUU6IEhhbmRsZSBFT0YgcHJvcGVybHkuCkBAIC0xNTE5LDcgKzE1MTksNyBAQCBib29s IEhUTUw1TGV4ZXI6Om5leHRUb2tlbihTZWdtZW50ZWRTdHJpbmcmIHNvdXJjZSwgSFRNTDVUb2tl biYgdG9rZW4pCiAgICAgICAgICAgICBBRFZBTkNFX1RPKERPQ1RZUEVTeXN0ZW1JZGVudGlmaWVy U2luZ2xlUXVvdGVkU3RhdGUpOwogICAgICAgICB9IGVsc2UgewogICAgICAgICAgICAgZW1pdFBh cnNlRXJyb3IoKTsKLSAgICAgICAgICAgIG5vdEltcGxlbWVudGVkKCk7CisgICAgICAgICAgICBt X3Rva2VuLT5zZXRGb3JjZVF1aXJrcygpOwogICAgICAgICAgICAgQURWQU5DRV9UTyhCb2d1c0RP Q1RZUEVTdGF0ZSk7CiAgICAgICAgIH0KICAgICAgICAgLy8gRklYTUU6IEhhbmRsZSBFT0YgcHJv cGVybHkuCkBAIC0xNTM5LDExICsxNTM5LDExIEBAIGJvb2wgSFRNTDVMZXhlcjo6bmV4dFRva2Vu KFNlZ21lbnRlZFN0cmluZyYgc291cmNlLCBIVE1MNVRva2VuJiB0b2tlbikKICAgICAgICAgICAg IEFEVkFOQ0VfVE8oRE9DVFlQRVN5c3RlbUlkZW50aWZpZXJTaW5nbGVRdW90ZWRTdGF0ZSk7CiAg ICAgICAgIH0gZWxzZSBpZiAoY2MgPT0gJz4nKSB7CiAgICAgICAgICAgICBlbWl0UGFyc2VFcnJv cigpOwotICAgICAgICAgICAgbm90SW1wbGVtZW50ZWQoKTsKKyAgICAgICAgICAgIG1fdG9rZW4t PnNldEZvcmNlUXVpcmtzKCk7CiAgICAgICAgICAgICBFTUlUX0FORF9SRVNVTUVfSU4oRGF0YVN0 YXRlKTsKICAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAgIGVtaXRQYXJzZUVycm9yKCk7Ci0g ICAgICAgICAgICBub3RJbXBsZW1lbnRlZCgpOworICAgICAgICAgICAgbV90b2tlbi0+c2V0Rm9y Y2VRdWlya3MoKTsKICAgICAgICAgICAgIEFEVkFOQ0VfVE8oQm9ndXNET0NUWVBFU3RhdGUpOwog ICAgICAgICB9CiAgICAgICAgIC8vIEZJWE1FOiBIYW5kbGUgRU9GIHByb3Blcmx5LgpAQCAtMTU2 MSwxMSArMTU2MSwxMSBAQCBib29sIEhUTUw1TGV4ZXI6Om5leHRUb2tlbihTZWdtZW50ZWRTdHJp bmcmIHNvdXJjZSwgSFRNTDVUb2tlbiYgdG9rZW4pCiAgICAgICAgICAgICBBRFZBTkNFX1RPKERP Q1RZUEVTeXN0ZW1JZGVudGlmaWVyU2luZ2xlUXVvdGVkU3RhdGUpOwogICAgICAgICB9IGVsc2Ug aWYgKGNjID09ICc+JykgewogICAgICAgICAgICAgZW1pdFBhcnNlRXJyb3IoKTsKLSAgICAgICAg ICAgIG5vdEltcGxlbWVudGVkKCk7CisgICAgICAgICAgICBtX3Rva2VuLT5zZXRGb3JjZVF1aXJr cygpOwogICAgICAgICAgICAgRU1JVF9BTkRfUkVTVU1FX0lOKERhdGFTdGF0ZSk7CiAgICAgICAg IH0gZWxzZSB7CiAgICAgICAgICAgICBlbWl0UGFyc2VFcnJvcigpOwotICAgICAgICAgICAgbm90 SW1wbGVtZW50ZWQoKTsKKyAgICAgICAgICAgIG1fdG9rZW4tPnNldEZvcmNlUXVpcmtzKCk7CiAg ICAgICAgICAgICBBRFZBTkNFX1RPKEJvZ3VzRE9DVFlQRVN0YXRlKTsKICAgICAgICAgfQogICAg ICAgICAvLyBGSVhNRTogSGFuZGxlIEVPRiBwcm9wZXJseS4KQEAgLTE1NzcsNyArMTU3Nyw3IEBA IGJvb2wgSFRNTDVMZXhlcjo6bmV4dFRva2VuKFNlZ21lbnRlZFN0cmluZyYgc291cmNlLCBIVE1M NVRva2VuJiB0b2tlbikKICAgICAgICAgICAgIEFEVkFOQ0VfVE8oQWZ0ZXJET0NUWVBFU3lzdGVt SWRlbnRpZmllclN0YXRlKTsKICAgICAgICAgZWxzZSBpZiAoY2MgPT0gJz4nKSB7CiAgICAgICAg ICAgICBlbWl0UGFyc2VFcnJvcigpOwotICAgICAgICAgICAgbm90SW1wbGVtZW50ZWQoKTsKKyAg ICAgICAgICAgIG1fdG9rZW4tPnNldEZvcmNlUXVpcmtzKCk7CiAgICAgICAgICAgICBFTUlUX0FO RF9SRVNVTUVfSU4oRGF0YVN0YXRlKTsKICAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAgIG1f dG9rZW4tPmFwcGVuZFRvU3lzdGVtSWRlbnRpZmllcihjYyk7CkBAIC0xNTkyLDcgKzE1OTIsNyBA QCBib29sIEhUTUw1TGV4ZXI6Om5leHRUb2tlbihTZWdtZW50ZWRTdHJpbmcmIHNvdXJjZSwgSFRN TDVUb2tlbiYgdG9rZW4pCiAgICAgICAgICAgICBBRFZBTkNFX1RPKEFmdGVyRE9DVFlQRVN5c3Rl bUlkZW50aWZpZXJTdGF0ZSk7CiAgICAgICAgIGVsc2UgaWYgKGNjID09ICc+JykgewogICAgICAg ICAgICAgZW1pdFBhcnNlRXJyb3IoKTsKLSAgICAgICAgICAgIG5vdEltcGxlbWVudGVkKCk7Cisg ICAgICAgICAgICBtX3Rva2VuLT5zZXRGb3JjZVF1aXJrcygpOwogICAgICAgICAgICAgRU1JVF9B TkRfUkVTVU1FX0lOKERhdGFTdGF0ZSk7CiAgICAgICAgIH0gZWxzZSB7CiAgICAgICAgICAgICBt X3Rva2VuLT5hcHBlbmRUb1N5c3RlbUlkZW50aWZpZXIoY2MpOwpkaWZmIC0tZ2l0IGEvV2ViQ29y ZS9odG1sL0hUTUw1VG9rZW4uaCBiL1dlYkNvcmUvaHRtbC9IVE1MNVRva2VuLmgKaW5kZXggMWI1 ZWU5YTk5NmI0YTI1OWIzOTJiYjhjYWU2M2NkM2JlMzU3NTlhZi4uNmIwZmRjODE5MDNiNTA0Y2Jm OWY0NzQ3NTY0MGI3OGYyODUwNjRiYiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9odG1sL0hUTUw1VG9r ZW4uaAorKysgYi9XZWJDb3JlL2h0bWwvSFRNTDVUb2tlbi5oCkBAIC0yMTIsNiArMjEyLDE4IEBA IHB1YmxpYzoKICAgICAgICAgbV9kb2N0eXBlRGF0YS0+bV9zeXN0ZW1JZGVudGlmaWVyLmNsZWFy KCk7CiAgICAgfQogCisgICAgYm9vbCBmb3JjZVF1aXJrcygpCisgICAgeworICAgICAgICBBU1NF UlQobV90eXBlID09IERPQ1RZUEUpOworICAgICAgICByZXR1cm4gbV9kb2N0eXBlRGF0YS0+bV9m b3JjZVF1aXJrczsKKyAgICB9CisKKyAgICB2b2lkIHNldEZvcmNlUXVpcmtzKCkKKyAgICB7Cisg ICAgICAgIEFTU0VSVChtX3R5cGUgPT0gRE9DVFlQRSk7CisgICAgICAgIG1fZG9jdHlwZURhdGEt Pm1fZm9yY2VRdWlya3MgPSB0cnVlOworICAgIH0KKwogICAgIHZvaWQgYXBwZW5kVG9QdWJsaWNJ ZGVudGlmaWVyKFVDaGFyIGNoYXJhY3RlcikKICAgICB7CiAgICAgICAgIEFTU0VSVChtX3R5cGUg PT0gRE9DVFlQRSk7CmRpZmYgLS1naXQgYS9XZWJDb3JlL2h0bWwvSFRNTDVUcmVlQnVpbGRlci5j cHAgYi9XZWJDb3JlL2h0bWwvSFRNTDVUcmVlQnVpbGRlci5jcHAKaW5kZXggZDk5NzY1YTI0Yzgz MDVjM2QzMTg5Yzg4NjJhMzgwNWIwMmJmMzY2OC4uOTU4MWE2YzlmZWIzOTJiNmEyMmY3YjMwYWM3 ZTVjNTI5MzkxMTkwZiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9odG1sL0hUTUw1VHJlZUJ1aWxkZXIu Y3BwCisrKyBiL1dlYkNvcmUvaHRtbC9IVE1MNVRyZWVCdWlsZGVyLmNwcApAQCAtMTM4LDYgKzEz OCw3IEBAIFBhc3NSZWZQdHI8Tm9kZT4gSFRNTDVUcmVlQnVpbGRlcjo6cGFzc1Rva2VuVG9MZWdh Y3lQYXJzZXIoSFRNTDVUb2tlbiYgdG9rZW4pCiAgICAgICAgIGRvY3R5cGVUb2tlbi5tX25hbWUu YXBwZW5kKHRva2VuLm5hbWUoKS5kYXRhKCksIHRva2VuLm5hbWUoKS5zaXplKCkpOwogICAgICAg ICBkb2N0eXBlVG9rZW4ubV9wdWJsaWNJRCA9IHRva2VuLnB1YmxpY0lkZW50aWZpZXIoKTsKICAg ICAgICAgZG9jdHlwZVRva2VuLm1fc3lzdGVtSUQgPSB0b2tlbi5zeXN0ZW1JZGVudGlmaWVyKCk7 CisgICAgICAgIGRvY3R5cGVUb2tlbi5tX2ZvcmNlUXVpcmtzID0gdG9rZW4uZm9yY2VRdWlya3Mo KTsKIAogICAgICAgICBtX2xlZ2FjeUhUTUxQYXJzZXItPnBhcnNlRG9jdHlwZVRva2VuKCZkb2N0 eXBlVG9rZW4pOwogICAgICAgICByZXR1cm4gMDsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaHRtbC9I VE1MUGFyc2VyLmNwcCBiL1dlYkNvcmUvaHRtbC9IVE1MUGFyc2VyLmNwcAppbmRleCBkZDgyMmNm N2MyNTQyMTRmMDVlZjA4NTljMTFlYzAxNzIxYTdmY2E3Li5hZTk2MjQ1Y2MzNzg0MmY1NDA3MTdj MmEwMzE1ZDRlMmRmYWQzZTVlIDEwMDY0NAotLS0gYS9XZWJDb3JlL2h0bWwvSFRNTFBhcnNlci5j cHAKKysrIGIvV2ViQ29yZS9odG1sL0hUTUxQYXJzZXIuY3BwCkBAIC0zNDMsOSArMzQzLDE1IEBA IHZvaWQgSFRNTFBhcnNlcjo6cGFyc2VEb2N0eXBlVG9rZW4oRG9jdHlwZVRva2VuKiB0KQogICAg IC8vIElnbm9yZSBhbnkgZG9jdHlwZSBhZnRlciB0aGUgZmlyc3QuICBJZ25vcmUgZG9jdHlwZXMg aW4gZnJhZ21lbnRzLgogICAgIGlmIChtX2RvY3VtZW50LT5kb2N0eXBlKCkgfHwgbV9pc1BhcnNp bmdGcmFnbWVudCB8fCBtX2N1cnJlbnQgIT0gbV9kb2N1bWVudCkKICAgICAgICAgcmV0dXJuOwot ICAgICAgICAKKwogICAgIC8vIE1ha2UgYSBuZXcgZG9jdHlwZSBub2RlIGFuZCBzZXQgaXQgYXMg b3VyIGRvY3R5cGUuCiAgICAgbV9kb2N1bWVudC0+YWRkQ2hpbGQoRG9jdW1lbnRUeXBlOjpjcmVh dGUobV9kb2N1bWVudCwgU3RyaW5nOjphZG9wdCh0LT5tX25hbWUpLCBTdHJpbmc6OmFkb3B0KHQt Pm1fcHVibGljSUQpLCBTdHJpbmc6OmFkb3B0KHQtPm1fc3lzdGVtSUQpKSk7CisgICAgLy8gVGhl IG9sZCBwYXJzZXIgY29tcHV0ZXMgdGhlIHBhcnNlIG1vZGUgaW4gSFRNTERvY3VtZW50OjpkZXRl cm1pbmVQYXJzZU1vZGUsCisgICAgLy8gYnV0IHRoYXQgbG9naWMgc2hvdWxkIHJlYWxseSBiZSBp biB0aGUgcGFyc2VyLCBhcyBub3RlZCBpbiBkZXRlcm1pbmVQYXJzZU1vZGUuCisgICAgLy8gSW4g dGhlIEhUTUw1IHBhcnNpbmcgYWxnb3JpdGhtLCB0aGUgY29tcGF0IG1vZGUgaXMgY29tcHV0ZWQg YXQgdGhpcyBwb2ludC4KKyAgICAvLyBUaGUgY29kZSBiZWxvdyBpcyB0aGUgYmVnaW5uaW5ncyBv ZiB0aGF0IGltcGxlbWVudGF0aW9uLgorICAgIGlmICh0LT5tX2ZvcmNlUXVpcmtzKQorICAgICAg ICBtX2RvY3VtZW50LT5zZXRQYXJzZU1vZGUoRG9jdW1lbnQ6OkNvbXBhdCk7CiB9CiAKIHN0YXRp YyBib29sIGlzVGFibGVTZWN0aW9uKGNvbnN0IE5vZGUqIG4pCmRpZmYgLS1naXQgYS9XZWJDb3Jl L2h0bWwvSFRNTFRva2VuaXplci5oIGIvV2ViQ29yZS9odG1sL0hUTUxUb2tlbml6ZXIuaAppbmRl eCBkYzAzY2YyNWQ4OTk2ZDg5NzZiNmRjNGJmNzM1NGU0ZTljNjgzYmE2Li43ZGYzZWNiY2EzMjAz MDI3OGIxYWQxMzA0YmMwY2JhMzljMzQxZDNlIDEwMDY0NAotLS0gYS9XZWJDb3JlL2h0bWwvSFRN TFRva2VuaXplci5oCisrKyBiL1dlYkNvcmUvaHRtbC9IVE1MVG9rZW5pemVyLmgKQEAgLTExNyw2 ICsxMTcsNyBAQCBwdWJsaWM6CiAgICAgICAgIG1fc3lzdGVtSUQuY2xlYXIoKTsKICAgICAgICAg bV9zdGF0ZSA9IERvY3R5cGVCZWdpbjsKICAgICAgICAgbV9zb3VyY2UuY2xlYXIoKTsKKyAgICAg ICAgbV9mb3JjZVF1aXJrcyA9IGZhbHNlOwogICAgIH0KIAogICAgIERvY3R5cGVTdGF0ZSBzdGF0 ZSgpIHsgcmV0dXJuIG1fc3RhdGU7IH0KQEAgLTEyNiw4ICsxMjcsMTAgQEAgcHVibGljOgogICAg IFZlY3RvcjxVQ2hhcj4gbV9wdWJsaWNJRDsKICAgICBWZWN0b3I8VUNoYXI+IG1fc3lzdGVtSUQ7 CiAgICAgRG9jdHlwZVN0YXRlIG1fc3RhdGU7Ci0gICAgCisKICAgICBWZWN0b3I8VUNoYXI+IG1f c291cmNlOworCisgICAgYm9vbCBtX2ZvcmNlUXVpcmtzOyAvLyBVc2VkIGJ5IHRoZSBIVE1MNSBw YXJzZXIuCiB9OwogCiAvLy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCg==