59983 2011-05-02 17:03:26 -0700 Update node list cache count on the containing TreeScope rather than the Document 2011-05-23 10:48:02 -0700 1 1 1 Unclassified WebKit DOM 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 59832 1 rolandsteiner rolandsteiner commit-queue dglazkov dominicc morrita oldest_to_newest 396802 0 rolandsteiner 2011-05-02 17:03:26 -0700 Node list cache count part of bug 59832. 397286 1 92109 rolandsteiner 2011-05-03 13:01:08 -0700 Created attachment 92109 Patch 397321 2 rolandsteiner 2011-05-03 13:35:46 -0700 Committed r85650: <http://trac.webkit.org/changeset/85650> 402127 3 dglazkov 2011-05-11 11:35:23 -0700 Reverted r85650 for reason: Triggers m_numNodeListCaches > 0 assert in gc-heavy sites. Committed r86248: <http://trac.webkit.org/changeset/86248> 402129 4 dglazkov 2011-05-11 11:36:27 -0700 See bug 60419 for details. 407794 5 94378 rolandsteiner 2011-05-23 00:52:43 -0700 Created attachment 94378 corrected patch 408060 6 94378 commit-queue 2011-05-23 10:47:57 -0700 Comment on attachment 94378 corrected patch Clearing flags on attachment: 94378 Committed r87079: <http://trac.webkit.org/changeset/87079> 408062 7 commit-queue 2011-05-23 10:48:02 -0700 All reviewed patches have been landed. Closing bug. 92109 2011-05-03 13:01:08 -0700 2011-05-23 00:52:36 -0700 Patch bug-59983-20110503130107.patch text/plain 9338 rolandsteiner U3VidmVyc2lvbiBSZXZpc2lvbjogODU2MTUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBhMjJkYzk0MzA4NjVmYTY2 Y2Y0MjZhMjJhMDYxMjg0MzhlYmY1ZTVkLi44MzQ3NTEzNjdmOTQ4ZjBmMzBkMTg1OTdlYjY5YjU0 MGNkNzNjNTA2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzUgQEAKKzIwMTEtMDUtMDMgIFJvbGFu ZCBTdGVpbmVyICA8cm9sYW5kc3RlaW5lckBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVXBkYXRlIG5vZGUgbGlzdCBjYWNoZSBj b3VudCBvbiB0aGUgY29udGFpbmluZyBUcmVlU2NvcGUgcmF0aGVyIHRoYW4gdGhlIERvY3VtZW50 CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01OTk4Mwor CisgICAgICAgIENoYW5nZSBjb2RlIHRvIGNhbGwgYWRkL3JlbW92ZU5vZGVMaXN0Q2FjaGUoKSBh bmQgaGFzTm9kZUxpc3RDYWNoZXMoKSBvbiB0aGUgcHJvcGVyIHRyZWUgc2NvcGUuCisgICAgICAg IE1vdmUgdXBkYXRpbmcgb2YgdGhlIG5vZGUgbGlzdCBjYWNoZSBjb3VudCBmcm9tIHNldERvY3Vt ZW50KCkgdG8gc2V0VHJlZVNjb3BlUmVjdXJzaXZlbHkoKS4KKyAgICAgICAgTWFrZSBzZXREb2N1 bWVudCgpIGFuZCBzZXREb2N1bWVudFJlY3Vyc2l2ZWx5KCkgcHJpdmF0ZS4KKworICAgICAgICBO byBuZXcgdGVzdHMuIChyZWZhY3RvcmluZykKKworICAgICAgICAqIGRvbS9Db250YWluZXJOb2Rl LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNvbnRhaW5lck5vZGU6OmNoaWxkcmVuQ2hhbmdlZCk6 CisgICAgICAgICogZG9tL05vZGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Tm9kZTo6fk5vZGUp OgorICAgICAgICAoV2ViQ29yZTo6Tm9kZTo6c2V0RG9jdW1lbnQpOgorICAgICAgICAoV2ViQ29y ZTo6Tm9kZTo6c2V0VHJlZVNjb3BlUmVjdXJzaXZlbHkpOgorICAgICAgICAoV2ViQ29yZTo6Tm9k ZTo6Y2hpbGROb2Rlcyk6CisgICAgICAgIChXZWJDb3JlOjpOb2RlOjpyZWdpc3RlckR5bmFtaWNO b2RlTGlzdCk6CisgICAgICAgIChXZWJDb3JlOjpOb2RlOjp1bnJlZ2lzdGVyRHluYW1pY05vZGVM aXN0KToKKyAgICAgICAgKFdlYkNvcmU6Ok5vZGU6Om5vdGlmeUxvY2FsTm9kZUxpc3RzQXR0cmli dXRlQ2hhbmdlZCk6CisgICAgICAgIChXZWJDb3JlOjpOb2RlOjpub3RpZnlMb2NhbE5vZGVMaXN0 c0NoaWxkcmVuQ2hhbmdlZCk6CisgICAgICAgIChXZWJDb3JlOjpOb2RlOjpnZXRFbGVtZW50c0J5 VGFnTmFtZSk6CisgICAgICAgIChXZWJDb3JlOjpOb2RlOjpnZXRFbGVtZW50c0J5VGFnTmFtZU5T KToKKyAgICAgICAgKFdlYkNvcmU6Ok5vZGU6OmdldEVsZW1lbnRzQnlOYW1lKToKKyAgICAgICAg KFdlYkNvcmU6Ok5vZGU6OmdldEVsZW1lbnRzQnlDbGFzc05hbWUpOgorICAgICAgICAqIGRvbS9O b2RlLmg6CisgICAgICAgICogaHRtbC9IVE1MRm9ybUNvbnRyb2xFbGVtZW50LmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OkhUTUxGb3JtQ29udHJvbEVsZW1lbnQ6OmxhYmVscyk6CisKIDIwMTEtMDUt MDMgIFNhbSBXZWluaWcgIDxzYW1Ad2Via2l0Lm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBB bmRlcnMgQ2FybHNzb24uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vQ29udGFpbmVy Tm9kZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9kb20vQ29udGFpbmVyTm9kZS5jcHAKaW5kZXggOTgy OTk4YmUyNDViODE5N2JmODAwZTVlNTQwZDg4ZDcwYTdmNDVjYy4uYjZhZmM4N2QxZjY1Nzk5ZmNk OTA1NTBhODFhYzc3YTM0MDMzM2Q0YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZG9tL0Nv bnRhaW5lck5vZGUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9Db250YWluZXJOb2RlLmNw cApAQCAtNzkzLDcgKzc5Myw3IEBAIHZvaWQgQ29udGFpbmVyTm9kZTo6Y2hpbGRyZW5DaGFuZ2Vk KGJvb2wgY2hhbmdlZEJ5UGFyc2VyLCBOb2RlKiBiZWZvcmVDaGFuZ2UsIE5vCiAgICAgTm9kZTo6 Y2hpbGRyZW5DaGFuZ2VkKGNoYW5nZWRCeVBhcnNlciwgYmVmb3JlQ2hhbmdlLCBhZnRlckNoYW5n ZSwgY2hpbGRDb3VudERlbHRhKTsKICAgICBpZiAoIWNoYW5nZWRCeVBhcnNlciAmJiBjaGlsZENv dW50RGVsdGEpCiAgICAgICAgIGRvY3VtZW50KCktPm5vZGVDaGlsZHJlbkNoYW5nZWQodGhpcyk7 Ci0gICAgaWYgKGRvY3VtZW50KCktPmhhc05vZGVMaXN0Q2FjaGVzKCkpCisgICAgaWYgKHRyZWVT Y29wZSgpLT5oYXNOb2RlTGlzdENhY2hlcygpKQogICAgICAgICBub3RpZnlOb2RlTGlzdHNDaGls ZHJlbkNoYW5nZWQoKTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZG9tL05vZGUu Y3BwIGIvU291cmNlL1dlYkNvcmUvZG9tL05vZGUuY3BwCmluZGV4IDQ5NTk2OTEyNzM0MmViMzBk ZDliNjJhY2MzZGJjNTA4ZTJmNTg4ODEuLjk4NTYxOTJkOWNhMmY4OWI1ZDBjNTk4MDYzNTI2YmVl YTk1M2RhZjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Ob2RlLmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9kb20vTm9kZS5jcHAKQEAgLTM4OCw4ICszODgsOCBAQCBOb2RlOjp+Tm9k ZSgpCiAgICAgaWYgKCFoYXNSYXJlRGF0YSgpKQogICAgICAgICBBU1NFUlQoIU5vZGVSYXJlRGF0 YTo6cmFyZURhdGFNYXAoKS5jb250YWlucyh0aGlzKSk7CiAgICAgZWxzZSB7Ci0gICAgICAgIGlm IChtX2RvY3VtZW50ICYmIHJhcmVEYXRhKCktPm5vZGVMaXN0cygpKQotICAgICAgICAgICAgbV9k b2N1bWVudC0+cmVtb3ZlTm9kZUxpc3RDYWNoZSgpOworICAgICAgICBpZiAodHJlZVNjb3BlKCkg JiYgcmFyZURhdGEoKS0+bm9kZUxpc3RzKCkpCisgICAgICAgICAgICB0cmVlU2NvcGUoKS0+cmVt b3ZlTm9kZUxpc3RDYWNoZSgpOwogICAgICAgICAKICAgICAgICAgTm9kZVJhcmVEYXRhOjpOb2Rl UmFyZURhdGFNYXAmIGRhdGFNYXAgPSBOb2RlUmFyZURhdGE6OnJhcmVEYXRhTWFwKCk7CiAgICAg ICAgIE5vZGVSYXJlRGF0YTo6Tm9kZVJhcmVEYXRhTWFwOjppdGVyYXRvciBpdCA9IGRhdGFNYXAu ZmluZCh0aGlzKTsKQEAgLTQ1MiwxMiArNDUyLDYgQEAgdm9pZCBOb2RlOjpzZXREb2N1bWVudChE b2N1bWVudCogZG9jdW1lbnQpCiAgICAgd2lsbE1vdmVUb05ld093bmVyRG9jdW1lbnQoKTsKICAg ICBBU1NFUlQod2lsbE1vdmVUb05ld093bmVyRG9jdW1lbnRXYXNDYWxsZWQpOwogCi0gICAgaWYg KGhhc1JhcmVEYXRhKCkgJiYgcmFyZURhdGEoKS0+bm9kZUxpc3RzKCkpIHsKLSAgICAgICAgaWYg KG1fZG9jdW1lbnQpCi0gICAgICAgICAgICBtX2RvY3VtZW50LT5yZW1vdmVOb2RlTGlzdENhY2hl KCk7Ci0gICAgICAgIGRvY3VtZW50LT5hZGROb2RlTGlzdENhY2hlKCk7Ci0gICAgfQotCiAgICAg aWYgKG1fZG9jdW1lbnQpIHsKICAgICAgICAgbV9kb2N1bWVudC0+bW92ZU5vZGVJdGVyYXRvcnNU b05ld0RvY3VtZW50KHRoaXMsIGRvY3VtZW50KTsKICAgICAgICAgbV9kb2N1bWVudC0+Z3VhcmRE ZXJlZigpOwpAQCAtNTA4LDYgKzUwMiwxMiBAQCB2b2lkIE5vZGU6OnNldFRyZWVTY29wZVJlY3Vy c2l2ZWx5KFRyZWVTY29wZSogbmV3VHJlZVNjb3BlLCBib29sIGluY2x1ZGVSb290KQogICAgICAg ICB9IGVsc2UKICAgICAgICAgICAgIG5vZGUtPmVuc3VyZVJhcmVEYXRhKCktPnNldFRyZWVTY29w ZShuZXdUcmVlU2NvcGUpOwogCisgICAgICAgIGlmIChoYXNSYXJlRGF0YSgpICYmIHJhcmVEYXRh KCktPm5vZGVMaXN0cygpKSB7CisgICAgICAgICAgICBpZiAoY3VycmVudFRyZWVTY29wZSkKKyAg ICAgICAgICAgICAgICBjdXJyZW50VHJlZVNjb3BlLT5yZW1vdmVOb2RlTGlzdENhY2hlKCk7Cisg ICAgICAgICAgICBuZXdUcmVlU2NvcGUtPmFkZE5vZGVMaXN0Q2FjaGUoKTsKKyAgICAgICAgfQor CiAgICAgICAgIG5vZGUtPnNldERvY3VtZW50KG5ld0RvY3VtZW50KTsKIAogICAgICAgICBpZiAo IW5vZGUtPmlzRWxlbWVudE5vZGUoKSkKQEAgLTYwNSw4ICs2MDUsOCBAQCBQYXNzUmVmUHRyPE5v ZGVMaXN0PiBOb2RlOjpjaGlsZE5vZGVzKCkKICAgICBOb2RlUmFyZURhdGEqIGRhdGEgPSBlbnN1 cmVSYXJlRGF0YSgpOwogICAgIGlmICghZGF0YS0+bm9kZUxpc3RzKCkpIHsKICAgICAgICAgZGF0 YS0+c2V0Tm9kZUxpc3RzKE5vZGVMaXN0c05vZGVEYXRhOjpjcmVhdGUoKSk7Ci0gICAgICAgIGlm IChkb2N1bWVudCgpKQotICAgICAgICAgICAgZG9jdW1lbnQoKS0+YWRkTm9kZUxpc3RDYWNoZSgp OworICAgICAgICBpZiAodHJlZVNjb3BlKCkpCisgICAgICAgICAgICB0cmVlU2NvcGUoKS0+YWRk Tm9kZUxpc3RDYWNoZSgpOwogICAgIH0KIAogICAgIHJldHVybiBDaGlsZE5vZGVMaXN0OjpjcmVh dGUodGhpcywgZGF0YS0+bm9kZUxpc3RzKCktPm1fY2hpbGROb2RlTGlzdENhY2hlcy5nZXQoKSk7 CkBAIC05NzcsOCArOTc3LDggQEAgdm9pZCBOb2RlOjpyZWdpc3RlckR5bmFtaWNOb2RlTGlzdChE eW5hbWljTm9kZUxpc3QqIGxpc3QpCiAgICAgTm9kZVJhcmVEYXRhKiBkYXRhID0gZW5zdXJlUmFy ZURhdGEoKTsKICAgICBpZiAoIWRhdGEtPm5vZGVMaXN0cygpKSB7CiAgICAgICAgIGRhdGEtPnNl dE5vZGVMaXN0cyhOb2RlTGlzdHNOb2RlRGF0YTo6Y3JlYXRlKCkpOwotICAgICAgICBkb2N1bWVu dCgpLT5hZGROb2RlTGlzdENhY2hlKCk7Ci0gICAgfSBlbHNlIGlmICghbV9kb2N1bWVudCB8fCAh bV9kb2N1bWVudC0+aGFzTm9kZUxpc3RDYWNoZXMoKSkgeworICAgICAgICB0cmVlU2NvcGUoKS0+ YWRkTm9kZUxpc3RDYWNoZSgpOworICAgIH0gZWxzZSBpZiAoIXRyZWVTY29wZSgpIHx8ICF0cmVl U2NvcGUoKS0+aGFzTm9kZUxpc3RDYWNoZXMoKSkgewogICAgICAgICAvLyBXZSBoYXZlbid0IGJl ZW4gcmVjZWl2aW5nIG5vdGlmaWNhdGlvbnMgd2hpbGUgdGhlcmUgd2VyZSBubyByZWdpc3RlcmVk IGxpc3RzLCBzbyB0aGUgY2FjaGUgaXMgaW52YWxpZCBub3cuCiAgICAgICAgIGRhdGEtPm5vZGVM aXN0cygpLT5pbnZhbGlkYXRlQ2FjaGVzKCk7CiAgICAgfQpAQCAtOTk2LDggKzk5Niw4IEBAIHZv aWQgTm9kZTo6dW5yZWdpc3RlckR5bmFtaWNOb2RlTGlzdChEeW5hbWljTm9kZUxpc3QqIGxpc3Qp CiAgICAgICAgIGRhdGEtPm5vZGVMaXN0cygpLT5tX2xpc3RzV2l0aENhY2hlcy5yZW1vdmUobGlz dCk7CiAgICAgICAgIGlmIChkYXRhLT5ub2RlTGlzdHMoKS0+aXNFbXB0eSgpKSB7CiAgICAgICAg ICAgICBkYXRhLT5jbGVhck5vZGVMaXN0cygpOwotICAgICAgICAgICAgaWYgKGRvY3VtZW50KCkp Ci0gICAgICAgICAgICAgICAgZG9jdW1lbnQoKS0+cmVtb3ZlTm9kZUxpc3RDYWNoZSgpOworICAg ICAgICAgICAgaWYgKHRyZWVTY29wZSgpKQorICAgICAgICAgICAgICAgIHRyZWVTY29wZSgpLT5y ZW1vdmVOb2RlTGlzdENhY2hlKCk7CiAgICAgICAgIH0KICAgICB9CiB9CkBAIC0xMDE3LDcgKzEw MTcsNyBAQCB2b2lkIE5vZGU6Om5vdGlmeUxvY2FsTm9kZUxpc3RzQXR0cmlidXRlQ2hhbmdlZCgp CiAKICAgICBpZiAoZGF0YS0+bm9kZUxpc3RzKCktPmlzRW1wdHkoKSkgewogICAgICAgICBkYXRh LT5jbGVhck5vZGVMaXN0cygpOwotICAgICAgICBkb2N1bWVudCgpLT5yZW1vdmVOb2RlTGlzdENh Y2hlKCk7CisgICAgICAgIHRyZWVTY29wZSgpLT5yZW1vdmVOb2RlTGlzdENhY2hlKCk7CiAgICAg fQogfQogCkBAIC0xMDQzLDcgKzEwNDMsNyBAQCB2b2lkIE5vZGU6Om5vdGlmeUxvY2FsTm9kZUxp c3RzQ2hpbGRyZW5DaGFuZ2VkKCkKIAogICAgIGlmIChkYXRhLT5ub2RlTGlzdHMoKS0+aXNFbXB0 eSgpKSB7CiAgICAgICAgIGRhdGEtPmNsZWFyTm9kZUxpc3RzKCk7Ci0gICAgICAgIGRvY3VtZW50 KCktPnJlbW92ZU5vZGVMaXN0Q2FjaGUoKTsKKyAgICAgICAgdHJlZVNjb3BlKCktPnJlbW92ZU5v ZGVMaXN0Q2FjaGUoKTsKICAgICB9CiB9CiAKQEAgLTE3NzMsNyArMTc3Myw3IEBAIFBhc3NSZWZQ dHI8Tm9kZUxpc3Q+IE5vZGU6OmdldEVsZW1lbnRzQnlUYWdOYW1lKGNvbnN0IEF0b21pY1N0cmlu ZyYgbG9jYWxOYW1lKQogICAgIE5vZGVSYXJlRGF0YSogZGF0YSA9IGVuc3VyZVJhcmVEYXRhKCk7 CiAgICAgaWYgKCFkYXRhLT5ub2RlTGlzdHMoKSkgewogICAgICAgICBkYXRhLT5zZXROb2RlTGlz dHMoTm9kZUxpc3RzTm9kZURhdGE6OmNyZWF0ZSgpKTsKLSAgICAgICAgZG9jdW1lbnQoKS0+YWRk Tm9kZUxpc3RDYWNoZSgpOworICAgICAgICB0cmVlU2NvcGUoKS0+YWRkTm9kZUxpc3RDYWNoZSgp OwogICAgIH0KIAogICAgIFN0cmluZyBuYW1lID0gbG9jYWxOYW1lOwpAQCAtMTgwMiw3ICsxODAy LDcgQEAgUGFzc1JlZlB0cjxOb2RlTGlzdD4gTm9kZTo6Z2V0RWxlbWVudHNCeVRhZ05hbWVOUyhj b25zdCBBdG9taWNTdHJpbmcmIG5hbWVzcGFjZVUKICAgICBOb2RlUmFyZURhdGEqIGRhdGEgPSBl bnN1cmVSYXJlRGF0YSgpOwogICAgIGlmICghZGF0YS0+bm9kZUxpc3RzKCkpIHsKICAgICAgICAg ZGF0YS0+c2V0Tm9kZUxpc3RzKE5vZGVMaXN0c05vZGVEYXRhOjpjcmVhdGUoKSk7Ci0gICAgICAg IGRvY3VtZW50KCktPmFkZE5vZGVMaXN0Q2FjaGUoKTsKKyAgICAgICAgdHJlZVNjb3BlKCktPmFk ZE5vZGVMaXN0Q2FjaGUoKTsKICAgICB9CiAKICAgICBTdHJpbmcgbmFtZSA9IGxvY2FsTmFtZTsK QEAgLTE4MjUsNyArMTgyNSw3IEBAIFBhc3NSZWZQdHI8Tm9kZUxpc3Q+IE5vZGU6OmdldEVsZW1l bnRzQnlOYW1lKGNvbnN0IFN0cmluZyYgZWxlbWVudE5hbWUpCiAgICAgTm9kZVJhcmVEYXRhKiBk YXRhID0gZW5zdXJlUmFyZURhdGEoKTsKICAgICBpZiAoIWRhdGEtPm5vZGVMaXN0cygpKSB7CiAg ICAgICAgIGRhdGEtPnNldE5vZGVMaXN0cyhOb2RlTGlzdHNOb2RlRGF0YTo6Y3JlYXRlKCkpOwot ICAgICAgICBkb2N1bWVudCgpLT5hZGROb2RlTGlzdENhY2hlKCk7CisgICAgICAgIHRyZWVTY29w ZSgpLT5hZGROb2RlTGlzdENhY2hlKCk7CiAgICAgfQogCiAgICAgcGFpcjxOb2RlTGlzdHNOb2Rl RGF0YTo6TmFtZU5vZGVMaXN0Q2FjaGU6Oml0ZXJhdG9yLCBib29sPiByZXN1bHQgPSBkYXRhLT5u b2RlTGlzdHMoKS0+bV9uYW1lTm9kZUxpc3RDYWNoZS5hZGQoZWxlbWVudE5hbWUsIDApOwpAQCAt MTg0Miw3ICsxODQyLDcgQEAgUGFzc1JlZlB0cjxOb2RlTGlzdD4gTm9kZTo6Z2V0RWxlbWVudHNC eUNsYXNzTmFtZShjb25zdCBTdHJpbmcmIGNsYXNzTmFtZXMpCiAgICAgTm9kZVJhcmVEYXRhKiBk YXRhID0gZW5zdXJlUmFyZURhdGEoKTsKICAgICBpZiAoIWRhdGEtPm5vZGVMaXN0cygpKSB7CiAg ICAgICAgIGRhdGEtPnNldE5vZGVMaXN0cyhOb2RlTGlzdHNOb2RlRGF0YTo6Y3JlYXRlKCkpOwot ICAgICAgICBkb2N1bWVudCgpLT5hZGROb2RlTGlzdENhY2hlKCk7CisgICAgICAgIHRyZWVTY29w ZSgpLT5hZGROb2RlTGlzdENhY2hlKCk7CiAgICAgfQogCiAgICAgcGFpcjxOb2RlTGlzdHNOb2Rl RGF0YTo6Q2xhc3NOb2RlTGlzdENhY2hlOjppdGVyYXRvciwgYm9vbD4gcmVzdWx0ID0gZGF0YS0+ bm9kZUxpc3RzKCktPm1fY2xhc3NOb2RlTGlzdENhY2hlLmFkZChjbGFzc05hbWVzLCAwKTsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Ob2RlLmggYi9Tb3VyY2UvV2ViQ29yZS9kb20v Tm9kZS5oCmluZGV4IDlmZjYzMmI0ZjRkOWU2ZGFiZGY0NDZmZTdlMmFiYTJiZWJlZTM1OWMuLjA1 NzFkZmFjNTk0ZDQwZGRkNTExYWMxYzY5ZmFmNGVkMzMxZTFmOWUgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2RvbS9Ob2RlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL05vZGUuaApAQCAt NjMxLDExICs2MzEsNiBAQCBwcm90ZWN0ZWQ6CiAgICAgfTsKICAgICBOb2RlKERvY3VtZW50Kiwg Q29uc3RydWN0aW9uVHlwZSk7CiAKLSAgICAvLyBEbyBub3QgdXNlIHRoaXMgbWV0aG9kIHRvIGNo YW5nZSB0aGUgZG9jdW1lbnQgb2YgYSBub2RlIHVudGlsIGFmdGVyIHRoZSBub2RlIGhhcyBiZWVu Ci0gICAgLy8gcmVtb3ZlZCBmcm9tIGl0cyBwcmV2aW91cyBkb2N1bWVudC4KLSAgICB2b2lkIHNl dERvY3VtZW50KERvY3VtZW50Kik7Ci0gICAgdm9pZCBzZXREb2N1bWVudFJlY3Vyc2l2ZWx5KERv Y3VtZW50Kik7Ci0KICAgICB2aXJ0dWFsIHZvaWQgd2lsbE1vdmVUb05ld093bmVyRG9jdW1lbnQo KTsKICAgICB2aXJ0dWFsIHZvaWQgZGlkTW92ZVRvTmV3T3duZXJEb2N1bWVudCgpOwogICAgIApA QCAtNjQ5LDYgKzY0NCwxMSBAQCBwcm90ZWN0ZWQ6CiAgICAgTm9kZVJhcmVEYXRhKiBlbnN1cmVS YXJlRGF0YSgpOwogCiBwcml2YXRlOgorICAgIC8vIERvIG5vdCB1c2UgdGhpcyBtZXRob2QgdG8g Y2hhbmdlIHRoZSBkb2N1bWVudCBvZiBhIG5vZGUgdW50aWwgYWZ0ZXIgdGhlIG5vZGUgaGFzIGJl ZW4KKyAgICAvLyByZW1vdmVkIGZyb20gaXRzIHByZXZpb3VzIGRvY3VtZW50LgorICAgIHZvaWQg c2V0RG9jdW1lbnRSZWN1cnNpdmVseShEb2N1bWVudCopOworICAgIHZvaWQgc2V0RG9jdW1lbnQo RG9jdW1lbnQqKTsKKwogICAgIGVudW0gRWRpdGFibGVMZXZlbCB7IEVkaXRhYmxlLCBSaWNobHlF ZGl0YWJsZSB9OwogICAgIGJvb2wgcmVuZGVyZXJJc0VkaXRhYmxlKEVkaXRhYmxlTGV2ZWwpIGNv bnN0OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxGb3JtQ29udHJvbEVs ZW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MRm9ybUNvbnRyb2xFbGVtZW50LmNw cAppbmRleCBiMTI1MDYwZDUwOTZmZWRkNjM4ODIyYjU2NGZiNDk1OGM0NjZiZWNjLi44YmU3NjA5 MzM2MWU3YTU0YWE0ZGQ2YjJkMjNjOTliZmNiZGY5YjgxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9odG1sL0hUTUxGb3JtQ29udHJvbEVsZW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2h0bWwvSFRNTEZvcm1Db250cm9sRWxlbWVudC5jcHAKQEAgLTQ2OCw3ICs0NjgsNyBAQCBQYXNz UmVmUHRyPE5vZGVMaXN0PiBIVE1MRm9ybUNvbnRyb2xFbGVtZW50OjpsYWJlbHMoKQogICAgIE5v ZGVSYXJlRGF0YSogZGF0YSA9IE5vZGU6OmVuc3VyZVJhcmVEYXRhKCk7CiAgICAgaWYgKCFkYXRh LT5ub2RlTGlzdHMoKSkgewogICAgICAgICBkYXRhLT5zZXROb2RlTGlzdHMoTm9kZUxpc3RzTm9k ZURhdGE6OmNyZWF0ZSgpKTsKLSAgICAgICAgZG9jdW1lbnQoKS0+YWRkTm9kZUxpc3RDYWNoZSgp OworICAgICAgICB0cmVlU2NvcGUoKS0+YWRkTm9kZUxpc3RDYWNoZSgpOwogICAgIH0KIAogICAg IGlmIChkYXRhLT5ub2RlTGlzdHMoKS0+bV9sYWJlbHNOb2RlTGlzdENhY2hlKQo= 94378 2011-05-23 00:52:43 -0700 2011-05-23 10:47:57 -0700 corrected patch bug-59983-20110523165241.patch text/plain 9365 rolandsteiner U3VidmVyc2lvbiBSZXZpc2lvbjogODcwNTEKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBhMjlmMjA0Y2VlYWIwZmFm NGU2OWYzOGNlOWIwYjkwYTUyZGIxZTMzLi5jMzFmZTM1N2VkNzU4ZDI2ZTFiYTQ3ZWUxN2M4YjI0 MmZmM2I4NGI4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzUgQEAKKzIwMTEtMDUtMjMgIFJvbGFu ZCBTdGVpbmVyICA8cm9sYW5kc3RlaW5lckBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgRGltaXRyaSBHbGF6a292LgorCisgICAgICAgIFVwZGF0ZSBub2RlIGxpc3QgY2FjaGUg Y291bnQgb24gdGhlIGNvbnRhaW5pbmcgVHJlZVNjb3BlIHJhdGhlciB0aGFuIHRoZSBEb2N1bWVu dAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTk5ODMK KworICAgICAgICBDaGFuZ2UgY29kZSB0byBjYWxsIGFkZC9yZW1vdmVOb2RlTGlzdENhY2hlKCkg YW5kIGhhc05vZGVMaXN0Q2FjaGVzKCkgb24gdGhlIHByb3BlciB0cmVlIHNjb3BlLgorICAgICAg ICBNb3ZlIHVwZGF0aW5nIG9mIHRoZSBub2RlIGxpc3QgY2FjaGUgY291bnQgZnJvbSBzZXREb2N1 bWVudCgpIHRvIHNldFRyZWVTY29wZVJlY3Vyc2l2ZWx5KCkuCisgICAgICAgIE1ha2Ugc2V0RG9j dW1lbnQoKSBhbmQgc2V0RG9jdW1lbnRSZWN1cnNpdmVseSgpIHByaXZhdGUuCisKKyAgICAgICAg Tm8gbmV3IHRlc3RzLiAocmVmYWN0b3JpbmcpCisKKyAgICAgICAgKiBkb20vQ29udGFpbmVyTm9k ZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDb250YWluZXJOb2RlOjpjaGlsZHJlbkNoYW5nZWQp OgorICAgICAgICAqIGRvbS9Ob2RlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Ok5vZGU6On5Ob2Rl KToKKyAgICAgICAgKFdlYkNvcmU6Ok5vZGU6OnNldERvY3VtZW50KToKKyAgICAgICAgKFdlYkNv cmU6Ok5vZGU6OnNldFRyZWVTY29wZVJlY3Vyc2l2ZWx5KToKKyAgICAgICAgKFdlYkNvcmU6Ok5v ZGU6OmNoaWxkTm9kZXMpOgorICAgICAgICAoV2ViQ29yZTo6Tm9kZTo6cmVnaXN0ZXJEeW5hbWlj Tm9kZUxpc3QpOgorICAgICAgICAoV2ViQ29yZTo6Tm9kZTo6dW5yZWdpc3RlckR5bmFtaWNOb2Rl TGlzdCk6CisgICAgICAgIChXZWJDb3JlOjpOb2RlOjpub3RpZnlMb2NhbE5vZGVMaXN0c0F0dHJp YnV0ZUNoYW5nZWQpOgorICAgICAgICAoV2ViQ29yZTo6Tm9kZTo6bm90aWZ5TG9jYWxOb2RlTGlz dHNDaGlsZHJlbkNoYW5nZWQpOgorICAgICAgICAoV2ViQ29yZTo6Tm9kZTo6Z2V0RWxlbWVudHNC eVRhZ05hbWUpOgorICAgICAgICAoV2ViQ29yZTo6Tm9kZTo6Z2V0RWxlbWVudHNCeVRhZ05hbWVO Uyk6CisgICAgICAgIChXZWJDb3JlOjpOb2RlOjpnZXRFbGVtZW50c0J5TmFtZSk6CisgICAgICAg IChXZWJDb3JlOjpOb2RlOjpnZXRFbGVtZW50c0J5Q2xhc3NOYW1lKToKKyAgICAgICAgKiBkb20v Tm9kZS5oOgorICAgICAgICAqIGh0bWwvSFRNTEZvcm1Db250cm9sRWxlbWVudC5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpIVE1MRm9ybUNvbnRyb2xFbGVtZW50OjpsYWJlbHMpOgorCiAyMDExLTA1 LTIyICBBbmRyZXcgV2Fzb24gIDxyZWN0YWxvZ2ljQHJlY3RhbG9naWMuY29tPgogCiAgICAgICAg IFJldmlld2VkIGJ5IEJlbmphbWluIFBvdWxhaW4uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9kb20vQ29udGFpbmVyTm9kZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9kb20vQ29udGFpbmVyTm9k ZS5jcHAKaW5kZXggMzJiMDkzNjVhZTg0OTBhYmI4MGRkY2NhODlmZjFjNzI4ZTA1YWMwNi4uM2Zm MzExMWU5ZGMxOGNhZjQzZTE0OWFhY2IzZDc1MTk2NmY0MzgyYSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvZG9tL0NvbnRhaW5lck5vZGUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9D b250YWluZXJOb2RlLmNwcApAQCAtODEyLDcgKzgxMiw3IEBAIHZvaWQgQ29udGFpbmVyTm9kZTo6 Y2hpbGRyZW5DaGFuZ2VkKGJvb2wgY2hhbmdlZEJ5UGFyc2VyLCBOb2RlKiBiZWZvcmVDaGFuZ2Us IE5vCiAgICAgTm9kZTo6Y2hpbGRyZW5DaGFuZ2VkKGNoYW5nZWRCeVBhcnNlciwgYmVmb3JlQ2hh bmdlLCBhZnRlckNoYW5nZSwgY2hpbGRDb3VudERlbHRhKTsKICAgICBpZiAoIWNoYW5nZWRCeVBh cnNlciAmJiBjaGlsZENvdW50RGVsdGEpCiAgICAgICAgIGRvY3VtZW50KCktPm5vZGVDaGlsZHJl bkNoYW5nZWQodGhpcyk7Ci0gICAgaWYgKGRvY3VtZW50KCktPmhhc05vZGVMaXN0Q2FjaGVzKCkp CisgICAgaWYgKHRyZWVTY29wZSgpLT5oYXNOb2RlTGlzdENhY2hlcygpKQogICAgICAgICBub3Rp ZnlOb2RlTGlzdHNDaGlsZHJlbkNoYW5nZWQoKTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvZG9tL05vZGUuY3BwIGIvU291cmNlL1dlYkNvcmUvZG9tL05vZGUuY3BwCmluZGV4IDY0 ZTQzMDAwMzZjZjVmM2VhZmFlNTNkNmUwZDYzODU0YTFkZDk5NDUuLjUyZmIzNWQzY2IzN2NhMTk3 MTRjNzViYjYxNTE2ODlmZDFlZTk2YWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9O b2RlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kb20vTm9kZS5jcHAKQEAgLTM5MCw4ICszOTAs OCBAQCBOb2RlOjp+Tm9kZSgpCiAgICAgaWYgKCFoYXNSYXJlRGF0YSgpKQogICAgICAgICBBU1NF UlQoIU5vZGVSYXJlRGF0YTo6cmFyZURhdGFNYXAoKS5jb250YWlucyh0aGlzKSk7CiAgICAgZWxz ZSB7Ci0gICAgICAgIGlmIChtX2RvY3VtZW50ICYmIHJhcmVEYXRhKCktPm5vZGVMaXN0cygpKQot ICAgICAgICAgICAgbV9kb2N1bWVudC0+cmVtb3ZlTm9kZUxpc3RDYWNoZSgpOworICAgICAgICBp ZiAodHJlZVNjb3BlKCkgJiYgcmFyZURhdGEoKS0+bm9kZUxpc3RzKCkpCisgICAgICAgICAgICB0 cmVlU2NvcGUoKS0+cmVtb3ZlTm9kZUxpc3RDYWNoZSgpOwogICAgICAgICAKICAgICAgICAgTm9k ZVJhcmVEYXRhOjpOb2RlUmFyZURhdGFNYXAmIGRhdGFNYXAgPSBOb2RlUmFyZURhdGE6OnJhcmVE YXRhTWFwKCk7CiAgICAgICAgIE5vZGVSYXJlRGF0YTo6Tm9kZVJhcmVEYXRhTWFwOjppdGVyYXRv ciBpdCA9IGRhdGFNYXAuZmluZCh0aGlzKTsKQEAgLTQ1NCwxMiArNDU0LDYgQEAgdm9pZCBOb2Rl OjpzZXREb2N1bWVudChEb2N1bWVudCogZG9jdW1lbnQpCiAgICAgd2lsbE1vdmVUb05ld093bmVy RG9jdW1lbnQoKTsKICAgICBBU1NFUlQod2lsbE1vdmVUb05ld093bmVyRG9jdW1lbnRXYXNDYWxs ZWQpOwogCi0gICAgaWYgKGhhc1JhcmVEYXRhKCkgJiYgcmFyZURhdGEoKS0+bm9kZUxpc3RzKCkp IHsKLSAgICAgICAgaWYgKG1fZG9jdW1lbnQpCi0gICAgICAgICAgICBtX2RvY3VtZW50LT5yZW1v dmVOb2RlTGlzdENhY2hlKCk7Ci0gICAgICAgIGRvY3VtZW50LT5hZGROb2RlTGlzdENhY2hlKCk7 Ci0gICAgfQotCiAgICAgaWYgKG1fZG9jdW1lbnQpIHsKICAgICAgICAgbV9kb2N1bWVudC0+bW92 ZU5vZGVJdGVyYXRvcnNUb05ld0RvY3VtZW50KHRoaXMsIGRvY3VtZW50KTsKICAgICAgICAgbV9k b2N1bWVudC0+Z3VhcmREZXJlZigpOwpAQCAtNTEwLDYgKzUwNCwxMiBAQCB2b2lkIE5vZGU6OnNl dFRyZWVTY29wZVJlY3Vyc2l2ZWx5KFRyZWVTY29wZSogbmV3VHJlZVNjb3BlLCBib29sIGluY2x1 ZGVSb290KQogICAgICAgICB9IGVsc2UKICAgICAgICAgICAgIG5vZGUtPmVuc3VyZVJhcmVEYXRh KCktPnNldFRyZWVTY29wZShuZXdUcmVlU2NvcGUpOwogCisgICAgICAgIGlmIChub2RlLT5oYXNS YXJlRGF0YSgpICYmIG5vZGUtPnJhcmVEYXRhKCktPm5vZGVMaXN0cygpKSB7CisgICAgICAgICAg ICBpZiAoY3VycmVudFRyZWVTY29wZSkKKyAgICAgICAgICAgICAgICBjdXJyZW50VHJlZVNjb3Bl LT5yZW1vdmVOb2RlTGlzdENhY2hlKCk7CisgICAgICAgICAgICBuZXdUcmVlU2NvcGUtPmFkZE5v ZGVMaXN0Q2FjaGUoKTsKKyAgICAgICAgfQorCiAgICAgICAgIG5vZGUtPnNldERvY3VtZW50KG5l d0RvY3VtZW50KTsKIAogICAgICAgICBpZiAoIW5vZGUtPmlzRWxlbWVudE5vZGUoKSkKQEAgLTYw Niw4ICs2MDYsOCBAQCBQYXNzUmVmUHRyPE5vZGVMaXN0PiBOb2RlOjpjaGlsZE5vZGVzKCkKICAg ICBOb2RlUmFyZURhdGEqIGRhdGEgPSBlbnN1cmVSYXJlRGF0YSgpOwogICAgIGlmICghZGF0YS0+ bm9kZUxpc3RzKCkpIHsKICAgICAgICAgZGF0YS0+c2V0Tm9kZUxpc3RzKE5vZGVMaXN0c05vZGVE YXRhOjpjcmVhdGUoKSk7Ci0gICAgICAgIGlmIChkb2N1bWVudCgpKQotICAgICAgICAgICAgZG9j dW1lbnQoKS0+YWRkTm9kZUxpc3RDYWNoZSgpOworICAgICAgICBpZiAodHJlZVNjb3BlKCkpCisg ICAgICAgICAgICB0cmVlU2NvcGUoKS0+YWRkTm9kZUxpc3RDYWNoZSgpOwogICAgIH0KIAogICAg IHJldHVybiBDaGlsZE5vZGVMaXN0OjpjcmVhdGUodGhpcywgZGF0YS0+bm9kZUxpc3RzKCktPm1f Y2hpbGROb2RlTGlzdENhY2hlcy5nZXQoKSk7CkBAIC05NzgsOCArOTc4LDggQEAgdm9pZCBOb2Rl OjpyZWdpc3RlckR5bmFtaWNOb2RlTGlzdChEeW5hbWljTm9kZUxpc3QqIGxpc3QpCiAgICAgTm9k ZVJhcmVEYXRhKiBkYXRhID0gZW5zdXJlUmFyZURhdGEoKTsKICAgICBpZiAoIWRhdGEtPm5vZGVM aXN0cygpKSB7CiAgICAgICAgIGRhdGEtPnNldE5vZGVMaXN0cyhOb2RlTGlzdHNOb2RlRGF0YTo6 Y3JlYXRlKCkpOwotICAgICAgICBkb2N1bWVudCgpLT5hZGROb2RlTGlzdENhY2hlKCk7Ci0gICAg fSBlbHNlIGlmICghbV9kb2N1bWVudCB8fCAhbV9kb2N1bWVudC0+aGFzTm9kZUxpc3RDYWNoZXMo KSkgeworICAgICAgICB0cmVlU2NvcGUoKS0+YWRkTm9kZUxpc3RDYWNoZSgpOworICAgIH0gZWxz ZSBpZiAoIXRyZWVTY29wZSgpIHx8ICF0cmVlU2NvcGUoKS0+aGFzTm9kZUxpc3RDYWNoZXMoKSkg ewogICAgICAgICAvLyBXZSBoYXZlbid0IGJlZW4gcmVjZWl2aW5nIG5vdGlmaWNhdGlvbnMgd2hp bGUgdGhlcmUgd2VyZSBubyByZWdpc3RlcmVkIGxpc3RzLCBzbyB0aGUgY2FjaGUgaXMgaW52YWxp ZCBub3cuCiAgICAgICAgIGRhdGEtPm5vZGVMaXN0cygpLT5pbnZhbGlkYXRlQ2FjaGVzKCk7CiAg ICAgfQpAQCAtOTk3LDggKzk5Nyw4IEBAIHZvaWQgTm9kZTo6dW5yZWdpc3RlckR5bmFtaWNOb2Rl TGlzdChEeW5hbWljTm9kZUxpc3QqIGxpc3QpCiAgICAgICAgIGRhdGEtPm5vZGVMaXN0cygpLT5t X2xpc3RzV2l0aENhY2hlcy5yZW1vdmUobGlzdCk7CiAgICAgICAgIGlmIChkYXRhLT5ub2RlTGlz dHMoKS0+aXNFbXB0eSgpKSB7CiAgICAgICAgICAgICBkYXRhLT5jbGVhck5vZGVMaXN0cygpOwot ICAgICAgICAgICAgaWYgKGRvY3VtZW50KCkpCi0gICAgICAgICAgICAgICAgZG9jdW1lbnQoKS0+ cmVtb3ZlTm9kZUxpc3RDYWNoZSgpOworICAgICAgICAgICAgaWYgKHRyZWVTY29wZSgpKQorICAg ICAgICAgICAgICAgIHRyZWVTY29wZSgpLT5yZW1vdmVOb2RlTGlzdENhY2hlKCk7CiAgICAgICAg IH0KICAgICB9CiB9CkBAIC0xMDE4LDcgKzEwMTgsNyBAQCB2b2lkIE5vZGU6Om5vdGlmeUxvY2Fs Tm9kZUxpc3RzQXR0cmlidXRlQ2hhbmdlZCgpCiAKICAgICBpZiAoZGF0YS0+bm9kZUxpc3RzKCkt PmlzRW1wdHkoKSkgewogICAgICAgICBkYXRhLT5jbGVhck5vZGVMaXN0cygpOwotICAgICAgICBk b2N1bWVudCgpLT5yZW1vdmVOb2RlTGlzdENhY2hlKCk7CisgICAgICAgIHRyZWVTY29wZSgpLT5y ZW1vdmVOb2RlTGlzdENhY2hlKCk7CiAgICAgfQogfQogCkBAIC0xMDQ0LDcgKzEwNDQsNyBAQCB2 b2lkIE5vZGU6Om5vdGlmeUxvY2FsTm9kZUxpc3RzQ2hpbGRyZW5DaGFuZ2VkKCkKIAogICAgIGlm IChkYXRhLT5ub2RlTGlzdHMoKS0+aXNFbXB0eSgpKSB7CiAgICAgICAgIGRhdGEtPmNsZWFyTm9k ZUxpc3RzKCk7Ci0gICAgICAgIGRvY3VtZW50KCktPnJlbW92ZU5vZGVMaXN0Q2FjaGUoKTsKKyAg ICAgICAgdHJlZVNjb3BlKCktPnJlbW92ZU5vZGVMaXN0Q2FjaGUoKTsKICAgICB9CiB9CiAKQEAg LTE4MjIsNyArMTgyMiw3IEBAIFBhc3NSZWZQdHI8Tm9kZUxpc3Q+IE5vZGU6OmdldEVsZW1lbnRz QnlUYWdOYW1lKGNvbnN0IEF0b21pY1N0cmluZyYgbG9jYWxOYW1lKQogICAgIE5vZGVSYXJlRGF0 YSogZGF0YSA9IGVuc3VyZVJhcmVEYXRhKCk7CiAgICAgaWYgKCFkYXRhLT5ub2RlTGlzdHMoKSkg ewogICAgICAgICBkYXRhLT5zZXROb2RlTGlzdHMoTm9kZUxpc3RzTm9kZURhdGE6OmNyZWF0ZSgp KTsKLSAgICAgICAgZG9jdW1lbnQoKS0+YWRkTm9kZUxpc3RDYWNoZSgpOworICAgICAgICB0cmVl U2NvcGUoKS0+YWRkTm9kZUxpc3RDYWNoZSgpOwogICAgIH0KIAogICAgIFN0cmluZyBuYW1lID0g bG9jYWxOYW1lOwpAQCAtMTg1MSw3ICsxODUxLDcgQEAgUGFzc1JlZlB0cjxOb2RlTGlzdD4gTm9k ZTo6Z2V0RWxlbWVudHNCeVRhZ05hbWVOUyhjb25zdCBBdG9taWNTdHJpbmcmIG5hbWVzcGFjZVUK ICAgICBOb2RlUmFyZURhdGEqIGRhdGEgPSBlbnN1cmVSYXJlRGF0YSgpOwogICAgIGlmICghZGF0 YS0+bm9kZUxpc3RzKCkpIHsKICAgICAgICAgZGF0YS0+c2V0Tm9kZUxpc3RzKE5vZGVMaXN0c05v ZGVEYXRhOjpjcmVhdGUoKSk7Ci0gICAgICAgIGRvY3VtZW50KCktPmFkZE5vZGVMaXN0Q2FjaGUo KTsKKyAgICAgICAgdHJlZVNjb3BlKCktPmFkZE5vZGVMaXN0Q2FjaGUoKTsKICAgICB9CiAKICAg ICBTdHJpbmcgbmFtZSA9IGxvY2FsTmFtZTsKQEAgLTE4NzQsNyArMTg3NCw3IEBAIFBhc3NSZWZQ dHI8Tm9kZUxpc3Q+IE5vZGU6OmdldEVsZW1lbnRzQnlOYW1lKGNvbnN0IFN0cmluZyYgZWxlbWVu dE5hbWUpCiAgICAgTm9kZVJhcmVEYXRhKiBkYXRhID0gZW5zdXJlUmFyZURhdGEoKTsKICAgICBp ZiAoIWRhdGEtPm5vZGVMaXN0cygpKSB7CiAgICAgICAgIGRhdGEtPnNldE5vZGVMaXN0cyhOb2Rl TGlzdHNOb2RlRGF0YTo6Y3JlYXRlKCkpOwotICAgICAgICBkb2N1bWVudCgpLT5hZGROb2RlTGlz dENhY2hlKCk7CisgICAgICAgIHRyZWVTY29wZSgpLT5hZGROb2RlTGlzdENhY2hlKCk7CiAgICAg fQogCiAgICAgcGFpcjxOb2RlTGlzdHNOb2RlRGF0YTo6TmFtZU5vZGVMaXN0Q2FjaGU6Oml0ZXJh dG9yLCBib29sPiByZXN1bHQgPSBkYXRhLT5ub2RlTGlzdHMoKS0+bV9uYW1lTm9kZUxpc3RDYWNo ZS5hZGQoZWxlbWVudE5hbWUsIDApOwpAQCAtMTg5MSw3ICsxODkxLDcgQEAgUGFzc1JlZlB0cjxO b2RlTGlzdD4gTm9kZTo6Z2V0RWxlbWVudHNCeUNsYXNzTmFtZShjb25zdCBTdHJpbmcmIGNsYXNz TmFtZXMpCiAgICAgTm9kZVJhcmVEYXRhKiBkYXRhID0gZW5zdXJlUmFyZURhdGEoKTsKICAgICBp ZiAoIWRhdGEtPm5vZGVMaXN0cygpKSB7CiAgICAgICAgIGRhdGEtPnNldE5vZGVMaXN0cyhOb2Rl TGlzdHNOb2RlRGF0YTo6Y3JlYXRlKCkpOwotICAgICAgICBkb2N1bWVudCgpLT5hZGROb2RlTGlz dENhY2hlKCk7CisgICAgICAgIHRyZWVTY29wZSgpLT5hZGROb2RlTGlzdENhY2hlKCk7CiAgICAg fQogCiAgICAgcGFpcjxOb2RlTGlzdHNOb2RlRGF0YTo6Q2xhc3NOb2RlTGlzdENhY2hlOjppdGVy YXRvciwgYm9vbD4gcmVzdWx0ID0gZGF0YS0+bm9kZUxpc3RzKCktPm1fY2xhc3NOb2RlTGlzdENh Y2hlLmFkZChjbGFzc05hbWVzLCAwKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9O b2RlLmggYi9Tb3VyY2UvV2ViQ29yZS9kb20vTm9kZS5oCmluZGV4IGU1ZjMxYjViNjc0ZDYwMzgx MGFkOWM3ODZkNTNmMDg5NWY3MDdiMmUuLjU5NThmYTk4ZTUyMzA2NWU1NTMzNjY1OTNlYjJjZTMw NTE0NzgwMTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Ob2RlLmgKKysrIGIvU291 cmNlL1dlYkNvcmUvZG9tL05vZGUuaApAQCAtNjM2LDExICs2MzYsNiBAQCBwcm90ZWN0ZWQ6CiAg ICAgfTsKICAgICBOb2RlKERvY3VtZW50KiwgQ29uc3RydWN0aW9uVHlwZSk7CiAKLSAgICAvLyBE byBub3QgdXNlIHRoaXMgbWV0aG9kIHRvIGNoYW5nZSB0aGUgZG9jdW1lbnQgb2YgYSBub2RlIHVu dGlsIGFmdGVyIHRoZSBub2RlIGhhcyBiZWVuCi0gICAgLy8gcmVtb3ZlZCBmcm9tIGl0cyBwcmV2 aW91cyBkb2N1bWVudC4KLSAgICB2b2lkIHNldERvY3VtZW50KERvY3VtZW50Kik7Ci0gICAgdm9p ZCBzZXREb2N1bWVudFJlY3Vyc2l2ZWx5KERvY3VtZW50Kik7Ci0KICAgICB2aXJ0dWFsIHZvaWQg d2lsbE1vdmVUb05ld093bmVyRG9jdW1lbnQoKTsKICAgICB2aXJ0dWFsIHZvaWQgZGlkTW92ZVRv TmV3T3duZXJEb2N1bWVudCgpOwogICAgIApAQCAtNjU0LDYgKzY0OSwxMSBAQCBwcm90ZWN0ZWQ6 CiAgICAgTm9kZVJhcmVEYXRhKiBlbnN1cmVSYXJlRGF0YSgpOwogCiBwcml2YXRlOgorICAgIC8v IERvIG5vdCB1c2UgdGhpcyBtZXRob2QgdG8gY2hhbmdlIHRoZSBkb2N1bWVudCBvZiBhIG5vZGUg dW50aWwgYWZ0ZXIgdGhlIG5vZGUgaGFzIGJlZW4KKyAgICAvLyByZW1vdmVkIGZyb20gaXRzIHBy ZXZpb3VzIGRvY3VtZW50LgorICAgIHZvaWQgc2V0RG9jdW1lbnRSZWN1cnNpdmVseShEb2N1bWVu dCopOworICAgIHZvaWQgc2V0RG9jdW1lbnQoRG9jdW1lbnQqKTsKKwogICAgIGVudW0gRWRpdGFi bGVMZXZlbCB7IEVkaXRhYmxlLCBSaWNobHlFZGl0YWJsZSB9OwogICAgIGJvb2wgcmVuZGVyZXJJ c0VkaXRhYmxlKEVkaXRhYmxlTGV2ZWwpIGNvbnN0OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9odG1sL0hUTUxGb3JtQ29udHJvbEVsZW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvaHRt bC9IVE1MRm9ybUNvbnRyb2xFbGVtZW50LmNwcAppbmRleCBhZTAyZWJlZWQ3NTIzYTQ5OTlhNTIw ZTQ4MTJjYzkyMTY1MGM5ZTAzLi43MzVhZWNkMTk5NGMwMWQ0ZWNmZjg3ZmZmYmZiZGUyNTAxYzFh NjcyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxGb3JtQ29udHJvbEVsZW1l bnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTEZvcm1Db250cm9sRWxlbWVudC5j cHAKQEAgLTQ4Nyw3ICs0ODcsNyBAQCBQYXNzUmVmUHRyPE5vZGVMaXN0PiBIVE1MRm9ybUNvbnRy b2xFbGVtZW50OjpsYWJlbHMoKQogICAgIE5vZGVSYXJlRGF0YSogZGF0YSA9IE5vZGU6OmVuc3Vy ZVJhcmVEYXRhKCk7CiAgICAgaWYgKCFkYXRhLT5ub2RlTGlzdHMoKSkgewogICAgICAgICBkYXRh LT5zZXROb2RlTGlzdHMoTm9kZUxpc3RzTm9kZURhdGE6OmNyZWF0ZSgpKTsKLSAgICAgICAgZG9j dW1lbnQoKS0+YWRkTm9kZUxpc3RDYWNoZSgpOworICAgICAgICB0cmVlU2NvcGUoKS0+YWRkTm9k ZUxpc3RDYWNoZSgpOwogICAgIH0KIAogICAgIGlmIChkYXRhLT5ub2RlTGlzdHMoKS0+bV9sYWJl bHNOb2RlTGlzdENhY2hlKQo=