108823 2013-02-04 07:10:28 -0800 Web Inspector: forced pseudo classes aren't cleared from inspected page when Inspector closes 2017-01-04 20:39:42 -0800 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 1 graouts joepeck commit-queue graouts inspector-bugzilla-changes joepeck pmuellr web-inspector-bugs webkit-bug-importer oldest_to_newest 824330 0 graouts 2013-02-04 07:10:28 -0800 Steps to reproduce: 1. Open http://nightly.webkit.org/start 2. Cmd+click on the "report issues" link in the paragraph under "How can I help?" 3. Pick Inspect Element from context menu 4. Force :hover CSS pseudo-class onto element using the "Force Element State" contextual menu on the matching DOM node in the inspector 5. Close the inspector At this stage, I'd expect the forced :hover pseudo-class to have been removed. Reopening and reclosing the Web Inspector eventually resets the forced pseudo-classes. 824331 1 webkit-bug-importer 2013-02-04 07:10:50 -0800 <rdar://problem/13143550> 1263688 2 joepeck 2017-01-03 21:44:16 -0800 The CSSAgent tries to reset forced pseudo states in InspectorCSSAgent::resetPseudoStates except it uses the DOM Agent which may have cleared state already. Lets avoid using the DOM Agent here during cleanup. Using the DOM Agent at other places also seems like it could be incorrect (InspectorCSSAgent::didRemoveDOMNode) or potentially incomplete (InspectorCSSAgent::didRemoveDocument). So I'll just clean all this up. 1263689 3 297990 joepeck 2017-01-03 21:48:35 -0800 Created attachment 297990 [PATCH] Proposed Fix I might be able to write a test for this. 1263880 4 297990 bburg 2017-01-04 13:49:12 -0800 Comment on attachment 297990 [PATCH] Proposed Fix View in context: https://bugs.webkit.org/attachment.cgi?id=297990&action=review > Source/WebCore/inspector/InspectorCSSAgent.cpp:414 > + m_documentsWithForcedPsuedoStates.remove(&document); If it's not too much work, please fix the spelling of this member. 1263996 5 joepeck 2017-01-04 20:39:42 -0800 <https://trac.webkit.org/changeset/210316> 297990 2017-01-03 21:48:35 -0800 2017-01-04 13:48:32 -0800 [PATCH] Proposed Fix forced-pseudo-classes-1.patch text/plain 10388 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA2ZGM5ZGU1Li4yYjNjMjFkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsNDIg QEAKIDIwMTctMDEtMDMgIEpvc2VwaCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KIAor ICAgICAgICBXZWIgSW5zcGVjdG9yOiBmb3JjZWQgcHNldWRvIGNsYXNzZXMgYXJlbid0IGNsZWFy ZWQgZnJvbSBpbnNwZWN0ZWQgcGFnZSB3aGVuIEluc3BlY3RvciBjbG9zZXMKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwODgyMworICAgICAgICA8cmRh cjovL3Byb2JsZW0vMTMxNDM1NTA+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yQ1NTQWdlbnQuaDoKKyAgICAgICAg KiBpbnNwZWN0b3IvSW5zcGVjdG9yQ1NTQWdlbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW5z cGVjdG9yQ1NTQWdlbnQ6OmRvY3VtZW50RGV0YWNoZWQpOgorICAgICAgICBDbGVhciB0aGUgZG9j dW1lbnQgZnJvbSBhbGwgb2YgdGhlIGRpZmZlcmVudCBEb2N1bWVudCBzZXRzLgorCisgICAgICAg IChXZWJDb3JlOjpJbnNwZWN0b3JDU1NBZ2VudDo6ZGlkUmVtb3ZlRG9jdW1lbnQpOiBEZWxldGVk LgorICAgICAgICBVc2UgZG9jdW1lbnREZXRhY2hlZCwgd2hpY2ggaXMgbW9yZSBkaXJlY3QuCisK KyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckNTU0FnZW50Ojpmb3JjZVBzZXVkb1N0YXRlKToK KyAgICAgICAgVXBkYXRlIHRoZSBzZXQgb2YgRG9jdW1lbnRzIHdpdGggcHN1ZWRvIGVsZW1lbnQg Y2hhbmdlcy4gU28gd2hlbiB3ZQorICAgICAgICByZXNldCBmb3JjZWQgc3R5bGVzIHdlIGtub3cg d2hpY2ggZG9jdW1lbnRzIHRvIHJlZnJlc2ggc3R5bGVzLgorCisgICAgICAgIChXZWJDb3JlOjpJ bnNwZWN0b3JDU1NBZ2VudDo6cmVzZXRQc2V1ZG9TdGF0ZXMpOgorICAgICAgICBVc2UgdGhlIGxp c3Qgb2YgZG9jdW1lbnRzIHdlJ3ZlIGFscmVhZHkgY29tcHV0ZWQuCisKKyAgICAgICAgKFdlYkNv cmU6Okluc3BlY3RvckNTU0FnZW50OjpkaWRSZW1vdmVET01Ob2RlKToKKyAgICAgICAgKFdlYkNv cmU6Okluc3BlY3RvckNTU0FnZW50OjpkaWRNb2RpZnlET01BdHRyKToKKyAgICAgICAgQ2hhbmdl IHRvIHRha2UgYSByZWZlcmVuY2UgYW5kIG1vcmUgZGF0YSB0byBhdm9pZCBleHRyYSB3b3JrLgor CisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvckRPTUFnZW50Lmg6CisgICAgICAgICogaW5z cGVjdG9yL0luc3BlY3RvckRPTUFnZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3Rv ckRPTUFnZW50Ojp1bmJpbmQpOgorICAgICAgICBFbGltaW5hdGVkIGRpZFJlbW92ZURvY3VtZW50 LgorCisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JET01BZ2VudDo6ZGlkTW9kaWZ5RE9NQXR0 cik6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JET01BZ2VudDo6ZGlkUmVtb3ZlRE9NQXR0 cik6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JET01BZ2VudDo6c3R5bGVBdHRyaWJ1dGVJ bnZhbGlkYXRlZCk6CisgICAgICAgIFBhc3MgYSByZWZlcmVuY2VzIHRvIHRoZSBET00gbGlzdGVu ZXIgY2xpZW50LCB0aGVzZSBhcmUgbmV2ZXIgbnVsbC4KKworMjAxNy0wMS0wMyAgSm9zZXBoIFBl Y29yYXJvICA8cGVjb3Jhcm9AYXBwbGUuY29tPgorCiAgICAgICAgIEFkZCBzb21lIG1pc3Npbmcg bG9uZ2hhbmQgcHJvcGVydGllcyB0byBDU1NDb21wdXRlZFN0eWxlRGVjbGFyYXRpb24gYW5kIGZp eCBkZWZhdWx0IHZhbHVlcwogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTY2Njc0CiAgICAgICAgIDxyZGFyOi8vcHJvYmxlbS82MDI2MTU5PgpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNTU0FnZW50LmNwcCBiL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDU1NBZ2VudC5jcHAKaW5kZXggM2Q1NDIy MS4uNzcyNzU5ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rv ckNTU0FnZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ1NT QWdlbnQuY3BwCkBAIC00MTAsNiArNDEwLDggQEAgdm9pZCBJbnNwZWN0b3JDU1NBZ2VudDo6ZG9j dW1lbnREZXRhY2hlZChEb2N1bWVudCYgZG9jdW1lbnQpCiAgICAgc2V0QWN0aXZlU3R5bGVTaGVl dHNGb3JEb2N1bWVudChkb2N1bWVudCwgZW1wdHlMaXN0KTsKIAogICAgIG1fZG9jdW1lbnRUb0tu b3duQ1NTU3R5bGVTaGVldHMucmVtb3ZlKCZkb2N1bWVudCk7CisgICAgbV9kb2N1bWVudFRvSW5z cGVjdG9yU3R5bGVTaGVldC5yZW1vdmUoJmRvY3VtZW50KTsKKyAgICBtX2RvY3VtZW50c1dpdGhG b3JjZWRQc3VlZG9TdGF0ZXMucmVtb3ZlKCZkb2N1bWVudCk7CiB9CiAKIHZvaWQgSW5zcGVjdG9y Q1NTQWdlbnQ6Om1lZGlhUXVlcnlSZXN1bHRDaGFuZ2VkKCkKQEAgLTUzNiw3ICs1MzgsNyBAQCBi b29sIEluc3BlY3RvckNTU0FnZW50Ojpmb3JjZVBzZXVkb1N0YXRlKGNvbnN0IEVsZW1lbnQmIGVs ZW1lbnQsIENTU1NlbGVjdG9yOjpQcwogICAgIGlmICghbm9kZUlkKQogICAgICAgICByZXR1cm4g ZmFsc2U7CiAKLSAgICBOb2RlSWRUb0ZvcmNlZFBzZXVkb1N0YXRlOjppdGVyYXRvciBpdCA9IG1f bm9kZUlkVG9Gb3JjZWRQc2V1ZG9TdGF0ZS5maW5kKG5vZGVJZCk7CisgICAgYXV0byBpdCA9IG1f bm9kZUlkVG9Gb3JjZWRQc2V1ZG9TdGF0ZS5maW5kKG5vZGVJZCk7CiAgICAgaWYgKGl0ID09IG1f bm9kZUlkVG9Gb3JjZWRQc2V1ZG9TdGF0ZS5lbmQoKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwog CkBAIC04ODAsMTcgKzg4MiwyMSBAQCB2b2lkIEluc3BlY3RvckNTU0FnZW50Ojpmb3JjZVBzZXVk b1N0YXRlKEVycm9yU3RyaW5nJiBlcnJvclN0cmluZywgaW50IG5vZGVJZCwgYwogICAgIGlmICgh ZWxlbWVudCkKICAgICAgICAgcmV0dXJuOwogCisgICAgYXV0byBpdCA9IG1fbm9kZUlkVG9Gb3Jj ZWRQc2V1ZG9TdGF0ZS5maW5kKG5vZGVJZCk7CiAgICAgdW5zaWduZWQgZm9yY2VkUHNldWRvU3Rh dGUgPSBjb21wdXRlUHNldWRvQ2xhc3NNYXNrKGZvcmNlZFBzZXVkb0NsYXNzZXMpOwotICAgIE5v ZGVJZFRvRm9yY2VkUHNldWRvU3RhdGU6Oml0ZXJhdG9yIGl0ID0gbV9ub2RlSWRUb0ZvcmNlZFBz ZXVkb1N0YXRlLmZpbmQobm9kZUlkKTsKICAgICB1bnNpZ25lZCBjdXJyZW50Rm9yY2VkUHNldWRv U3RhdGUgPSBpdCA9PSBtX25vZGVJZFRvRm9yY2VkUHNldWRvU3RhdGUuZW5kKCkgPyAwIDogaXQt PnZhbHVlOwotICAgIGJvb2wgbmVlZFN0eWxlUmVjYWxjID0gZm9yY2VkUHNldWRvU3RhdGUgIT0g Y3VycmVudEZvcmNlZFBzZXVkb1N0YXRlOwotICAgIGlmICghbmVlZFN0eWxlUmVjYWxjKQorICAg IGlmIChmb3JjZWRQc2V1ZG9TdGF0ZSA9PSBjdXJyZW50Rm9yY2VkUHNldWRvU3RhdGUpCiAgICAg ICAgIHJldHVybjsKIAotICAgIGlmIChmb3JjZWRQc2V1ZG9TdGF0ZSkKKyAgICBpZiAoZm9yY2Vk UHNldWRvU3RhdGUpIHsKICAgICAgICAgbV9ub2RlSWRUb0ZvcmNlZFBzZXVkb1N0YXRlLnNldChu b2RlSWQsIGZvcmNlZFBzZXVkb1N0YXRlKTsKLSAgICBlbHNlCisgICAgICAgIG1fZG9jdW1lbnRz V2l0aEZvcmNlZFBzdWVkb1N0YXRlcy5hZGQoJmVsZW1lbnQtPmRvY3VtZW50KCkpOworICAgIH0g ZWxzZSB7CiAgICAgICAgIG1fbm9kZUlkVG9Gb3JjZWRQc2V1ZG9TdGF0ZS5yZW1vdmUobm9kZUlk KTsKKyAgICAgICAgaWYgKG1fbm9kZUlkVG9Gb3JjZWRQc2V1ZG9TdGF0ZS5pc0VtcHR5KCkpCisg ICAgICAgICAgICBtX2RvY3VtZW50c1dpdGhGb3JjZWRQc3VlZG9TdGF0ZXMuY2xlYXIoKTsKKyAg ICB9CisKICAgICBlbGVtZW50LT5kb2N1bWVudCgpLnN0eWxlU2NvcGUoKS5kaWRDaGFuZ2VTdHls ZVNoZWV0RW52aXJvbm1lbnQoKTsKIH0KIApAQCAtMTE0OSwzNSArMTE1NSwyMSBAQCBSZWZQdHI8 SW5zcGVjdG9yOjpQcm90b2NvbDo6Q1NTOjpOYW1lZEZsb3c+IEluc3BlY3RvckNTU0FnZW50Ojpi dWlsZE9iamVjdEZvck5hbQogICAgICAgICAucmVsZWFzZSgpOwogfQogCi12b2lkIEluc3BlY3Rv ckNTU0FnZW50OjpkaWRSZW1vdmVEb2N1bWVudChEb2N1bWVudCogZG9jdW1lbnQpCit2b2lkIElu c3BlY3RvckNTU0FnZW50OjpkaWRSZW1vdmVET01Ob2RlKE5vZGUmIG5vZGUsIGludCBub2RlSWQp CiB7Ci0gICAgaWYgKGRvY3VtZW50KQotICAgICAgICBtX2RvY3VtZW50VG9JbnNwZWN0b3JTdHls ZVNoZWV0LnJlbW92ZShkb2N1bWVudCk7Ci19CisgICAgbV9ub2RlSWRUb0ZvcmNlZFBzZXVkb1N0 YXRlLnJlbW92ZShub2RlSWQpOwogCi12b2lkIEluc3BlY3RvckNTU0FnZW50OjpkaWRSZW1vdmVE T01Ob2RlKE5vZGUqIG5vZGUpCi17Ci0gICAgaWYgKCFub2RlKQotICAgICAgICByZXR1cm47Ci0K LSAgICBpbnQgbm9kZUlkID0gbV9kb21BZ2VudC0+Ym91bmROb2RlSWQobm9kZSk7Ci0gICAgaWYg KG5vZGVJZCkKLSAgICAgICAgbV9ub2RlSWRUb0ZvcmNlZFBzZXVkb1N0YXRlLnJlbW92ZShub2Rl SWQpOwotCi0gICAgTm9kZVRvSW5zcGVjdG9yU3R5bGVTaGVldDo6aXRlcmF0b3IgaXQgPSBtX25v ZGVUb0luc3BlY3RvclN0eWxlU2hlZXQuZmluZChub2RlKTsKKyAgICBhdXRvIGl0ID0gbV9ub2Rl VG9JbnNwZWN0b3JTdHlsZVNoZWV0LmZpbmQoJm5vZGUpOwogICAgIGlmIChpdCA9PSBtX25vZGVU b0luc3BlY3RvclN0eWxlU2hlZXQuZW5kKCkpCiAgICAgICAgIHJldHVybjsKIAogICAgIG1faWRU b0luc3BlY3RvclN0eWxlU2hlZXQucmVtb3ZlKGl0LT52YWx1ZS0+aWQoKSk7Ci0gICAgbV9ub2Rl VG9JbnNwZWN0b3JTdHlsZVNoZWV0LnJlbW92ZShub2RlKTsKKyAgICBtX25vZGVUb0luc3BlY3Rv clN0eWxlU2hlZXQucmVtb3ZlKCZub2RlKTsKIH0KIAotdm9pZCBJbnNwZWN0b3JDU1NBZ2VudDo6 ZGlkTW9kaWZ5RE9NQXR0cihFbGVtZW50KiBlbGVtZW50KQordm9pZCBJbnNwZWN0b3JDU1NBZ2Vu dDo6ZGlkTW9kaWZ5RE9NQXR0cihFbGVtZW50JiBlbGVtZW50KQogewotICAgIGlmICghZWxlbWVu dCkKLSAgICAgICAgcmV0dXJuOwotCi0gICAgTm9kZVRvSW5zcGVjdG9yU3R5bGVTaGVldDo6aXRl cmF0b3IgaXQgPSBtX25vZGVUb0luc3BlY3RvclN0eWxlU2hlZXQuZmluZChlbGVtZW50KTsKKyAg ICBhdXRvIGl0ID0gbV9ub2RlVG9JbnNwZWN0b3JTdHlsZVNoZWV0LmZpbmQoJmVsZW1lbnQpOwog ICAgIGlmIChpdCA9PSBtX25vZGVUb0luc3BlY3RvclN0eWxlU2hlZXQuZW5kKCkpCiAgICAgICAg IHJldHVybjsKIApAQCAtMTE5MSwxNSArMTE4MywxMSBAQCB2b2lkIEluc3BlY3RvckNTU0FnZW50 OjpzdHlsZVNoZWV0Q2hhbmdlZChJbnNwZWN0b3JTdHlsZVNoZWV0KiBzdHlsZVNoZWV0KQogCiB2 b2lkIEluc3BlY3RvckNTU0FnZW50OjpyZXNldFBzZXVkb1N0YXRlcygpCiB7Ci0gICAgSGFzaFNl dDxEb2N1bWVudCo+IGRvY3VtZW50c1RvQ2hhbmdlOwotICAgIGZvciAoYXV0byYgbm9kZUlkIDog bV9ub2RlSWRUb0ZvcmNlZFBzZXVkb1N0YXRlKSB7Ci0gICAgICAgIGlmIChFbGVtZW50KiBlbGVt ZW50ID0gZG93bmNhc3Q8RWxlbWVudD4obV9kb21BZ2VudC0+bm9kZUZvcklkKG5vZGVJZC5rZXkp KSkKLSAgICAgICAgICAgIGRvY3VtZW50c1RvQ2hhbmdlLmFkZCgmZWxlbWVudC0+ZG9jdW1lbnQo KSk7Ci0gICAgfQotCi0gICAgbV9ub2RlSWRUb0ZvcmNlZFBzZXVkb1N0YXRlLmNsZWFyKCk7Ci0g ICAgZm9yIChhdXRvJiBkb2N1bWVudCA6IGRvY3VtZW50c1RvQ2hhbmdlKQorICAgIGZvciAoYXV0 byYgZG9jdW1lbnQgOiBtX2RvY3VtZW50c1dpdGhGb3JjZWRQc3VlZG9TdGF0ZXMpCiAgICAgICAg IGRvY3VtZW50LT5zdHlsZVNjb3BlKCkuZGlkQ2hhbmdlU3R5bGVTaGVldEVudmlyb25tZW50KCk7 CisKKyAgICBtX25vZGVJZFRvRm9yY2VkUHNldWRvU3RhdGUuY2xlYXIoKTsKKyAgICBtX2RvY3Vt ZW50c1dpdGhGb3JjZWRQc3VlZG9TdGF0ZXMuY2xlYXIoKTsKIH0KIAogfSAvLyBuYW1lc3BhY2Ug V2ViQ29yZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNT U0FnZW50LmggYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ1NTQWdlbnQuaApp bmRleCA4ZDFjYzQxLi41MTZlN2I2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvSW5zcGVjdG9yQ1NTQWdlbnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5z cGVjdG9yQ1NTQWdlbnQuaApAQCAtMTU4LDkgKzE1OCw4IEBAIHByaXZhdGU6CiAgICAgUmVmUHRy PEluc3BlY3Rvcjo6UHJvdG9jb2w6OkNTUzo6TmFtZWRGbG93PiBidWlsZE9iamVjdEZvck5hbWVk RmxvdyhFcnJvclN0cmluZyYsIFdlYktpdE5hbWVkRmxvdyosIGludCBkb2N1bWVudE5vZGVJZCk7 CiAKICAgICAvLyBJbnNwZWN0b3JET01BZ2VudDo6RE9NTGlzdGVuZXIgaW1wbGVtZW50YXRpb24K LSAgICB2b2lkIGRpZFJlbW92ZURvY3VtZW50KERvY3VtZW50Kikgb3ZlcnJpZGU7Ci0gICAgdm9p ZCBkaWRSZW1vdmVET01Ob2RlKE5vZGUqKSBvdmVycmlkZTsKLSAgICB2b2lkIGRpZE1vZGlmeURP TUF0dHIoRWxlbWVudCopIG92ZXJyaWRlOworICAgIHZvaWQgZGlkUmVtb3ZlRE9NTm9kZShOb2Rl JiwgaW50IG5vZGVJZCkgb3ZlcnJpZGU7CisgICAgdm9pZCBkaWRNb2RpZnlET01BdHRyKEVsZW1l bnQmKSBvdmVycmlkZTsKIAogICAgIC8vIEluc3BlY3RvckNTU0FnZW50OjpMaXN0ZW5lciBpbXBs ZW1lbnRhdGlvbgogICAgIHZvaWQgc3R5bGVTaGVldENoYW5nZWQoSW5zcGVjdG9yU3R5bGVTaGVl dCopIG92ZXJyaWRlOwpAQCAtMTc3LDYgKzE3Niw3IEBAIHByaXZhdGU6CiAgICAgRG9jdW1lbnRU b1ZpYUluc3BlY3RvclN0eWxlU2hlZXQgbV9kb2N1bWVudFRvSW5zcGVjdG9yU3R5bGVTaGVldDsK ICAgICBIYXNoTWFwPERvY3VtZW50KiwgSGFzaFNldDxDU1NTdHlsZVNoZWV0Kj4+IG1fZG9jdW1l bnRUb0tub3duQ1NTU3R5bGVTaGVldHM7CiAgICAgTm9kZUlkVG9Gb3JjZWRQc2V1ZG9TdGF0ZSBt X25vZGVJZFRvRm9yY2VkUHNldWRvU3RhdGU7CisgICAgSGFzaFNldDxEb2N1bWVudCo+IG1fZG9j dW1lbnRzV2l0aEZvcmNlZFBzdWVkb1N0YXRlczsKICAgICBIYXNoU2V0PGludD4gbV9uYW1lZEZs b3dDb2xsZWN0aW9uc1JlcXVlc3RlZDsKICAgICBzdGQ6OnVuaXF1ZV9wdHI8Q2hhbmdlUmVnaW9u T3ZlcnNldFRhc2s+IG1fY2hhbmdlUmVnaW9uT3ZlcnNldFRhc2s7CiAKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JET01BZ2VudC5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRE9NQWdlbnQuY3BwCmluZGV4IDM4NjBlZjMuLmRmOTYx ZTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JET01BZ2Vu dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRPTUFnZW50LmNw cApAQCAtMzI4LDEwICszMjgsNyBAQCB2b2lkIEluc3BlY3RvckRPTUFnZW50Ojp1bmJpbmQoTm9k ZSogbm9kZSwgTm9kZVRvSWRNYXAqIG5vZGVzTWFwKQogCiAgICAgaWYgKG5vZGUtPmlzRnJhbWVP d25lckVsZW1lbnQoKSkgewogICAgICAgICBjb25zdCBIVE1MRnJhbWVPd25lckVsZW1lbnQqIGZy YW1lT3duZXIgPSBzdGF0aWNfY2FzdDxjb25zdCBIVE1MRnJhbWVPd25lckVsZW1lbnQqPihub2Rl KTsKLSAgICAgICAgRG9jdW1lbnQqIGNvbnRlbnREb2N1bWVudCA9IGZyYW1lT3duZXItPmNvbnRl bnREb2N1bWVudCgpOwotICAgICAgICBpZiAobV9kb21MaXN0ZW5lcikKLSAgICAgICAgICAgIG1f ZG9tTGlzdGVuZXItPmRpZFJlbW92ZURvY3VtZW50KGNvbnRlbnREb2N1bWVudCk7Ci0gICAgICAg IGlmIChjb250ZW50RG9jdW1lbnQpCisgICAgICAgIGlmIChEb2N1bWVudCogY29udGVudERvY3Vt ZW50ID0gZnJhbWVPd25lci0+Y29udGVudERvY3VtZW50KCkpCiAgICAgICAgICAgICB1bmJpbmQo Y29udGVudERvY3VtZW50LCBub2Rlc01hcCk7CiAgICAgfQogCkBAIC0zNDcsNyArMzQ0LDcgQEAg dm9pZCBJbnNwZWN0b3JET01BZ2VudDo6dW5iaW5kKE5vZGUqIG5vZGUsIE5vZGVUb0lkTWFwKiBu b2Rlc01hcCkKIAogICAgIG5vZGVzTWFwLT5yZW1vdmUobm9kZSk7CiAgICAgaWYgKG1fZG9tTGlz dGVuZXIpCi0gICAgICAgIG1fZG9tTGlzdGVuZXItPmRpZFJlbW92ZURPTU5vZGUobm9kZSk7Cisg ICAgICAgIG1fZG9tTGlzdGVuZXItPmRpZFJlbW92ZURPTU5vZGUoKm5vZGUsIGlkKTsKIAogICAg IGJvb2wgY2hpbGRyZW5SZXF1ZXN0ZWQgPSBtX2NoaWxkcmVuUmVxdWVzdGVkLmNvbnRhaW5zKGlk KTsKICAgICBpZiAoY2hpbGRyZW5SZXF1ZXN0ZWQpIHsKQEAgLTIwMjEsNyArMjAxOCw3IEBAIHZv aWQgSW5zcGVjdG9yRE9NQWdlbnQ6OmRpZE1vZGlmeURPTUF0dHIoRWxlbWVudCYgZWxlbWVudCwg Y29uc3QgQXRvbWljU3RyaW5nJiBuCiAgICAgICAgIHJldHVybjsKIAogICAgIGlmIChtX2RvbUxp c3RlbmVyKQotICAgICAgICBtX2RvbUxpc3RlbmVyLT5kaWRNb2RpZnlET01BdHRyKCZlbGVtZW50 KTsKKyAgICAgICAgbV9kb21MaXN0ZW5lci0+ZGlkTW9kaWZ5RE9NQXR0cihlbGVtZW50KTsKIAog ICAgIG1fZnJvbnRlbmREaXNwYXRjaGVyLT5hdHRyaWJ1dGVNb2RpZmllZChpZCwgbmFtZSwgdmFs dWUpOwogfQpAQCAtMjAzNCw3ICsyMDMxLDcgQEAgdm9pZCBJbnNwZWN0b3JET01BZ2VudDo6ZGlk UmVtb3ZlRE9NQXR0cihFbGVtZW50JiBlbGVtZW50LCBjb25zdCBBdG9taWNTdHJpbmcmIG4KICAg ICAgICAgcmV0dXJuOwogCiAgICAgaWYgKG1fZG9tTGlzdGVuZXIpCi0gICAgICAgIG1fZG9tTGlz dGVuZXItPmRpZE1vZGlmeURPTUF0dHIoJmVsZW1lbnQpOworICAgICAgICBtX2RvbUxpc3RlbmVy LT5kaWRNb2RpZnlET01BdHRyKGVsZW1lbnQpOwogCiAgICAgbV9mcm9udGVuZERpc3BhdGNoZXIt PmF0dHJpYnV0ZVJlbW92ZWQoaWQsIG5hbWUpOwogfQpAQCAtMjA0OSw3ICsyMDQ2LDcgQEAgdm9p ZCBJbnNwZWN0b3JET01BZ2VudDo6c3R5bGVBdHRyaWJ1dGVJbnZhbGlkYXRlZChjb25zdCBWZWN0 b3I8RWxlbWVudCo+JiBlbGVtZW4KICAgICAgICAgICAgIGNvbnRpbnVlOwogCiAgICAgICAgIGlm IChtX2RvbUxpc3RlbmVyKQotICAgICAgICAgICAgbV9kb21MaXN0ZW5lci0+ZGlkTW9kaWZ5RE9N QXR0cihlbGVtZW50KTsKKyAgICAgICAgICAgIG1fZG9tTGlzdGVuZXItPmRpZE1vZGlmeURPTUF0 dHIoKmVsZW1lbnQpOwogICAgICAgICBub2RlSWRzLT5hZGRJdGVtKGlkKTsKICAgICB9CiAgICAg bV9mcm9udGVuZERpc3BhdGNoZXItPmlubGluZVN0eWxlSW52YWxpZGF0ZWQoV1RGTW92ZShub2Rl SWRzKSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRE9N QWdlbnQuaCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JET01BZ2VudC5oCmlu ZGV4IDhkNjViNTUuLjg5YmM3NWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9JbnNwZWN0b3JET01BZ2VudC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNw ZWN0b3JET01BZ2VudC5oCkBAIC05MiwxMiArOTIsOSBAQCBjbGFzcyBJbnNwZWN0b3JET01BZ2Vu dCBmaW5hbCA6IHB1YmxpYyBJbnNwZWN0b3JBZ2VudEJhc2UsIHB1YmxpYyBJbnNwZWN0b3I6OkRP TQogICAgIFdURl9NQUtFX0ZBU1RfQUxMT0NBVEVEOwogcHVibGljOgogICAgIHN0cnVjdCBET01M aXN0ZW5lciB7Ci0gICAgICAgIHZpcnR1YWwgfkRPTUxpc3RlbmVyKCkKLSAgICAgICAgewotICAg ICAgICB9Ci0gICAgICAgIHZpcnR1YWwgdm9pZCBkaWRSZW1vdmVEb2N1bWVudChEb2N1bWVudCop ID0gMDsKLSAgICAgICAgdmlydHVhbCB2b2lkIGRpZFJlbW92ZURPTU5vZGUoTm9kZSopID0gMDsK LSAgICAgICAgdmlydHVhbCB2b2lkIGRpZE1vZGlmeURPTUF0dHIoRWxlbWVudCopID0gMDsKKyAg ICAgICAgdmlydHVhbCB+RE9NTGlzdGVuZXIoKSB7IH0KKyAgICAgICAgdmlydHVhbCB2b2lkIGRp ZFJlbW92ZURPTU5vZGUoTm9kZSYsIGludCBub2RlSWQpID0gMDsKKyAgICAgICAgdmlydHVhbCB2 b2lkIGRpZE1vZGlmeURPTUF0dHIoRWxlbWVudCYpID0gMDsKICAgICB9OwogCiAgICAgSW5zcGVj dG9yRE9NQWdlbnQoV2ViQWdlbnRDb250ZXh0JiwgSW5zcGVjdG9yUGFnZUFnZW50KiwgSW5zcGVj dG9yT3ZlcmxheSopOwo=