5449 2005-10-21 02:15:10 -0700 OBJECT should be accessible by id/name as document property only if its only children are PARAMs 2005-10-25 01:47:11 -0700 1 1 1 Unclassified WebKit DOM 420+ Mac OS X 10.4 VERIFIED FIXED P2 Normal --- 1 mitz hyatt oldest_to_newest 22424 0 mitz 2005-10-21 02:15:10 -0700 (Separated from bug 5432) Object elements with a name or id are accessible as special properties of the document object (document ['objectname'] or document['objectid']). To better match IE's behavior, an object element should be a document property only when it has no children other than param elements. 22425 1 4434 mitz 2005-10-21 02:20:06 -0700 Created attachment 4434 testcase 22426 2 4435 mitz 2005-10-21 02:22:19 -0700 Created attachment 4435 Approximate IE's behavior IE doesn't allow HTML comments inside the object and this patch allows them (since they're not in the DOM tree). 22498 3 4435 darin 2005-10-22 08:48:54 -0700 Comment on attachment 4435 Approximate IE's behavior Looks good. I'd like to see one comment in HTMLObjectElementImpl::updateDocNamedItem() saying that the rule is "<object> elements with no children other than <param> elements and whitespace can be found by name in a document, and other <object> elements cannot" But the code looks perfect to me. 22842 4 harrison 2005-10-24 14:42:45 -0700 Committed. Added test as fast/js/object-by-name-or-id.html 4434 2005-10-21 02:20:06 -0700 2005-10-21 02:20:06 -0700 testcase object-as-named-element.html text/html 2861 mitz PGJvZHk+Cgo8cD5UaGlzIHRlc3RzIHdoZW4gb2JqZWN0IGVsZW1lbnRzIGFyZSBhY2Nlc3NpYmxl IGJ5IG5hbWUgb3IgaWQgZGlyZWN0bHkgYXMgcHJvcGVydGllcyBvZiB0aGUKZG9jdW1lbnQgb2Jq ZWN0LiBJRSBhbGxvd3MgdGhpcyBvbmx5IGlmIHRoZSBvYmplY3QgaGFzIG5vdCBjaGlsZCBub2Rl cyBvdGhlciB0aGFuIHBhcmFtIGFuZAp3aGl0ZXNwYWNlIGFub255bW91cyB0ZXh0LiBBIFBBU1Mg cmVzdWx0IG1lYW5zIHRoYXQgYmVoYXZpb3IgbWF0Y2hlcyBJRS4gV2ViS2l0JnJzcXVvO3MgcmVz dWx0cyBmb3IgY29tbWVudHMgZGlmZmVyLgo8L3A+Cgo8aHI+Cgo8c2NyaXB0PgppZiAod2luZG93 LmxheW91dFRlc3RDb250cm9sbGVyKQogICAgd2luZG93LmxheW91dFRlc3RDb250cm9sbGVyLmR1 bXBBc1RleHQoKTsKPC9zY3JpcHQ+Cgo8ZGl2IHN0eWxlPSJ2aXNpYmlsaXR5OiBoaWRkZW47IHdp ZHRoOiAwcHg7IGhlaWdodDogMHB4OyI+CjxvYmplY3QgbmFtZT0ib2JqZWN0MSIgd2lkdGg9IjAi IGhlaWdodD0iMCI+PC9vYmplY3Q+CjxvYmplY3QgbmFtZT0ib2JqZWN0MiIgd2lkdGg9IjAiIGhl aWdodD0iMCI+PHBhcmFtIG5hbWU9InAiIHZhbHVlPSJ2Ij48L29iamVjdD4KPG9iamVjdCBuYW1l PSJvYmplY3Q1IiB3aWR0aD0iMCIgaGVpZ2h0PSIwIj48cGFyYW0gbmFtZT0icCIgdmFsdWU9InYi PiAgICA8L29iamVjdD4KPG9iamVjdCBuYW1lPSJvYmplY3Q5IiB3aWR0aD0iMCIgaGVpZ2h0PSIw Ij48cGFyYW0gbmFtZT0icCIgdmFsdWU9InYiPjwhLS0gLS0+PC9vYmplY3Q+CjxvYmplY3QgbmFt ZT0ib2JqZWN0MTEiIHdpZHRoPSIwIiBoZWlnaHQ9IjAiPjxwYXJhbSBuYW1lPSJwIiB2YWx1ZT0i diI+PCEtLSBjb21tZW50IC0tPjwvb2JqZWN0Pgo8b2JqZWN0IG5hbWU9Im9iamVjdDYiIHdpZHRo PSIwIiBoZWlnaHQ9IjAiPjxwYXJhbSBuYW1lPSJwIiB2YWx1ZT0idiI+dGV4dDwvb2JqZWN0Pgo8 b2JqZWN0IG5hbWU9Im9iamVjdDEzIiB3aWR0aD0iMCIgaGVpZ2h0PSIwIj48cGFyYW0gbmFtZT0i cCIgdmFsdWU9InYiPjxpbWcgd2lkdGg9IjAiIGhlaWdodD0iMCI+PC9vYmplY3Q+CjxvYmplY3Qg aWQ9Im9iamVjdDMiIHdpZHRoPSIwIiBoZWlnaHQ9IjAiPjwvb2JqZWN0Pgo8b2JqZWN0IGlkPSJv YmplY3Q0IiB3aWR0aD0iMCIgaGVpZ2h0PSIwIj48cGFyYW0gbmFtZT0icCIgdmFsdWU9InYiPjwv b2JqZWN0Pgo8b2JqZWN0IGlkPSJvYmplY3Q4IiB3aWR0aD0iMCIgaGVpZ2h0PSIwIj48cGFyYW0g bmFtZT0icCIgdmFsdWU9InYiPiAgICA8L29iamVjdD4KPG9iamVjdCBpZD0ib2JqZWN0MTAiIHdp ZHRoPSIwIiBoZWlnaHQ9IjAiPjxwYXJhbSBuYW1lPSJwIiB2YWx1ZT0idiI+PCEtLSAtLT48L29i amVjdD4KPG9iamVjdCBpZD0ib2JqZWN0MTIiIHdpZHRoPSIwIiBoZWlnaHQ9IjAiPjxwYXJhbSBu YW1lPSJwIiB2YWx1ZT0idiI+PCEtLSBjb21tZW50IC0tPjwvb2JqZWN0Pgo8b2JqZWN0IGlkPSJv YmplY3Q3IiB3aWR0aD0iMCIgaGVpZ2h0PSIwIj48cGFyYW0gbmFtZT0icCIgdmFsdWU9InYiPnRl eHQ8L29iamVjdD4KPG9iamVjdCBpZD0ib2JqZWN0MTQiIHdpZHRoPSIwIiBoZWlnaHQ9IjAiPjxw YXJhbSBuYW1lPSJwIiB2YWx1ZT0idiI+PGltZyB3aWR0aD0iMCIgaGVpZ2h0PSIwIj48L29iamVj dD4KPC9kaXY+Cgo8cHJlIGlkPSJyZXN1bHRzIj4KUmVzdWx0czo8YnI+CjwvcHJlPgoKPHNjcmlw dD4KZnVuY3Rpb24gcHJpbnQoeCkKewogICBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgicmVzdWx0 cyIpLmlubmVySFRNTCArPSB4Owp9CgpmdW5jdGlvbiB0ZXN0UHJvcGVydHkoZGVzY3JpcHRpb24s IHByb3BOYW1lLCBJRSkgewogICAgcHJpbnQoZGVzY3JpcHRpb24pOwogICAgcHJpbnQoIjoiKTsK ICAgIHZhciBwcm9wVmFsID0gZG9jdW1lbnRbcHJvcE5hbWVdOwoKICAgIHByaW50KCFwcm9wVmFs ID09IElFID8gIiBGQUlMIiA6ICIgUEFTUyIpOwogICAgcHJpbnQoIjxicj4iKTsKfQoKcHJpbnQo IkJ5IG5hbWU6PGJyPiIpOwp0ZXN0UHJvcGVydHkoIm5vIGNoaWxkcmVuIiwgIm9iamVjdDEiLCB0 cnVlKTsKdGVzdFByb3BlcnR5KCJwYXJhbSIsICJvYmplY3QyIiwgdHJ1ZSk7CnRlc3RQcm9wZXJ0 eSgicGFyYW0gYW5kIHdoaXRlc3BhY2UiLCAib2JqZWN0NSIsIHRydWUpOwp0ZXN0UHJvcGVydHko InBhcmFtIGFuZCBlbXB0eSBjb21tZW50IChleHBlY3RlZCB0byBmYWlsKSIsICJvYmplY3Q5Iiwg ZmFsc2UpOwp0ZXN0UHJvcGVydHkoInBhcmFtIGFuZCBub24tZW1wdHkgY29tbWVudCAoZXhwZWN0 ZWQgdG8gZmFpbCkiLCAib2JqZWN0MTEiLCBmYWxzZSk7CnRlc3RQcm9wZXJ0eSgicGFyYW0gYW5k IHRleHQiLCAib2JqZWN0NiIsIGZhbHNlKTsKdGVzdFByb3BlcnR5KCJwYXJhbSBhbmQgaW1nIiwg Im9iamVjdDEzIiwgZmFsc2UpOwpwcmludCgiPGJyPkJ5IGlkOjxicj4iKTsKdGVzdFByb3BlcnR5 KCJubyBjaGlsZHJlbiIsICJvYmplY3QzIiwgdHJ1ZSk7CnRlc3RQcm9wZXJ0eSgicGFyYW0iLCAi b2JqZWN0NCIsIHRydWUpOwp0ZXN0UHJvcGVydHkoInBhcmFtIGFuZCB3aGl0ZXNwYWNlIiwgIm9i amVjdDgiLCB0cnVlKTsKdGVzdFByb3BlcnR5KCJwYXJhbSBhbmQgZW1wdHkgY29tbWVudCAoZXhw ZWN0ZWQgdG8gZmFpbCkiLCAib2JqZWN0MTAiLCBmYWxzZSk7CnRlc3RQcm9wZXJ0eSgicGFyYW0g YW5kIG5vbi1lbXB0eSBjb21tZW50IChleHBlY3RlZCB0byBmYWlsKSIsICJvYmplY3QxMiIsIGZh bHNlKTsKdGVzdFByb3BlcnR5KCJwYXJhbSBhbmQgdGV4dCIsICJvYmplY3Q3IiwgZmFsc2UpOwp0 ZXN0UHJvcGVydHkoInBhcmFtIGFuZCBpbWciLCAib2JqZWN0MTQiLCBmYWxzZSk7Cgo8L3Njcmlw dD4KPC9ib2R5Pgo= 4435 2005-10-21 02:22:19 -0700 2005-10-22 08:48:54 -0700 Approximate IE's behavior 5432_r1.patch text/plain 6440 mitz SW5kZXg6IGh0bWxfb2JqZWN0aW1wbC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQpSQ1MgZmlsZTogL2N2cy9yb290 L1dlYkNvcmUva2h0bWwvaHRtbC9odG1sX29iamVjdGltcGwuY3BwLHYKcmV0cmlldmluZyByZXZp c2lvbiAxLjgyCmRpZmYgLXAgLXUgLXIxLjgyIGh0bWxfb2JqZWN0aW1wbC5jcHAKLS0tIGh0bWxf b2JqZWN0aW1wbC5jcHAJMTYgT2N0IDIwMDUgMDM6MzY6MDUgLTAwMDAJMS44MgorKysgaHRtbF9v YmplY3RpbXBsLmNwcAkyMCBPY3QgMjAwNSAwOTo0Njo1NSAtMDAwMApAQCAtNDIsNiArNDIsNyBA QAogI2luY2x1ZGUgInJlbmRlcmluZy9yZW5kZXJfZnJhbWVzLmgiCiAjaW5jbHVkZSAicmVuZGVy aW5nL3JlbmRlcl9pbWFnZS5oIgogI2luY2x1ZGUgInhtbC9kb20yX2V2ZW50c2ltcGwuaCIKKyNp bmNsdWRlICJ4bWwvZG9tX3RleHRpbXBsLmgiCiAjaW5jbHVkZSAieG1sL0V2ZW50TmFtZXMuaCIK IAogI2lmbmRlZiBRX1dTX1FXUyAvLyBXZSBkb24ndCBoYXZlIEphdmEgaW4gUXQgRW1iZWRkZWQK QEAgLTU2MSw2ICs1NjIsNyBAQCBIVE1MT2JqZWN0RWxlbWVudEltcGw6OkhUTUxPYmplY3RFbGVt ZW50CiB7CiAgICAgbmVlZFdpZGdldFVwZGF0ZSA9IGZhbHNlOwogICAgIG1fdXNlRmFsbGJhY2tD b250ZW50ID0gZmFsc2U7CisgICAgbV9kb2NOYW1lZEl0ZW0gPSB0cnVlOwogfQogCiBIVE1MT2Jq ZWN0RWxlbWVudEltcGw6On5IVE1MT2JqZWN0RWxlbWVudEltcGwoKQpAQCAtNjc4LDcgKzY4MCw3 IEBAIHZvaWQgSFRNTE9iamVjdEVsZW1lbnRJbXBsOjpwYXJzZU1hcHBlZEEKICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgZ2V0RG9jdW1lbnQoKS0+Y3JlYXRlSFRNTEV2ZW50TGlzdGVuZXIo YXR0ci0+dmFsdWUoKS5xc3RyaW5nKCksIHRoaXMpKTsKICAgICB9IGVsc2UgaWYgKGF0dHItPm5h bWUoKSA9PSBuYW1lQXR0cikgewogCSAgICBET01TdHJpbmcgbmV3TmFtZUF0dHIgPSBhdHRyLT52 YWx1ZSgpOwotCSAgICBpZiAoaW5Eb2N1bWVudCgpICYmIGdldERvY3VtZW50KCktPmlzSFRNTERv Y3VtZW50KCkpIHsKKwkgICAgaWYgKGlzRG9jTmFtZWRJdGVtKCkgJiYgaW5Eb2N1bWVudCgpICYm IGdldERvY3VtZW50KCktPmlzSFRNTERvY3VtZW50KCkpIHsKIAkJSFRNTERvY3VtZW50SW1wbCAq ZG9jdW1lbnQgPSBzdGF0aWNfY2FzdDxIVE1MRG9jdW1lbnRJbXBsICo+KGdldERvY3VtZW50KCkp OwogCQlkb2N1bWVudC0+cmVtb3ZlTmFtZWRJdGVtKG9sZE5hbWVBdHRyKTsKIAkJZG9jdW1lbnQt PmFkZE5hbWVkSXRlbShuZXdOYW1lQXR0cik7CkBAIC02ODYsNyArNjg4LDcgQEAgdm9pZCBIVE1M T2JqZWN0RWxlbWVudEltcGw6OnBhcnNlTWFwcGVkQQogCSAgICBvbGROYW1lQXR0ciA9IG5ld05h bWVBdHRyOwogICAgIH0gZWxzZSBpZiAoYXR0ci0+bmFtZSgpID09IGlkQXR0cikgewogICAgICAg ICBET01TdHJpbmcgbmV3SWRBdHRyID0gYXR0ci0+dmFsdWUoKTsKLSAgICAgICAgaWYgKGluRG9j dW1lbnQoKSAmJiBnZXREb2N1bWVudCgpLT5pc0hUTUxEb2N1bWVudCgpKSB7CisgICAgICAgIGlm IChpc0RvY05hbWVkSXRlbSgpICYmIGluRG9jdW1lbnQoKSAmJiBnZXREb2N1bWVudCgpLT5pc0hU TUxEb2N1bWVudCgpKSB7CiAgICAgICAgICAgICBIVE1MRG9jdW1lbnRJbXBsICpkb2N1bWVudCA9 IHN0YXRpY19jYXN0PEhUTUxEb2N1bWVudEltcGwgKj4oZ2V0RG9jdW1lbnQoKSk7CiAgICAgICAg ICAgICBkb2N1bWVudC0+cmVtb3ZlRG9jRXh0cmFOYW1lZEl0ZW0ob2xkSWRBdHRyKTsKICAgICAg ICAgICAgIGRvY3VtZW50LT5hZGREb2NFeHRyYU5hbWVkSXRlbShuZXdJZEF0dHIpOwpAQCAtNzc5 LDcgKzc4MSw3IEBAIHZvaWQgSFRNTE9iamVjdEVsZW1lbnRJbXBsOjpkZXRhY2goKQogCiB2b2lk IEhUTUxPYmplY3RFbGVtZW50SW1wbDo6aW5zZXJ0ZWRJbnRvRG9jdW1lbnQoKQogewotICAgIGlm IChnZXREb2N1bWVudCgpLT5pc0hUTUxEb2N1bWVudCgpKSB7CisgICAgaWYgKGlzRG9jTmFtZWRJ dGVtKCkgJiYgZ2V0RG9jdW1lbnQoKS0+aXNIVE1MRG9jdW1lbnQoKSkgewogICAgICAgICBIVE1M RG9jdW1lbnRJbXBsICpkb2N1bWVudCA9IHN0YXRpY19jYXN0PEhUTUxEb2N1bWVudEltcGwgKj4o Z2V0RG9jdW1lbnQoKSk7CiAgICAgICAgIGRvY3VtZW50LT5hZGROYW1lZEl0ZW0ob2xkTmFtZUF0 dHIpOwogICAgICAgICBkb2N1bWVudC0+YWRkRG9jRXh0cmFOYW1lZEl0ZW0ob2xkSWRBdHRyKTsK QEAgLTc5MCw3ICs3OTIsNyBAQCB2b2lkIEhUTUxPYmplY3RFbGVtZW50SW1wbDo6aW5zZXJ0ZWRJ bnRvCiAKIHZvaWQgSFRNTE9iamVjdEVsZW1lbnRJbXBsOjpyZW1vdmVkRnJvbURvY3VtZW50KCkK IHsKLSAgICBpZiAoZ2V0RG9jdW1lbnQoKS0+aXNIVE1MRG9jdW1lbnQoKSkgeworICAgIGlmIChp c0RvY05hbWVkSXRlbSgpICYmIGdldERvY3VtZW50KCktPmlzSFRNTERvY3VtZW50KCkpIHsKICAg ICAgICAgSFRNTERvY3VtZW50SW1wbCAqZG9jdW1lbnQgPSBzdGF0aWNfY2FzdDxIVE1MRG9jdW1l bnRJbXBsICo+KGdldERvY3VtZW50KCkpOwogICAgICAgICBkb2N1bWVudC0+cmVtb3ZlTmFtZWRJ dGVtKG9sZE5hbWVBdHRyKTsKICAgICAgICAgZG9jdW1lbnQtPnJlbW92ZURvY0V4dHJhTmFtZWRJ dGVtKG9sZElkQXR0cik7CkBAIC04MTMsNiArODE1LDcgQEAgdm9pZCBIVE1MT2JqZWN0RWxlbWVu dEltcGw6OnJlY2FsY1N0eWxlKAogCiB2b2lkIEhUTUxPYmplY3RFbGVtZW50SW1wbDo6Y2hpbGRy ZW5DaGFuZ2VkKCkKIHsKKyAgICB1cGRhdGVEb2NOYW1lZEl0ZW0oKTsKICAgICBpZiAoaW5Eb2N1 bWVudCgpICYmICFtX3VzZUZhbGxiYWNrQ29udGVudCkgewogICAgICAgICBuZWVkV2lkZ2V0VXBk YXRlID0gdHJ1ZTsKICAgICAgICAgc2V0Q2hhbmdlZCgpOwpAQCAtODU3LDYgKzg2MCwzNSBAQCB2 b2lkIEhUTUxPYmplY3RFbGVtZW50SW1wbDo6cmVuZGVyRmFsbGJhCiAgICAgYXR0YWNoKCk7CiB9 CiAKK3ZvaWQgSFRNTE9iamVjdEVsZW1lbnRJbXBsOjp1cGRhdGVEb2NOYW1lZEl0ZW0oKQorewor ICAgIGJvb2wgd2FzTmFtZWRJdGVtID0gbV9kb2NOYW1lZEl0ZW07CisgICAgYm9vbCBpc05hbWVk SXRlbSA9IHRydWU7CisgICAgTm9kZUltcGwgKmNoaWxkID0gZmlyc3RDaGlsZCgpOworICAgIHdo aWxlIChjaGlsZCAmJiBpc05hbWVkSXRlbSkgeworICAgICAgICBpZiAoY2hpbGQtPmlzRWxlbWVu dE5vZGUoKSkgeworICAgICAgICAgICAgaWYgKCFzdGF0aWNfY2FzdDxFbGVtZW50SW1wbCAqPihj aGlsZCktPmhhc1RhZ05hbWUocGFyYW1UYWcpKQorICAgICAgICAgICAgICAgIGlzTmFtZWRJdGVt ID0gZmFsc2U7CisgICAgICAgIH0gZWxzZSBpZiAoY2hpbGQtPmlzVGV4dE5vZGUoKSkgeworICAg ICAgICAgICAgaWYgKCFzdGF0aWNfY2FzdDxUZXh0SW1wbCAqPihjaGlsZCktPmNvbnRhaW5zT25s eVdoaXRlc3BhY2UoKSkKKyAgICAgICAgICAgICAgICBpc05hbWVkSXRlbSA9IGZhbHNlOworICAg ICAgICB9IGVsc2UKKyAgICAgICAgICAgIGlzTmFtZWRJdGVtID0gZmFsc2U7CisgICAgICAgIGNo aWxkID0gY2hpbGQtPm5leHRTaWJsaW5nKCk7CisgICAgfQorICAgIGlmIChpc05hbWVkSXRlbSAh PSB3YXNOYW1lZEl0ZW0gJiYgZ2V0RG9jdW1lbnQoKS0+aXNIVE1MRG9jdW1lbnQoKSkgeworICAg ICAgICBIVE1MRG9jdW1lbnRJbXBsICpkb2N1bWVudCA9IHN0YXRpY19jYXN0PEhUTUxEb2N1bWVu dEltcGwgKj4oZ2V0RG9jdW1lbnQoKSk7CisgICAgICAgIGlmIChpc05hbWVkSXRlbSkgeworICAg ICAgICAgICAgZG9jdW1lbnQtPmFkZE5hbWVkSXRlbShvbGROYW1lQXR0cik7CisgICAgICAgICAg ICBkb2N1bWVudC0+YWRkRG9jRXh0cmFOYW1lZEl0ZW0ob2xkSWRBdHRyKTsKKyAgICAgICAgfSBl bHNlIHsKKyAgICAgICAgICAgIGRvY3VtZW50LT5yZW1vdmVOYW1lZEl0ZW0ob2xkTmFtZUF0dHIp OworICAgICAgICAgICAgZG9jdW1lbnQtPnJlbW92ZURvY0V4dHJhTmFtZWRJdGVtKG9sZElkQXR0 cik7CisgICAgICAgIH0KKyAgICB9CisgICAgbV9kb2NOYW1lZEl0ZW0gPSBpc05hbWVkSXRlbTsK K30KKwogRE9NU3RyaW5nIEhUTUxPYmplY3RFbGVtZW50SW1wbDo6Y29kZSgpIGNvbnN0CiB7CiAg ICAgcmV0dXJuIGdldEF0dHJpYnV0ZShjb2RlQXR0cik7CkluZGV4OiBodG1sX29iamVjdGltcGwu aAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09ClJDUyBmaWxlOiAvY3ZzL3Jvb3QvV2ViQ29yZS9raHRtbC9odG1sL2h0bWxf b2JqZWN0aW1wbC5oLHYKcmV0cmlldmluZyByZXZpc2lvbiAxLjM2CmRpZmYgLXAgLXUgLXIxLjM2 IGh0bWxfb2JqZWN0aW1wbC5oCi0tLSBodG1sX29iamVjdGltcGwuaAkxNiBTZXAgMjAwNSAyMjo0 MjoxMiAtMDAwMAkxLjM2CisrKyBodG1sX29iamVjdGltcGwuaAkyMCBPY3QgMjAwNSAwOTo0Njo1 NSAtMDAwMApAQCAtMjM2LDYgKzIzNiw3IEBAIHB1YmxpYzoKICAgICBET01TdHJpbmcgd2lkdGgo KSBjb25zdDsKICAgICB2b2lkIHNldFdpZHRoKGNvbnN0IERPTVN0cmluZyAmKTsKIAorICAgIGJv b2wgaXNEb2NOYW1lZEl0ZW0oKSBjb25zdCB7IHJldHVybiBtX2RvY05hbWVkSXRlbTsgfQogI2lm IEFQUExFX0NIQU5HRVMKICAgICBLSlM6OkJpbmRpbmdzOjpJbnN0YW5jZSAqZ2V0T2JqZWN0SW5z dGFuY2UoKSBjb25zdDsKICNlbmRpZgpAQCAtMjQ4LDExICsyNDksMTMgQEAgcHVibGljOgogICAg IEhUTUxJbWFnZUxvYWRlciogbV9pbWFnZUxvYWRlcjsKIAogcHJpdmF0ZToKKyAgICB2b2lkIHVw ZGF0ZURvY05hbWVkSXRlbSgpOwogICAgIERPTVN0cmluZyBvbGRJZEF0dHI7CiAgICAgRE9NU3Ry aW5nIG9sZE5hbWVBdHRyOwogI2lmIEFQUExFX0NIQU5HRVMKICAgICBtdXRhYmxlIEtKUzo6Qmlu ZGluZ3M6Okluc3RhbmNlICpvYmplY3RJbnN0YW5jZTsKICNlbmRpZgorICAgIGJvb2wgbV9kb2NO YW1lZEl0ZW07CiB9OwogCiAvLyAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCkluZGV4OiBodG1sX21pc2NpbXBs LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09ClJDUyBmaWxlOiAvY3ZzL3Jvb3QvV2ViQ29yZS9raHRtbC9odG1sL2h0 bWxfbWlzY2ltcGwuY3BwLHYKcmV0cmlldmluZyByZXZpc2lvbiAxLjM3CmRpZmYgLXAgLXUgLXIx LjM3IGh0bWxfbWlzY2ltcGwuY3BwCi0tLSBodG1sX21pc2NpbXBsLmNwcAkzIE9jdCAyMDA1IDIx OjEyOjI5IC0wMDAwCTEuMzcKKysrIGh0bWxfbWlzY2ltcGwuY3BwCTIwIE9jdCAyMDA1IDA5OjQ2 OjU2IC0wMDAwCkBAIC0yNyw2ICsyNyw3IEBACiAjaW5jbHVkZSAiaHRtbC9odG1sX2Zvcm1pbXBs LmgiCiAjaW5jbHVkZSAiaHRtbC9odG1sX2ltYWdlaW1wbC5oIgogI2luY2x1ZGUgImh0bWwvaHRt bF9kb2N1bWVudGltcGwuaCIKKyNpbmNsdWRlICJodG1sL2h0bWxfb2JqZWN0aW1wbC5oIgogCiAj aW5jbHVkZSAiZG9tL2RvbV9ub2RlLmgiCiAKQEAgLTM5MywxMCArMzk0LDEyIEBAIE5vZGVJbXBs ICpIVE1MTmFtZUNvbGxlY3Rpb25JbXBsOjp0cmF2ZXIKICAgICAgICAgICAgICAgICAgICAgZS0+ aGFzVGFnTmFtZShlbWJlZFRhZykgfHwKICAgICAgICAgICAgICAgICAgICAgZS0+aGFzVGFnTmFt ZShpZnJhbWVUYWcpKQogICAgICAgICAgICAgICAgICAgICBmb3VuZCA9IGUtPmdldEF0dHJpYnV0 ZShuYW1lQXR0cikgPT0gbV9uYW1lOwotICAgICAgICAgICAgICAgIGVsc2UgaWYgKGUtPmhhc1Rh Z05hbWUoYXBwbGV0VGFnKSB8fAotICAgICAgICAgICAgICAgICAgICAgICAgIGUtPmhhc1RhZ05h bWUob2JqZWN0VGFnKSkKKyAgICAgICAgICAgICAgICBlbHNlIGlmIChlLT5oYXNUYWdOYW1lKGFw cGxldFRhZykpCiAgICAgICAgICAgICAgICAgICAgIGZvdW5kID0gZS0+Z2V0QXR0cmlidXRlKG5h bWVBdHRyKSA9PSBtX25hbWUgfHwKICAgICAgICAgICAgICAgICAgICAgICAgIGUtPmdldEF0dHJp YnV0ZShpZEF0dHIpID09IG1fbmFtZTsKKyAgICAgICAgICAgICAgICBlbHNlIGlmIChlLT5oYXNU YWdOYW1lKG9iamVjdFRhZykpCisgICAgICAgICAgICAgICAgICAgIGZvdW5kID0gKGUtPmdldEF0 dHJpYnV0ZShuYW1lQXR0cikgPT0gbV9uYW1lIHx8IGUtPmdldEF0dHJpYnV0ZShpZEF0dHIpID09 IG1fbmFtZSkgJiYKKyAgICAgICAgICAgICAgICAgICAgICAgIHN0YXRpY19jYXN0PEhUTUxPYmpl Y3RFbGVtZW50SW1wbCAqPihlKS0+aXNEb2NOYW1lZEl0ZW0oKTsKICAgICAgICAgICAgICAgICBi cmVhazsKICAgICAgICAgICAgIGRlZmF1bHQ6CiAgICAgICAgICAgICAgICAgYXNzZXJ0KDApOwo=