146843 2015-07-10 11:18:11 -0700 Crash at WebCore::WebPage::innerFrameQuad. 2015-07-10 13:21:03 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan commit-queue ddkilzer enrica kling oldest_to_newest 1108688 0 zalan 2015-07-10 11:18:11 -0700 Crash at WebCore::WebPage::innerFrameQuad 1108690 1 zalan 2015-07-10 11:18:45 -0700 rdar://problem/21501819 1108694 2 256595 zalan 2015-07-10 11:28:56 -0700 Created attachment 256595 Patch 1108700 3 256595 kling 2015-07-10 11:36:36 -0700 Comment on attachment 256595 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=256595&action=review r=me > Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm:782 > + RenderObject* renderer = nullptr; This should be a RenderElement*. > Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm:786 > + else if (assistedNode.rootEditableElement()) > + renderer = assistedNode.rootEditableElement()->renderer(); Can we avoid computing rootEditableElement() twice here? 1108711 4 256601 zalan 2015-07-10 12:24:31 -0700 Created attachment 256601 Patch 1108726 5 256601 commit-queue 2015-07-10 13:20:59 -0700 Comment on attachment 256601 Patch Clearing flags on attachment: 256601 Committed r186684: <http://trac.webkit.org/changeset/186684> 1108727 6 commit-queue 2015-07-10 13:21:03 -0700 All reviewed patches have been landed. Closing bug. 256595 2015-07-10 11:28:56 -0700 2015-07-10 12:24:28 -0700 Patch bug-146843-20150710112754.patch text/plain 10937 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMTg2NTA5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWJjOThmMWE2OTA2NzZk ZjhhN2U2NmEyMWY5ZDFiMjg1OGRmNjA2OS4uMzc4ZTU1NGY4MGE1MzI3MWM0OWE4NzM0MjYwODA2 Zjg1M2UzYTg3OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDE1LTA3LTEwICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgQ3Jhc2ggYXQgV2ViQ29yZTo6 V2ViUGFnZTo6aW5uZXJGcmFtZVF1YWQuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xNDY4NDMKKyAgICAgICAgcmRhcjovL3Byb2JsZW0vMjE1MDE4MTkK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXZSBtYXkg ZW5kIHVwIHdpdGggYSBudWxsIHJvb3RFZGl0YWJsZUVsZW1lbnQoKSBhZnRlciBjYWxsaW5nIERv Y3VtZW50Ojp1cGRhdGVMYXlvdXQoKS4KKworICAgICAgICBTcGVjdWxhdGl2ZSBmaXguIE5vdCBy ZXByb2R1Y2libGUuCisKKyAgICAgICAgKiBwYWdlL0ZyYW1lLmNwcDogU29tZSBjb25zdCBjbGVh bnVwLgorICAgICAgICAoV2ViQ29yZTo6RnJhbWU6OnZpc2libGVQb3NpdGlvbkZvclBvaW50KToK KyAgICAgICAgKiBwYWdlL0ZyYW1lLmg6CisKIDIwMTUtMDctMDggIFphbGFuIEJ1anRhcyAgPHph bGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBEbyBub3Qgd2FzdGUgd2luZG93IHNlcnZlciBtZW1v cnkgZm9yIHBsYWNlaG9sZGVyIHdpbmRvd3MgaW5pdGlhdGVkIGJ5IFRoZW1lTWFjLgpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9n CmluZGV4IDVlZTA2NjVjODE5MzIyY2JlZDVmNWUwZmVjMDJjZTZjNTMzZmQ3Y2YuLjZkMzk1YWUy YjhlYjI4NmIwZGJkZjMxZDk4ZTg3NWFlYTQ3ZGY0OGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQyL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEsMyArMSwy NyBAQAorMjAxNS0wNy0xMCAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgorCisgICAg ICAgIENyYXNoIGF0IFdlYkNvcmU6OldlYlBhZ2U6OmlubmVyRnJhbWVRdWFkLgorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ2ODQzCisgICAgICAgIHJk YXI6Ly9wcm9ibGVtLzIxNTAxODE5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgV2UgbWF5IGVuZCB1cCB3aXRoIGEgbnVsbCByb290RWRpdGFibGVFbGVt ZW50KCkgYWZ0ZXIgY2FsbGluZyBEb2N1bWVudDo6dXBkYXRlTGF5b3V0KCkuCisKKyAgICAgICAg U3BlY3VsYXRpdmUgZml4LiBOb3QgcmVwcm9kdWNpYmxlLgorCisgICAgICAgICogV2ViUHJvY2Vz cy9XZWJQYWdlL1dlYlBhZ2UuaDogU29tZSBjb25zdCBjbGVhbnVwLgorICAgICAgICAqIFdlYlBy b2Nlc3MvV2ViUGFnZS9pb3MvV2ViUGFnZUlPUy5tbToKKyAgICAgICAgKFdlYktpdDo6aW5uZXJG cmFtZVF1YWQpOiBudWxsIGNoZWNrIGFzc2lzdGVkTm9kZS5yb290RWRpdGFibGVFbGVtZW50KCkK KyAgICAgICAgKFdlYktpdDo6Y29uc3RyYWluUG9pbnQpOgorICAgICAgICAoV2ViS2l0OjpXZWJQ YWdlOjpzZWxlY3RXaXRoR2VzdHVyZSk6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OnZpc2li bGVQb3NpdGlvbkluRm9jdXNlZE5vZGVGb3JQb2ludCk6CisgICAgICAgIChXZWJLaXQ6OldlYlBh Z2U6OnNlbGVjdFBvc2l0aW9uQXRQb2ludCk6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OnNl bGVjdFBvc2l0aW9uQXRCb3VuZGFyeVdpdGhEaXJlY3Rpb24pOgorICAgICAgICAoV2ViS2l0OjpX ZWJQYWdlOjpzZWxlY3RUZXh0V2l0aEdyYW51bGFyaXR5QXRQb2ludCk6CisgICAgICAgIChXZWJL aXQ6OldlYlBhZ2U6OnVwZGF0ZVNlbGVjdGlvbldpdGhFeHRlbnRQb2ludCk6CisgICAgICAgIChX ZWJLaXQ6OldlYlBhZ2U6OmdldFBvc2l0aW9uSW5mb3JtYXRpb24pOgorCiAyMDE1LTA3LTA4ICBT dW5nbWFubiBDaG8gIDxzdW5nbWFubi5jaG9AbmF2ZXJjb3JwLmNvbT4KIAogICAgICAgICBbVW5p eF0gUmVtb3ZlIHVudXNlZCBsb2NhbCB2YXJpYWJsZSBmcm9tIENvbm5lY3Rpb246OnNlbmRPdXRn b2luZ01lc3NhZ2UoKS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWUuY3Bw IGIvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZS5jcHAKaW5kZXggNDU3NjEwMTc2NzEwODgwMWMy ODE5Y2QwZjM2NWY2NzY0YzA0YWI0Ny4uZGI2NzAxMTBiYmI4NjFlM2ExYmQzZDFkZTdiMzM0MWMw OTg5NDNhMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZS5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZS5jcHAKQEAgLTgxNiw3ICs4MTYsNyBAQCBTdHJpbmcg RnJhbWU6OmRpc3BsYXlTdHJpbmdNb2RpZmllZEJ5RW5jb2RpbmcoY29uc3QgU3RyaW5nJiBzdHIp IGNvbnN0CiAgICAgcmV0dXJuIGRvY3VtZW50KCkgPyBkb2N1bWVudCgpLT5kaXNwbGF5U3RyaW5n TW9kaWZpZWRCeUVuY29kaW5nKHN0cikgOiBzdHI7CiB9CiAKLVZpc2libGVQb3NpdGlvbiBGcmFt ZTo6dmlzaWJsZVBvc2l0aW9uRm9yUG9pbnQoY29uc3QgSW50UG9pbnQmIGZyYW1lUG9pbnQpCitW aXNpYmxlUG9zaXRpb24gRnJhbWU6OnZpc2libGVQb3NpdGlvbkZvclBvaW50KGNvbnN0IEludFBv aW50JiBmcmFtZVBvaW50KSBjb25zdAogewogICAgIEhpdFRlc3RSZXN1bHQgcmVzdWx0ID0gZXZl bnRIYW5kbGVyKCkuaGl0VGVzdFJlc3VsdEF0UG9pbnQoZnJhbWVQb2ludCwgSGl0VGVzdFJlcXVl c3Q6OlJlYWRPbmx5IHwgSGl0VGVzdFJlcXVlc3Q6OkFjdGl2ZSk7CiAgICAgTm9kZSogbm9kZSA9 IHJlc3VsdC5pbm5lck5vblNoYXJlZE5vZGUoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3BhZ2UvRnJhbWUuaCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWUuaAppbmRleCA5NzU4MGRk OWMyY2IxMmExYTg0MDdhMzdjNzUzNDI1YzExNmE5Nzg3Li42NzEyMzZmYmM1NjcxNDY5NWY0ODZm MzlhOWVmYzI2YWI5MjlhNmRhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1l LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZS5oCkBAIC0yMjMsNyArMjIzLDcgQEAg bmFtZXNwYWNlIFdlYkNvcmUgewogCiAgICAgICAgIFdFQkNPUkVfRVhQT1JUIFN0cmluZyBkaXNw bGF5U3RyaW5nTW9kaWZpZWRCeUVuY29kaW5nKGNvbnN0IFN0cmluZyYpIGNvbnN0OwogCi0gICAg ICAgIFdFQkNPUkVfRVhQT1JUIFZpc2libGVQb3NpdGlvbiB2aXNpYmxlUG9zaXRpb25Gb3JQb2lu dChjb25zdCBJbnRQb2ludCYgZnJhbWVQb2ludCk7CisgICAgICAgIFdFQkNPUkVfRVhQT1JUIFZp c2libGVQb3NpdGlvbiB2aXNpYmxlUG9zaXRpb25Gb3JQb2ludChjb25zdCBJbnRQb2ludCYgZnJh bWVQb2ludCkgY29uc3Q7CiAgICAgICAgIERvY3VtZW50KiBkb2N1bWVudEF0UG9pbnQoY29uc3Qg SW50UG9pbnQmIHdpbmRvd1BvaW50KTsKICAgICAgICAgV0VCQ09SRV9FWFBPUlQgUmVmUHRyPFJh bmdlPiByYW5nZUZvclBvaW50KGNvbnN0IEludFBvaW50JiBmcmFtZVBvaW50KTsKIApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaCBiL1NvdXJj ZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmgKaW5kZXggOTlhYmUzNzJjOGMw NGFlNTNhYTgyMDVjZDcwZDkwMDg1MWZmOWUzNi4uZjYxYThlZTM0NzIzYmMxNWZjNzI3NGViOGYz ZmJkOWZjOGM4YTVlNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQ YWdlL1dlYlBhZ2UuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2Vi UGFnZS5oCkBAIC05MjYsNyArOTI2LDcgQEAgcHJpdmF0ZToKICAgICB2b2lkIGNvbXBsZXRlU3lu dGhldGljQ2xpY2soV2ViQ29yZTo6Tm9kZSogbm9kZVJlc3BvbmRpbmdUb0NsaWNrLCBjb25zdCBX ZWJDb3JlOjpGbG9hdFBvaW50JiBsb2NhdGlvbik7CiAgICAgdm9pZCBzZW5kVGFwSGlnaGxpZ2h0 Rm9yTm9kZUlmTmVjZXNzYXJ5KHVpbnQ2NF90IHJlcXVlc3RJRCwgV2ViQ29yZTo6Tm9kZSopOwog ICAgIHZvaWQgcmVzZXRUZXh0QXV0b3NpemluZ0JlZm9yZUxheW91dElmTmVlZGVkKGNvbnN0IFdl YkNvcmU6OkZsb2F0U2l6ZSYgb2xkU2l6ZSwgY29uc3QgV2ViQ29yZTo6RmxvYXRTaXplJiBuZXdT aXplKTsKLSAgICBXZWJDb3JlOjpWaXNpYmxlUG9zaXRpb24gdmlzaWJsZVBvc2l0aW9uSW5Gb2N1 c2VkTm9kZUZvclBvaW50KFdlYkNvcmU6OkZyYW1lJiwgY29uc3QgV2ViQ29yZTo6SW50UG9pbnQm KTsKKyAgICBXZWJDb3JlOjpWaXNpYmxlUG9zaXRpb24gdmlzaWJsZVBvc2l0aW9uSW5Gb2N1c2Vk Tm9kZUZvclBvaW50KGNvbnN0IFdlYkNvcmU6OkZyYW1lJiwgY29uc3QgV2ViQ29yZTo6SW50UG9p bnQmKTsKICAgICB2b2lkIHZvbGF0aWxpdHlUaW1lckZpcmVkKCk7CiAjZW5kaWYKICNpZiAhUExB VEZPUk0oQ09DT0EpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBh Z2UvaW9zL1dlYlBhZ2VJT1MubW0gYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2Uv aW9zL1dlYlBhZ2VJT1MubW0KaW5kZXggOWY0Y2VjNzIzMWRkNDYyNzE1NjNkNTJiNmE0ZTJiOWQz Mjc4ODdjNi4uNmRjMWQ3NDFiMGY3MTRmNjVhODdiYjliY2Y3NDc1NjE2YTZjNmM0ZiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL2lvcy9XZWJQYWdlSU9TLm1t CisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9pb3MvV2ViUGFnZUlPUy5t bQpAQCAtNzc2LDE0ICs3NzYsMTQgQEAgdm9pZCBXZWJQYWdlOjpkaXNhYmxlSW5zcGVjdG9yTm9k ZVNlYXJjaCgpCiAgICAgc2VuZChNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpEaXNhYmxlSW5zcGVj dG9yTm9kZVNlYXJjaCgpKTsKIH0KIAotc3RhdGljIEZsb2F0UXVhZCBpbm5lckZyYW1lUXVhZChG cmFtZSogZnJhbWUsIE5vZGUqIGFzc2lzdGVkTm9kZSkKLXsKLSAgICBmcmFtZS0+ZG9jdW1lbnQo KS0+dXBkYXRlTGF5b3V0SWdub3JlUGVuZGluZ1N0eWxlc2hlZXRzKCk7Ci0gICAgUmVuZGVyT2Jq ZWN0KiByZW5kZXJlcjsKLSAgICBpZiAoYXNzaXN0ZWROb2RlLT5oYXNUYWdOYW1lKEhUTUxOYW1l czo6dGV4dGFyZWFUYWcpIHx8IGFzc2lzdGVkTm9kZS0+aGFzVGFnTmFtZShIVE1MTmFtZXM6Omlu cHV0VGFnKSB8fCBhc3Npc3RlZE5vZGUtPmhhc1RhZ05hbWUoSFRNTE5hbWVzOjpzZWxlY3RUYWcp KQotICAgICAgICByZW5kZXJlciA9IGFzc2lzdGVkTm9kZS0+cmVuZGVyZXIoKTsKLSAgICBlbHNl Ci0gICAgICAgIHJlbmRlcmVyID0gYXNzaXN0ZWROb2RlLT5yb290RWRpdGFibGVFbGVtZW50KCkt PnJlbmRlcmVyKCk7CitzdGF0aWMgRmxvYXRRdWFkIGlubmVyRnJhbWVRdWFkKGNvbnN0IEZyYW1l JiBmcmFtZSwgY29uc3QgTm9kZSYgYXNzaXN0ZWROb2RlKQoreworICAgIGZyYW1lLmRvY3VtZW50 KCktPnVwZGF0ZUxheW91dElnbm9yZVBlbmRpbmdTdHlsZXNoZWV0cygpOworICAgIFJlbmRlck9i amVjdCogcmVuZGVyZXIgPSBudWxscHRyOworICAgIGlmIChhc3Npc3RlZE5vZGUuaGFzVGFnTmFt ZShIVE1MTmFtZXM6OnRleHRhcmVhVGFnKSB8fCBhc3Npc3RlZE5vZGUuaGFzVGFnTmFtZShIVE1M TmFtZXM6OmlucHV0VGFnKSB8fCBhc3Npc3RlZE5vZGUuaGFzVGFnTmFtZShIVE1MTmFtZXM6OnNl bGVjdFRhZykpCisgICAgICAgIHJlbmRlcmVyID0gYXNzaXN0ZWROb2RlLnJlbmRlcmVyKCk7Cisg ICAgZWxzZSBpZiAoYXNzaXN0ZWROb2RlLnJvb3RFZGl0YWJsZUVsZW1lbnQoKSkKKyAgICAgICAg cmVuZGVyZXIgPSBhc3Npc3RlZE5vZGUucm9vdEVkaXRhYmxlRWxlbWVudCgpLT5yZW5kZXJlcigp OwogICAgIAogICAgIGlmICghcmVuZGVyZXIpCiAgICAgICAgIHJldHVybiBGbG9hdFF1YWQoKTsK QEAgLTc5OCw5ICs3OTgsOSBAQCBzdGF0aWMgRmxvYXRRdWFkIGlubmVyRnJhbWVRdWFkKEZyYW1l KiBmcmFtZSwgTm9kZSogYXNzaXN0ZWROb2RlKQogICAgIHJldHVybiBGbG9hdFF1YWQoYm91bmRp bmdCb3gpOwogfQogCi1zdGF0aWMgSW50UG9pbnQgY29uc3RyYWluUG9pbnQoY29uc3QgSW50UG9p bnQmIHBvaW50LCBGcmFtZSogZnJhbWUsIE5vZGUqIGFzc2lzdGVkTm9kZSkKK3N0YXRpYyBJbnRQ b2ludCBjb25zdHJhaW5Qb2ludChjb25zdCBJbnRQb2ludCYgcG9pbnQsIGNvbnN0IEZyYW1lJiBm cmFtZSwgY29uc3QgTm9kZSYgYXNzaXN0ZWROb2RlKQogewotICAgIEFTU0VSVCghYXNzaXN0ZWRO b2RlIHx8ICZhc3Npc3RlZE5vZGUtPmRvY3VtZW50KCkgPT0gZnJhbWUtPmRvY3VtZW50KCkpOwor ICAgIEFTU0VSVCgmYXNzaXN0ZWROb2RlLmRvY3VtZW50KCkgPT0gZnJhbWUuZG9jdW1lbnQoKSk7 CiAgICAgY29uc3QgaW50IERFRkFVTFRfQ09OU1RSQUlOX0lOU0VUID0gMjsKICAgICBJbnRSZWN0 IGlubmVyRnJhbWUgPSBpbm5lckZyYW1lUXVhZChmcmFtZSwgYXNzaXN0ZWROb2RlKS5lbmNsb3Np bmdCb3VuZGluZ0JveCgpOwogICAgIEludFBvaW50IGNvbnN0cmFpbmVkUG9pbnQgPSBwb2ludDsK QEAgLTkzNCw3ICs5MzQsNyBAQCBQYXNzUmVmUHRyPFJhbmdlPiBXZWJQYWdlOjpyYW5nZUZvckJs b2NrQXRQb2ludChjb25zdCBJbnRQb2ludCYgcG9pbnQpCiAKIHZvaWQgV2ViUGFnZTo6c2VsZWN0 V2l0aEdlc3R1cmUoY29uc3QgSW50UG9pbnQmIHBvaW50LCB1aW50MzJfdCBncmFudWxhcml0eSwg dWludDMyX3QgZ2VzdHVyZVR5cGUsIHVpbnQzMl90IGdlc3R1cmVTdGF0ZSwgdWludDY0X3QgY2Fs bGJhY2tJRCkKIHsKLSAgICBGcmFtZSYgZnJhbWUgPSBtX3BhZ2UtPmZvY3VzQ29udHJvbGxlcigp LmZvY3VzZWRPck1haW5GcmFtZSgpOworICAgIGNvbnN0IEZyYW1lJiBmcmFtZSA9IG1fcGFnZS0+ Zm9jdXNDb250cm9sbGVyKCkuZm9jdXNlZE9yTWFpbkZyYW1lKCk7CiAgICAgVmlzaWJsZVBvc2l0 aW9uIHBvc2l0aW9uID0gdmlzaWJsZVBvc2l0aW9uSW5Gb2N1c2VkTm9kZUZvclBvaW50KGZyYW1l LCBwb2ludCk7CiAKICAgICBpZiAocG9zaXRpb24uaXNOdWxsKCkpIHsKQEAgLTE2NzMsMTYgKzE2 NzMsMTYgQEAgdm9pZCBXZWJQYWdlOjptb3ZlU2VsZWN0aW9uQnlPZmZzZXQoaW50MzJfdCBvZmZz ZXQsIHVpbnQ2NF90IGNhbGxiYWNrSUQpCiAgICAgc2VuZChNZXNzYWdlczo6V2ViUGFnZVByb3h5 OjpWb2lkQ2FsbGJhY2soY2FsbGJhY2tJRCkpOwogfQogCi1WaXNpYmxlUG9zaXRpb24gV2ViUGFn ZTo6dmlzaWJsZVBvc2l0aW9uSW5Gb2N1c2VkTm9kZUZvclBvaW50KEZyYW1lJiBmcmFtZSwgY29u c3QgSW50UG9pbnQmIHBvaW50KQorVmlzaWJsZVBvc2l0aW9uIFdlYlBhZ2U6OnZpc2libGVQb3Np dGlvbkluRm9jdXNlZE5vZGVGb3JQb2ludChjb25zdCBGcmFtZSYgZnJhbWUsIGNvbnN0IEludFBv aW50JiBwb2ludCkKIHsKICAgICBJbnRQb2ludCBhZGp1c3RlZFBvaW50KGZyYW1lLnZpZXcoKS0+ cm9vdFZpZXdUb0NvbnRlbnRzKHBvaW50KSk7Ci0gICAgSW50UG9pbnQgY29uc3RyYWluZWRQb2lu dCA9IG1fYXNzaXN0ZWROb2RlID8gY29uc3RyYWluUG9pbnQoYWRqdXN0ZWRQb2ludCwgJmZyYW1l LCBtX2Fzc2lzdGVkTm9kZS5nZXQoKSkgOiBhZGp1c3RlZFBvaW50OworICAgIEludFBvaW50IGNv bnN0cmFpbmVkUG9pbnQgPSBtX2Fzc2lzdGVkTm9kZSA/IGNvbnN0cmFpblBvaW50KGFkanVzdGVk UG9pbnQsIGZyYW1lLCAqbV9hc3Npc3RlZE5vZGUpIDogYWRqdXN0ZWRQb2ludDsKICAgICByZXR1 cm4gZnJhbWUudmlzaWJsZVBvc2l0aW9uRm9yUG9pbnQoY29uc3RyYWluZWRQb2ludCk7CiB9CiAK IHZvaWQgV2ViUGFnZTo6c2VsZWN0UG9zaXRpb25BdFBvaW50KGNvbnN0IFdlYkNvcmU6OkludFBv aW50JiBwb2ludCwgdWludDY0X3QgY2FsbGJhY2tJRCkKIHsKLSAgICBGcmFtZSYgZnJhbWUgPSBt X3BhZ2UtPmZvY3VzQ29udHJvbGxlcigpLmZvY3VzZWRPck1haW5GcmFtZSgpOworICAgIGNvbnN0 IEZyYW1lJiBmcmFtZSA9IG1fcGFnZS0+Zm9jdXNDb250cm9sbGVyKCkuZm9jdXNlZE9yTWFpbkZy YW1lKCk7CiAgICAgVmlzaWJsZVBvc2l0aW9uIHBvc2l0aW9uID0gdmlzaWJsZVBvc2l0aW9uSW5G b2N1c2VkTm9kZUZvclBvaW50KGZyYW1lLCBwb2ludCk7CiAgICAgCiAgICAgaWYgKHBvc2l0aW9u LmlzTm90TnVsbCgpKQpAQCAtMTY5Miw3ICsxNjkyLDcgQEAgdm9pZCBXZWJQYWdlOjpzZWxlY3RQ b3NpdGlvbkF0UG9pbnQoY29uc3QgV2ViQ29yZTo6SW50UG9pbnQmIHBvaW50LCB1aW50NjRfdCBj YWwKIAogdm9pZCBXZWJQYWdlOjpzZWxlY3RQb3NpdGlvbkF0Qm91bmRhcnlXaXRoRGlyZWN0aW9u KGNvbnN0IFdlYkNvcmU6OkludFBvaW50JiBwb2ludCwgdWludDMyX3QgZ3JhbnVsYXJpdHksIHVp bnQzMl90IGRpcmVjdGlvbiwgdWludDY0X3QgY2FsbGJhY2tJRCkKIHsKLSAgICBGcmFtZSYgZnJh bWUgPSBtX3BhZ2UtPmZvY3VzQ29udHJvbGxlcigpLmZvY3VzZWRPck1haW5GcmFtZSgpOworICAg IGNvbnN0IEZyYW1lJiBmcmFtZSA9IG1fcGFnZS0+Zm9jdXNDb250cm9sbGVyKCkuZm9jdXNlZE9y TWFpbkZyYW1lKCk7CiAgICAgVmlzaWJsZVBvc2l0aW9uIHBvc2l0aW9uID0gdmlzaWJsZVBvc2l0 aW9uSW5Gb2N1c2VkTm9kZUZvclBvaW50KGZyYW1lLCBwb2ludCk7CiAKICAgICBpZiAocG9zaXRp b24uaXNOb3ROdWxsKCkpIHsKQEAgLTE3MTksNyArMTcxOSw3IEBAIHZvaWQgV2ViUGFnZTo6bW92 ZVNlbGVjdGlvbkF0Qm91bmRhcnlXaXRoRGlyZWN0aW9uKHVpbnQzMl90IGdyYW51bGFyaXR5LCB1 aW50MzJfCiAKIHZvaWQgV2ViUGFnZTo6c2VsZWN0VGV4dFdpdGhHcmFudWxhcml0eUF0UG9pbnQo Y29uc3QgV2ViQ29yZTo6SW50UG9pbnQmIHBvaW50LCB1aW50MzJfdCBncmFudWxhcml0eSwgdWlu dDY0X3QgY2FsbGJhY2tJRCkKIHsKLSAgICBGcmFtZSYgZnJhbWUgPSBtX3BhZ2UtPmZvY3VzQ29u dHJvbGxlcigpLmZvY3VzZWRPck1haW5GcmFtZSgpOworICAgIGNvbnN0IEZyYW1lJiBmcmFtZSA9 IG1fcGFnZS0+Zm9jdXNDb250cm9sbGVyKCkuZm9jdXNlZE9yTWFpbkZyYW1lKCk7CiAgICAgVmlz aWJsZVBvc2l0aW9uIHBvc2l0aW9uID0gdmlzaWJsZVBvc2l0aW9uSW5Gb2N1c2VkTm9kZUZvclBv aW50KGZyYW1lLCBwb2ludCk7CiAKICAgICBSZWZQdHI8UmFuZ2U+IHJhbmdlOwpAQCAtMTc1Miw3 ICsxNzUyLDcgQEAgdm9pZCBXZWJQYWdlOjpiZWdpblNlbGVjdGlvbkluRGlyZWN0aW9uKHVpbnQz Ml90IGRpcmVjdGlvbiwgdWludDY0X3QgY2FsbGJhY2tJRCkKICAgICAKIHZvaWQgV2ViUGFnZTo6 dXBkYXRlU2VsZWN0aW9uV2l0aEV4dGVudFBvaW50KGNvbnN0IFdlYkNvcmU6OkludFBvaW50JiBw b2ludCwgdWludDY0X3QgY2FsbGJhY2tJRCkKIHsKLSAgICBGcmFtZSYgZnJhbWUgPSBtX3BhZ2Ut PmZvY3VzQ29udHJvbGxlcigpLmZvY3VzZWRPck1haW5GcmFtZSgpOworICAgIGNvbnN0IEZyYW1l JiBmcmFtZSA9IG1fcGFnZS0+Zm9jdXNDb250cm9sbGVyKCkuZm9jdXNlZE9yTWFpbkZyYW1lKCk7 CiAgICAgVmlzaWJsZVBvc2l0aW9uIHBvc2l0aW9uID0gdmlzaWJsZVBvc2l0aW9uSW5Gb2N1c2Vk Tm9kZUZvclBvaW50KGZyYW1lLCBwb2ludCk7CiAKICAgICBpZiAocG9zaXRpb24uaXNOdWxsKCkp IHsKQEAgLTIwOTYsMTMgKzIwOTYsMTMgQEAgdm9pZCBXZWJQYWdlOjpnZXRQb3NpdGlvbkluZm9y bWF0aW9uKGNvbnN0IEludFBvaW50JiBwb2ludCwgSW50ZXJhY3Rpb25JbmZvcm1hdGkKICAgICBp bmZvLnBvaW50ID0gcG9pbnQ7CiAgICAgaW5mby5ub2RlQXRQb3NpdGlvbklzQXNzaXN0ZWROb2Rl ID0gKGhpdE5vZGUgPT0gbV9hc3Npc3RlZE5vZGUpOwogICAgIGlmIChtX2Fzc2lzdGVkTm9kZSkg ewotICAgICAgICBGcmFtZSYgZnJhbWUgPSBtX3BhZ2UtPmZvY3VzQ29udHJvbGxlcigpLmZvY3Vz ZWRPck1haW5GcmFtZSgpOworICAgICAgICBjb25zdCBGcmFtZSYgZnJhbWUgPSBtX3BhZ2UtPmZv Y3VzQ29udHJvbGxlcigpLmZvY3VzZWRPck1haW5GcmFtZSgpOwogICAgICAgICBpZiAoZnJhbWUu ZWRpdG9yKCkuaGFzQ29tcG9zaXRpb24oKSkgewogICAgICAgICAgICAgY29uc3QgdWludDMyX3Qg a0hpdEFyZWFXaWR0aCA9IDY2OwogICAgICAgICAgICAgY29uc3QgdWludDMyX3Qga0hpdEFyZWFI ZWlnaHQgPSA2NjsKICAgICAgICAgICAgIEZyYW1lVmlldyYgdmlldyA9ICpmcmFtZS52aWV3KCk7 CiAgICAgICAgICAgICBJbnRQb2ludCBhZGp1c3RlZFBvaW50KHZpZXcucm9vdFZpZXdUb0NvbnRl bnRzKHBvaW50KSk7Ci0gICAgICAgICAgICBJbnRQb2ludCBjb25zdHJhaW5lZFBvaW50ID0gbV9h c3Npc3RlZE5vZGUgPyBjb25zdHJhaW5Qb2ludChhZGp1c3RlZFBvaW50LCAmZnJhbWUsIG1fYXNz aXN0ZWROb2RlLmdldCgpKSA6IGFkanVzdGVkUG9pbnQ7CisgICAgICAgICAgICBJbnRQb2ludCBj b25zdHJhaW5lZFBvaW50ID0gbV9hc3Npc3RlZE5vZGUgPyBjb25zdHJhaW5Qb2ludChhZGp1c3Rl ZFBvaW50LCBmcmFtZSwgKm1fYXNzaXN0ZWROb2RlKSA6IGFkanVzdGVkUG9pbnQ7CiAgICAgICAg ICAgICBWaXNpYmxlUG9zaXRpb24gcG9zaXRpb24gPSBmcmFtZS52aXNpYmxlUG9zaXRpb25Gb3JQ b2ludChjb25zdHJhaW5lZFBvaW50KTsKIAogICAgICAgICAgICAgUmVmUHRyPFJhbmdlPiBjb21w b3NpdGlvblJhbmdlID0gZnJhbWUuZWRpdG9yKCkuY29tcG9zaXRpb25SYW5nZSgpOwo= 256601 2015-07-10 12:24:31 -0700 2015-07-10 13:20:59 -0700 Patch bug-146843-20150710122329.patch text/plain 10977 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMTg2NTA5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWJjOThmMWE2OTA2NzZk ZjhhN2U2NmEyMWY5ZDFiMjg1OGRmNjA2OS4uYmM4ZjZlZmI5NjFkMWIzNGYyYzc1MTk1ZmRmNjFk ODdiYjZhNzI2ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDE1LTA3LTEwICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgQ3Jhc2ggYXQgV2ViQ29yZTo6 V2ViUGFnZTo6aW5uZXJGcmFtZVF1YWQuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xNDY4NDMKKyAgICAgICAgcmRhcjovL3Byb2JsZW0vMjE1MDE4MTkK KworICAgICAgICBSZXZpZXdlZCBieSBBbmRyZWFzIEtsaW5nLgorCisgICAgICAgIFdlIG1heSBl bmQgdXAgd2l0aCBhIG51bGwgcm9vdEVkaXRhYmxlRWxlbWVudCgpIGFmdGVyIGNhbGxpbmcgRG9j dW1lbnQ6OnVwZGF0ZUxheW91dCgpLgorCisgICAgICAgIFNwZWN1bGF0aXZlIGZpeC4gTm90IHJl cHJvZHVjaWJsZS4KKworICAgICAgICAqIHBhZ2UvRnJhbWUuY3BwOiBTb21lIGNvbnN0IGNsZWFu dXAuCisgICAgICAgIChXZWJDb3JlOjpGcmFtZTo6dmlzaWJsZVBvc2l0aW9uRm9yUG9pbnQpOgor ICAgICAgICAqIHBhZ2UvRnJhbWUuaDoKKwogMjAxNS0wNy0wOCAgWmFsYW4gQnVqdGFzICA8emFs YW5AYXBwbGUuY29tPgogCiAgICAgICAgIERvIG5vdCB3YXN0ZSB3aW5kb3cgc2VydmVyIG1lbW9y eSBmb3IgcGxhY2Vob2xkZXIgd2luZG93cyBpbml0aWF0ZWQgYnkgVGhlbWVNYWMuCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cK aW5kZXggNWVlMDY2NWM4MTkzMjJjYmVkNWY1ZTBmZWMwMmNlNmM1MzNmZDdjZi4uODk2YzNiZDMy OTg3M2U4OTQyY2YxOTlkMjlhNDhmM2Y2NzU1MjdlMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dDIvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3 IEBACisyMDE1LTA3LTEwICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAg ICAgQ3Jhc2ggYXQgV2ViQ29yZTo6V2ViUGFnZTo6aW5uZXJGcmFtZVF1YWQuCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDY4NDMKKyAgICAgICAgcmRh cjovL3Byb2JsZW0vMjE1MDE4MTkKKworICAgICAgICBSZXZpZXdlZCBieSBBbmRyZWFzIEtsaW5n LgorCisgICAgICAgIFdlIG1heSBlbmQgdXAgd2l0aCBhIG51bGwgcm9vdEVkaXRhYmxlRWxlbWVu dCgpIGFmdGVyIGNhbGxpbmcgRG9jdW1lbnQ6OnVwZGF0ZUxheW91dCgpLgorCisgICAgICAgIFNw ZWN1bGF0aXZlIGZpeC4gTm90IHJlcHJvZHVjaWJsZS4KKworICAgICAgICAqIFdlYlByb2Nlc3Mv V2ViUGFnZS9XZWJQYWdlLmg6IFNvbWUgY29uc3QgY2xlYW51cC4KKyAgICAgICAgKiBXZWJQcm9j ZXNzL1dlYlBhZ2UvaW9zL1dlYlBhZ2VJT1MubW06CisgICAgICAgIChXZWJLaXQ6OmlubmVyRnJh bWVRdWFkKTogbnVsbCBjaGVjayBhc3Npc3RlZE5vZGUucm9vdEVkaXRhYmxlRWxlbWVudCgpCisg ICAgICAgIChXZWJLaXQ6OmNvbnN0cmFpblBvaW50KToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFn ZTo6c2VsZWN0V2l0aEdlc3R1cmUpOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjp2aXNpYmxl UG9zaXRpb25JbkZvY3VzZWROb2RlRm9yUG9pbnQpOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdl OjpzZWxlY3RQb3NpdGlvbkF0UG9pbnQpOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjpzZWxl Y3RQb3NpdGlvbkF0Qm91bmRhcnlXaXRoRGlyZWN0aW9uKToKKyAgICAgICAgKFdlYktpdDo6V2Vi UGFnZTo6c2VsZWN0VGV4dFdpdGhHcmFudWxhcml0eUF0UG9pbnQpOgorICAgICAgICAoV2ViS2l0 OjpXZWJQYWdlOjp1cGRhdGVTZWxlY3Rpb25XaXRoRXh0ZW50UG9pbnQpOgorICAgICAgICAoV2Vi S2l0OjpXZWJQYWdlOjpnZXRQb3NpdGlvbkluZm9ybWF0aW9uKToKKwogMjAxNS0wNy0wOCAgU3Vu Z21hbm4gQ2hvICA8c3VuZ21hbm4uY2hvQG5hdmVyY29ycC5jb20+CiAKICAgICAgICAgW1VuaXhd IFJlbW92ZSB1bnVzZWQgbG9jYWwgdmFyaWFibGUgZnJvbSBDb25uZWN0aW9uOjpzZW5kT3V0Z29p bmdNZXNzYWdlKCkuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lLmNwcCBi L1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWUuY3BwCmluZGV4IDQ1NzYxMDE3NjcxMDg4MDFjMjgx OWNkMGYzNjVmNjc2NGMwNGFiNDcuLmRiNjcwMTEwYmJiODYxZTNhMWJkM2QxZGU3YjMzNDFjMDk4 OTQzYTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWUuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWUuY3BwCkBAIC04MTYsNyArODE2LDcgQEAgU3RyaW5nIEZy YW1lOjpkaXNwbGF5U3RyaW5nTW9kaWZpZWRCeUVuY29kaW5nKGNvbnN0IFN0cmluZyYgc3RyKSBj b25zdAogICAgIHJldHVybiBkb2N1bWVudCgpID8gZG9jdW1lbnQoKS0+ZGlzcGxheVN0cmluZ01v ZGlmaWVkQnlFbmNvZGluZyhzdHIpIDogc3RyOwogfQogCi1WaXNpYmxlUG9zaXRpb24gRnJhbWU6 OnZpc2libGVQb3NpdGlvbkZvclBvaW50KGNvbnN0IEludFBvaW50JiBmcmFtZVBvaW50KQorVmlz aWJsZVBvc2l0aW9uIEZyYW1lOjp2aXNpYmxlUG9zaXRpb25Gb3JQb2ludChjb25zdCBJbnRQb2lu dCYgZnJhbWVQb2ludCkgY29uc3QKIHsKICAgICBIaXRUZXN0UmVzdWx0IHJlc3VsdCA9IGV2ZW50 SGFuZGxlcigpLmhpdFRlc3RSZXN1bHRBdFBvaW50KGZyYW1lUG9pbnQsIEhpdFRlc3RSZXF1ZXN0 OjpSZWFkT25seSB8IEhpdFRlc3RSZXF1ZXN0OjpBY3RpdmUpOwogICAgIE5vZGUqIG5vZGUgPSBy ZXN1bHQuaW5uZXJOb25TaGFyZWROb2RlKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9w YWdlL0ZyYW1lLmggYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lLmgKaW5kZXggOTc1ODBkZDlj MmNiMTJhMWE4NDA3YTM3Yzc1MzQyNWMxMTZhOTc4Ny4uNjcxMjM2ZmJjNTY3MTQ2OTVmNDg2ZjM5 YTllZmMyNmFiOTI5YTZkYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZS5o CisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWUuaApAQCAtMjIzLDcgKzIyMyw3IEBAIG5h bWVzcGFjZSBXZWJDb3JlIHsKIAogICAgICAgICBXRUJDT1JFX0VYUE9SVCBTdHJpbmcgZGlzcGxh eVN0cmluZ01vZGlmaWVkQnlFbmNvZGluZyhjb25zdCBTdHJpbmcmKSBjb25zdDsKIAotICAgICAg ICBXRUJDT1JFX0VYUE9SVCBWaXNpYmxlUG9zaXRpb24gdmlzaWJsZVBvc2l0aW9uRm9yUG9pbnQo Y29uc3QgSW50UG9pbnQmIGZyYW1lUG9pbnQpOworICAgICAgICBXRUJDT1JFX0VYUE9SVCBWaXNp YmxlUG9zaXRpb24gdmlzaWJsZVBvc2l0aW9uRm9yUG9pbnQoY29uc3QgSW50UG9pbnQmIGZyYW1l UG9pbnQpIGNvbnN0OwogICAgICAgICBEb2N1bWVudCogZG9jdW1lbnRBdFBvaW50KGNvbnN0IElu dFBvaW50JiB3aW5kb3dQb2ludCk7CiAgICAgICAgIFdFQkNPUkVfRVhQT1JUIFJlZlB0cjxSYW5n ZT4gcmFuZ2VGb3JQb2ludChjb25zdCBJbnRQb2ludCYgZnJhbWVQb2ludCk7CiAKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmggYi9Tb3VyY2Uv V2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oCmluZGV4IDk5YWJlMzcyYzhjMDRh ZTUzYWE4MjA1Y2Q3MGQ5MDA4NTFmZjllMzYuLmY2MWE4ZWUzNDcyM2JjMTVmYzcyNzRlYjhmM2Zi ZDlmYzhjOGE1ZTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFn ZS9XZWJQYWdlLmgKKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBh Z2UuaApAQCAtOTI2LDcgKzkyNiw3IEBAIHByaXZhdGU6CiAgICAgdm9pZCBjb21wbGV0ZVN5bnRo ZXRpY0NsaWNrKFdlYkNvcmU6Ok5vZGUqIG5vZGVSZXNwb25kaW5nVG9DbGljaywgY29uc3QgV2Vi Q29yZTo6RmxvYXRQb2ludCYgbG9jYXRpb24pOwogICAgIHZvaWQgc2VuZFRhcEhpZ2hsaWdodEZv ck5vZGVJZk5lY2Vzc2FyeSh1aW50NjRfdCByZXF1ZXN0SUQsIFdlYkNvcmU6Ok5vZGUqKTsKICAg ICB2b2lkIHJlc2V0VGV4dEF1dG9zaXppbmdCZWZvcmVMYXlvdXRJZk5lZWRlZChjb25zdCBXZWJD b3JlOjpGbG9hdFNpemUmIG9sZFNpemUsIGNvbnN0IFdlYkNvcmU6OkZsb2F0U2l6ZSYgbmV3U2l6 ZSk7Ci0gICAgV2ViQ29yZTo6VmlzaWJsZVBvc2l0aW9uIHZpc2libGVQb3NpdGlvbkluRm9jdXNl ZE5vZGVGb3JQb2ludChXZWJDb3JlOjpGcmFtZSYsIGNvbnN0IFdlYkNvcmU6OkludFBvaW50Jik7 CisgICAgV2ViQ29yZTo6VmlzaWJsZVBvc2l0aW9uIHZpc2libGVQb3NpdGlvbkluRm9jdXNlZE5v ZGVGb3JQb2ludChjb25zdCBXZWJDb3JlOjpGcmFtZSYsIGNvbnN0IFdlYkNvcmU6OkludFBvaW50 Jik7CiAgICAgdm9pZCB2b2xhdGlsaXR5VGltZXJGaXJlZCgpOwogI2VuZGlmCiAjaWYgIVBMQVRG T1JNKENPQ09BKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdl L2lvcy9XZWJQYWdlSU9TLm1tIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL2lv cy9XZWJQYWdlSU9TLm1tCmluZGV4IDlmNGNlYzcyMzFkZDQ2MjcxNTYzZDUyYjZhNGUyYjlkMzI3 ODg3YzYuLjQ3NGQyMDNjMGM4Nzk5MzkwMzM4Y2JmZDI2YTg3NmZjNTE4YjUxYWIgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9pb3MvV2ViUGFnZUlPUy5tbQor KysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvaW9zL1dlYlBhZ2VJT1MubW0K QEAgLTc3NiwxNCArNzc2LDE0IEBAIHZvaWQgV2ViUGFnZTo6ZGlzYWJsZUluc3BlY3Rvck5vZGVT ZWFyY2goKQogICAgIHNlbmQoTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6RGlzYWJsZUluc3BlY3Rv ck5vZGVTZWFyY2goKSk7CiB9CiAKLXN0YXRpYyBGbG9hdFF1YWQgaW5uZXJGcmFtZVF1YWQoRnJh bWUqIGZyYW1lLCBOb2RlKiBhc3Npc3RlZE5vZGUpCi17Ci0gICAgZnJhbWUtPmRvY3VtZW50KCkt PnVwZGF0ZUxheW91dElnbm9yZVBlbmRpbmdTdHlsZXNoZWV0cygpOwotICAgIFJlbmRlck9iamVj dCogcmVuZGVyZXI7Ci0gICAgaWYgKGFzc2lzdGVkTm9kZS0+aGFzVGFnTmFtZShIVE1MTmFtZXM6 OnRleHRhcmVhVGFnKSB8fCBhc3Npc3RlZE5vZGUtPmhhc1RhZ05hbWUoSFRNTE5hbWVzOjppbnB1 dFRhZykgfHwgYXNzaXN0ZWROb2RlLT5oYXNUYWdOYW1lKEhUTUxOYW1lczo6c2VsZWN0VGFnKSkK LSAgICAgICAgcmVuZGVyZXIgPSBhc3Npc3RlZE5vZGUtPnJlbmRlcmVyKCk7Ci0gICAgZWxzZQot ICAgICAgICByZW5kZXJlciA9IGFzc2lzdGVkTm9kZS0+cm9vdEVkaXRhYmxlRWxlbWVudCgpLT5y ZW5kZXJlcigpOworc3RhdGljIEZsb2F0UXVhZCBpbm5lckZyYW1lUXVhZChjb25zdCBGcmFtZSYg ZnJhbWUsIGNvbnN0IE5vZGUmIGFzc2lzdGVkTm9kZSkKK3sKKyAgICBmcmFtZS5kb2N1bWVudCgp LT51cGRhdGVMYXlvdXRJZ25vcmVQZW5kaW5nU3R5bGVzaGVldHMoKTsKKyAgICBSZW5kZXJFbGVt ZW50KiByZW5kZXJlciA9IG51bGxwdHI7CisgICAgaWYgKGFzc2lzdGVkTm9kZS5oYXNUYWdOYW1l KEhUTUxOYW1lczo6dGV4dGFyZWFUYWcpIHx8IGFzc2lzdGVkTm9kZS5oYXNUYWdOYW1lKEhUTUxO YW1lczo6aW5wdXRUYWcpIHx8IGFzc2lzdGVkTm9kZS5oYXNUYWdOYW1lKEhUTUxOYW1lczo6c2Vs ZWN0VGFnKSkKKyAgICAgICAgcmVuZGVyZXIgPSBkb3duY2FzdDxSZW5kZXJFbGVtZW50Pihhc3Np c3RlZE5vZGUucmVuZGVyZXIoKSk7CisgICAgZWxzZSBpZiAoRWxlbWVudCogcm9vdEVkaXRhYmxl RWxlbWVudCA9IGFzc2lzdGVkTm9kZS5yb290RWRpdGFibGVFbGVtZW50KCkpCisgICAgICAgIHJl bmRlcmVyID0gcm9vdEVkaXRhYmxlRWxlbWVudC0+cmVuZGVyZXIoKTsKICAgICAKICAgICBpZiAo IXJlbmRlcmVyKQogICAgICAgICByZXR1cm4gRmxvYXRRdWFkKCk7CkBAIC03OTgsOSArNzk4LDkg QEAgc3RhdGljIEZsb2F0UXVhZCBpbm5lckZyYW1lUXVhZChGcmFtZSogZnJhbWUsIE5vZGUqIGFz c2lzdGVkTm9kZSkKICAgICByZXR1cm4gRmxvYXRRdWFkKGJvdW5kaW5nQm94KTsKIH0KIAotc3Rh dGljIEludFBvaW50IGNvbnN0cmFpblBvaW50KGNvbnN0IEludFBvaW50JiBwb2ludCwgRnJhbWUq IGZyYW1lLCBOb2RlKiBhc3Npc3RlZE5vZGUpCitzdGF0aWMgSW50UG9pbnQgY29uc3RyYWluUG9p bnQoY29uc3QgSW50UG9pbnQmIHBvaW50LCBjb25zdCBGcmFtZSYgZnJhbWUsIGNvbnN0IE5vZGUm IGFzc2lzdGVkTm9kZSkKIHsKLSAgICBBU1NFUlQoIWFzc2lzdGVkTm9kZSB8fCAmYXNzaXN0ZWRO b2RlLT5kb2N1bWVudCgpID09IGZyYW1lLT5kb2N1bWVudCgpKTsKKyAgICBBU1NFUlQoJmFzc2lz dGVkTm9kZS5kb2N1bWVudCgpID09IGZyYW1lLmRvY3VtZW50KCkpOwogICAgIGNvbnN0IGludCBE RUZBVUxUX0NPTlNUUkFJTl9JTlNFVCA9IDI7CiAgICAgSW50UmVjdCBpbm5lckZyYW1lID0gaW5u ZXJGcmFtZVF1YWQoZnJhbWUsIGFzc2lzdGVkTm9kZSkuZW5jbG9zaW5nQm91bmRpbmdCb3goKTsK ICAgICBJbnRQb2ludCBjb25zdHJhaW5lZFBvaW50ID0gcG9pbnQ7CkBAIC05MzQsNyArOTM0LDcg QEAgUGFzc1JlZlB0cjxSYW5nZT4gV2ViUGFnZTo6cmFuZ2VGb3JCbG9ja0F0UG9pbnQoY29uc3Qg SW50UG9pbnQmIHBvaW50KQogCiB2b2lkIFdlYlBhZ2U6OnNlbGVjdFdpdGhHZXN0dXJlKGNvbnN0 IEludFBvaW50JiBwb2ludCwgdWludDMyX3QgZ3JhbnVsYXJpdHksIHVpbnQzMl90IGdlc3R1cmVU eXBlLCB1aW50MzJfdCBnZXN0dXJlU3RhdGUsIHVpbnQ2NF90IGNhbGxiYWNrSUQpCiB7Ci0gICAg RnJhbWUmIGZyYW1lID0gbV9wYWdlLT5mb2N1c0NvbnRyb2xsZXIoKS5mb2N1c2VkT3JNYWluRnJh bWUoKTsKKyAgICBjb25zdCBGcmFtZSYgZnJhbWUgPSBtX3BhZ2UtPmZvY3VzQ29udHJvbGxlcigp LmZvY3VzZWRPck1haW5GcmFtZSgpOwogICAgIFZpc2libGVQb3NpdGlvbiBwb3NpdGlvbiA9IHZp c2libGVQb3NpdGlvbkluRm9jdXNlZE5vZGVGb3JQb2ludChmcmFtZSwgcG9pbnQpOwogCiAgICAg aWYgKHBvc2l0aW9uLmlzTnVsbCgpKSB7CkBAIC0xNjczLDE2ICsxNjczLDE2IEBAIHZvaWQgV2Vi UGFnZTo6bW92ZVNlbGVjdGlvbkJ5T2Zmc2V0KGludDMyX3Qgb2Zmc2V0LCB1aW50NjRfdCBjYWxs YmFja0lEKQogICAgIHNlbmQoTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6Vm9pZENhbGxiYWNrKGNh bGxiYWNrSUQpKTsKIH0KIAotVmlzaWJsZVBvc2l0aW9uIFdlYlBhZ2U6OnZpc2libGVQb3NpdGlv bkluRm9jdXNlZE5vZGVGb3JQb2ludChGcmFtZSYgZnJhbWUsIGNvbnN0IEludFBvaW50JiBwb2lu dCkKK1Zpc2libGVQb3NpdGlvbiBXZWJQYWdlOjp2aXNpYmxlUG9zaXRpb25JbkZvY3VzZWROb2Rl Rm9yUG9pbnQoY29uc3QgRnJhbWUmIGZyYW1lLCBjb25zdCBJbnRQb2ludCYgcG9pbnQpCiB7CiAg ICAgSW50UG9pbnQgYWRqdXN0ZWRQb2ludChmcmFtZS52aWV3KCktPnJvb3RWaWV3VG9Db250ZW50 cyhwb2ludCkpOwotICAgIEludFBvaW50IGNvbnN0cmFpbmVkUG9pbnQgPSBtX2Fzc2lzdGVkTm9k ZSA/IGNvbnN0cmFpblBvaW50KGFkanVzdGVkUG9pbnQsICZmcmFtZSwgbV9hc3Npc3RlZE5vZGUu Z2V0KCkpIDogYWRqdXN0ZWRQb2ludDsKKyAgICBJbnRQb2ludCBjb25zdHJhaW5lZFBvaW50ID0g bV9hc3Npc3RlZE5vZGUgPyBjb25zdHJhaW5Qb2ludChhZGp1c3RlZFBvaW50LCBmcmFtZSwgKm1f YXNzaXN0ZWROb2RlKSA6IGFkanVzdGVkUG9pbnQ7CiAgICAgcmV0dXJuIGZyYW1lLnZpc2libGVQ b3NpdGlvbkZvclBvaW50KGNvbnN0cmFpbmVkUG9pbnQpOwogfQogCiB2b2lkIFdlYlBhZ2U6OnNl bGVjdFBvc2l0aW9uQXRQb2ludChjb25zdCBXZWJDb3JlOjpJbnRQb2ludCYgcG9pbnQsIHVpbnQ2 NF90IGNhbGxiYWNrSUQpCiB7Ci0gICAgRnJhbWUmIGZyYW1lID0gbV9wYWdlLT5mb2N1c0NvbnRy b2xsZXIoKS5mb2N1c2VkT3JNYWluRnJhbWUoKTsKKyAgICBjb25zdCBGcmFtZSYgZnJhbWUgPSBt X3BhZ2UtPmZvY3VzQ29udHJvbGxlcigpLmZvY3VzZWRPck1haW5GcmFtZSgpOwogICAgIFZpc2li bGVQb3NpdGlvbiBwb3NpdGlvbiA9IHZpc2libGVQb3NpdGlvbkluRm9jdXNlZE5vZGVGb3JQb2lu dChmcmFtZSwgcG9pbnQpOwogICAgIAogICAgIGlmIChwb3NpdGlvbi5pc05vdE51bGwoKSkKQEAg LTE2OTIsNyArMTY5Miw3IEBAIHZvaWQgV2ViUGFnZTo6c2VsZWN0UG9zaXRpb25BdFBvaW50KGNv bnN0IFdlYkNvcmU6OkludFBvaW50JiBwb2ludCwgdWludDY0X3QgY2FsCiAKIHZvaWQgV2ViUGFn ZTo6c2VsZWN0UG9zaXRpb25BdEJvdW5kYXJ5V2l0aERpcmVjdGlvbihjb25zdCBXZWJDb3JlOjpJ bnRQb2ludCYgcG9pbnQsIHVpbnQzMl90IGdyYW51bGFyaXR5LCB1aW50MzJfdCBkaXJlY3Rpb24s IHVpbnQ2NF90IGNhbGxiYWNrSUQpCiB7Ci0gICAgRnJhbWUmIGZyYW1lID0gbV9wYWdlLT5mb2N1 c0NvbnRyb2xsZXIoKS5mb2N1c2VkT3JNYWluRnJhbWUoKTsKKyAgICBjb25zdCBGcmFtZSYgZnJh bWUgPSBtX3BhZ2UtPmZvY3VzQ29udHJvbGxlcigpLmZvY3VzZWRPck1haW5GcmFtZSgpOwogICAg IFZpc2libGVQb3NpdGlvbiBwb3NpdGlvbiA9IHZpc2libGVQb3NpdGlvbkluRm9jdXNlZE5vZGVG b3JQb2ludChmcmFtZSwgcG9pbnQpOwogCiAgICAgaWYgKHBvc2l0aW9uLmlzTm90TnVsbCgpKSB7 CkBAIC0xNzE5LDcgKzE3MTksNyBAQCB2b2lkIFdlYlBhZ2U6Om1vdmVTZWxlY3Rpb25BdEJvdW5k YXJ5V2l0aERpcmVjdGlvbih1aW50MzJfdCBncmFudWxhcml0eSwgdWludDMyXwogCiB2b2lkIFdl YlBhZ2U6OnNlbGVjdFRleHRXaXRoR3JhbnVsYXJpdHlBdFBvaW50KGNvbnN0IFdlYkNvcmU6Oklu dFBvaW50JiBwb2ludCwgdWludDMyX3QgZ3JhbnVsYXJpdHksIHVpbnQ2NF90IGNhbGxiYWNrSUQp CiB7Ci0gICAgRnJhbWUmIGZyYW1lID0gbV9wYWdlLT5mb2N1c0NvbnRyb2xsZXIoKS5mb2N1c2Vk T3JNYWluRnJhbWUoKTsKKyAgICBjb25zdCBGcmFtZSYgZnJhbWUgPSBtX3BhZ2UtPmZvY3VzQ29u dHJvbGxlcigpLmZvY3VzZWRPck1haW5GcmFtZSgpOwogICAgIFZpc2libGVQb3NpdGlvbiBwb3Np dGlvbiA9IHZpc2libGVQb3NpdGlvbkluRm9jdXNlZE5vZGVGb3JQb2ludChmcmFtZSwgcG9pbnQp OwogCiAgICAgUmVmUHRyPFJhbmdlPiByYW5nZTsKQEAgLTE3NTIsNyArMTc1Miw3IEBAIHZvaWQg V2ViUGFnZTo6YmVnaW5TZWxlY3Rpb25JbkRpcmVjdGlvbih1aW50MzJfdCBkaXJlY3Rpb24sIHVp bnQ2NF90IGNhbGxiYWNrSUQpCiAgICAgCiB2b2lkIFdlYlBhZ2U6OnVwZGF0ZVNlbGVjdGlvbldp dGhFeHRlbnRQb2ludChjb25zdCBXZWJDb3JlOjpJbnRQb2ludCYgcG9pbnQsIHVpbnQ2NF90IGNh bGxiYWNrSUQpCiB7Ci0gICAgRnJhbWUmIGZyYW1lID0gbV9wYWdlLT5mb2N1c0NvbnRyb2xsZXIo KS5mb2N1c2VkT3JNYWluRnJhbWUoKTsKKyAgICBjb25zdCBGcmFtZSYgZnJhbWUgPSBtX3BhZ2Ut PmZvY3VzQ29udHJvbGxlcigpLmZvY3VzZWRPck1haW5GcmFtZSgpOwogICAgIFZpc2libGVQb3Np dGlvbiBwb3NpdGlvbiA9IHZpc2libGVQb3NpdGlvbkluRm9jdXNlZE5vZGVGb3JQb2ludChmcmFt ZSwgcG9pbnQpOwogCiAgICAgaWYgKHBvc2l0aW9uLmlzTnVsbCgpKSB7CkBAIC0yMDk2LDEzICsy MDk2LDEzIEBAIHZvaWQgV2ViUGFnZTo6Z2V0UG9zaXRpb25JbmZvcm1hdGlvbihjb25zdCBJbnRQ b2ludCYgcG9pbnQsIEludGVyYWN0aW9uSW5mb3JtYXRpCiAgICAgaW5mby5wb2ludCA9IHBvaW50 OwogICAgIGluZm8ubm9kZUF0UG9zaXRpb25Jc0Fzc2lzdGVkTm9kZSA9IChoaXROb2RlID09IG1f YXNzaXN0ZWROb2RlKTsKICAgICBpZiAobV9hc3Npc3RlZE5vZGUpIHsKLSAgICAgICAgRnJhbWUm IGZyYW1lID0gbV9wYWdlLT5mb2N1c0NvbnRyb2xsZXIoKS5mb2N1c2VkT3JNYWluRnJhbWUoKTsK KyAgICAgICAgY29uc3QgRnJhbWUmIGZyYW1lID0gbV9wYWdlLT5mb2N1c0NvbnRyb2xsZXIoKS5m b2N1c2VkT3JNYWluRnJhbWUoKTsKICAgICAgICAgaWYgKGZyYW1lLmVkaXRvcigpLmhhc0NvbXBv c2l0aW9uKCkpIHsKICAgICAgICAgICAgIGNvbnN0IHVpbnQzMl90IGtIaXRBcmVhV2lkdGggPSA2 NjsKICAgICAgICAgICAgIGNvbnN0IHVpbnQzMl90IGtIaXRBcmVhSGVpZ2h0ID0gNjY7CiAgICAg ICAgICAgICBGcmFtZVZpZXcmIHZpZXcgPSAqZnJhbWUudmlldygpOwogICAgICAgICAgICAgSW50 UG9pbnQgYWRqdXN0ZWRQb2ludCh2aWV3LnJvb3RWaWV3VG9Db250ZW50cyhwb2ludCkpOwotICAg ICAgICAgICAgSW50UG9pbnQgY29uc3RyYWluZWRQb2ludCA9IG1fYXNzaXN0ZWROb2RlID8gY29u c3RyYWluUG9pbnQoYWRqdXN0ZWRQb2ludCwgJmZyYW1lLCBtX2Fzc2lzdGVkTm9kZS5nZXQoKSkg OiBhZGp1c3RlZFBvaW50OworICAgICAgICAgICAgSW50UG9pbnQgY29uc3RyYWluZWRQb2ludCA9 IG1fYXNzaXN0ZWROb2RlID8gY29uc3RyYWluUG9pbnQoYWRqdXN0ZWRQb2ludCwgZnJhbWUsICpt X2Fzc2lzdGVkTm9kZSkgOiBhZGp1c3RlZFBvaW50OwogICAgICAgICAgICAgVmlzaWJsZVBvc2l0 aW9uIHBvc2l0aW9uID0gZnJhbWUudmlzaWJsZVBvc2l0aW9uRm9yUG9pbnQoY29uc3RyYWluZWRQ b2ludCk7CiAKICAgICAgICAgICAgIFJlZlB0cjxSYW5nZT4gY29tcG9zaXRpb25SYW5nZSA9IGZy YW1lLmVkaXRvcigpLmNvbXBvc2l0aW9uUmFuZ2UoKTsK