219159 2020-11-19 07:10:53 -0800 [macOS] Issue sandbox extension to icon services when starting a drag operation 2020-11-28 04:52:26 -0800 1 1 1 Unclassified WebKit WebKit Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 pvollan pvollan bfulgham webkit-bug-importer oldest_to_newest 1709087 0 pvollan 2020-11-19 07:10:53 -0800 Issue sandbox extension to icon services when starting a drag operation on macOS, since the WebContent process needs access to these services when a drag is started. 1709088 1 webkit-bug-importer 2020-11-19 07:11:13 -0800 <rdar://problem/71585876> 1709094 2 414578 pvollan 2020-11-19 07:23:04 -0800 Created attachment 414578 Patch 1709290 3 414578 bfulgham 2020-11-19 15:09:39 -0800 Comment on attachment 414578 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=414578&action=review r=me, but please make sure you revoke the extensions in the early return case. > Source/WebKit/WebProcess/WebPage/WebPage.cpp:2834 > bool shouldHandleEvent = true; I think there is an early return in the "if !(shouldHandleEvent)" case. You should probably add a revokeSandboxExtensions there, too. > Source/WebKit/WebProcess/WebPage/WebPage.cpp:7060 > +Vector<RefPtr<SandboxExtension>> WebPage::consumeSandboxExtensions(SandboxExtension::HandleArray&& sandboxExtensions) We do something similar-ish in UserMediaProcessManager::revokeSandboxExtensionsIfNeeded. We might consider a future bug to consolidate the logic. 1710417 4 414976 pvollan 2020-11-28 03:56:38 -0800 Created attachment 414976 Patch 1710418 5 pvollan 2020-11-28 04:05:29 -0800 (In reply to Brent Fulgham from comment #3) > Comment on attachment 414578 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=414578&action=review > > r=me, but please make sure you revoke the extensions in the early return > case. > > > Source/WebKit/WebProcess/WebPage/WebPage.cpp:2834 > > bool shouldHandleEvent = true; > > I think there is an early return in the "if !(shouldHandleEvent)" case. You > should probably add a revokeSandboxExtensions there, too. > Fixed by consuming the extensions after the early return. > > Source/WebKit/WebProcess/WebPage/WebPage.cpp:7060 > > +Vector<RefPtr<SandboxExtension>> WebPage::consumeSandboxExtensions(SandboxExtension::HandleArray&& sandboxExtensions) > > We do something similar-ish in > UserMediaProcessManager::revokeSandboxExtensionsIfNeeded. We might consider > a future bug to consolidate the logic. Thanks for reviewing! 1710419 6 ews-feeder 2020-11-28 04:52:25 -0800 Committed r270216: <https://trac.webkit.org/changeset/270216> All reviewed patches have been landed. Closing bug and clearing flags on attachment 414976. 414578 2020-11-19 07:23:04 -0800 2020-11-19 15:09:39 -0800 Patch bug-219159-20201119072303.patch text/plain 9139 pvollan SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNzAwMjgpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI4IEBACisyMDIwLTExLTE5ICBQZXIgQXJuZSBW b2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbbWFjT1NdIElzc3VlIHNhbmRi b3ggZXh0ZW5zaW9uIHRvIGljb24gc2VydmljZXMgd2hlbiBzdGFydGluZyBhIGRyYWcgb3BlcmF0 aW9uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTkx NTkKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzcxNTg1ODc2PgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIElzc3VlIHNhbmRib3ggZXh0ZW5zaW9uIHRv IGljb24gc2VydmljZXMgd2hlbiBzdGFydGluZyBhIGRyYWcgb3BlcmF0aW9uIG9uIG1hY09TLCBz aW5jZSB0aGUgV2ViQ29udGVudCBwcm9jZXNzIG5lZWRzCisgICAgICAgIGFjY2VzcyB0byB0aGVz ZSBzZXJ2aWNlcyB3aGVuIGEgZHJhZyBpcyBzdGFydGVkLiBUaGlzIHBhdGNoIGRldGVjdHMgd2hl biBhIGRyYWcgaXMgYWJvdXQgdG8gc3RhcnQsIGFuZCBzZW5kcyBzYW5kYm94CisgICAgICAgIGV4 dGVuc2lvbnMgdG8gdGhlIGljb24gc2VydmljZXMgYWxvbmcgd2l0aCB0aGUgbW91c2UgZXZlbnQu IFRoZSBzYW5kYm94IGV4dGVuc2lvbnMgYXJlIHRoZW4gdGVtcG9yYXJpbHkgY29uc3VtZWQKKyAg ICAgICAgd2hpbGUgaGFuZGxpbmcgdGhlIG1vdXNlIGV2ZW50IGluIHRoZSBXZWJDb250ZW50IHBy b2Nlc3MuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcDoKKyAgICAgICAg KFdlYktpdDo6V2ViUGFnZVByb3h5Ojpwcm9jZXNzTmV4dFF1ZXVlZE1vdXNlRXZlbnQpOgorICAg ICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcDoKKyAgICAgICAgKFdlYktpdDo6 V2ViUGFnZTo6bW91c2VFdmVudCk6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OnNpbXVsYXRl TW91c2VEb3duKToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZTo6c2ltdWxhdGVNb3VzZVVwKToK KyAgICAgICAgKFdlYktpdDo6V2ViUGFnZTo6c2ltdWxhdGVNb3VzZU1vdGlvbik6CisgICAgICAg IChXZWJLaXQ6OldlYlBhZ2U6OmNvbnN1bWVTYW5kYm94RXh0ZW5zaW9ucyk6CisgICAgICAgIChX ZWJLaXQ6OldlYlBhZ2U6OnJldm9rZVNhbmRib3hFeHRlbnNpb25zKToKKyAgICAgICAgKiBXZWJQ cm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9X ZWJQYWdlLm1lc3NhZ2VzLmluOgorCiAyMDIwLTExLTE5ICBQZXIgQXJuZSBWb2xsYW4gIDxwdm9s bGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBbbWFjT1NdIElzc3VlIHNhbmRib3ggZXh0ZW5zaW9u IHRvIGF1ZGlvIHNlcnZpY2UgaWYgTWVkaWEgaW4gdGhlIEdQVSBwcm9jZXNzIGlzIG5vdCBlbmFi bGVkCkluZGV4OiBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAJKHJldmlz aW9uIDI2OTkxNSkKKysrIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAJ KHdvcmtpbmcgY29weSkKQEAgLTI2MDAsOCArMjYwMCwxNiBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6 cHJvY2Vzc05leHRRdWV1ZWRNb3VzCiAgICAgICAgIG1fcHJvY2Vzcy0+c3RhcnRSZXNwb25zaXZl bmVzc1RpbWVyKCk7CiAgICAgfQogCisgICAgT3B0aW9uYWw8U2FuZGJveEV4dGVuc2lvbjo6SGFu ZGxlQXJyYXk+IHNhbmRib3hFeHRlbnNpb25zOworCisjaWYgUExBVEZPUk0oTUFDKQorICAgIGJv b2wgZXZlbnRNYXlTdGFydERyYWcgPSAhbV9jdXJyZW50RHJhZ09wZXJhdGlvbiAmJiBldmVudFR5 cGUgPT0gV2ViRXZlbnQ6Ok1vdXNlTW92ZSAmJiBldmVudC5idXR0b24oKSAhPSBXZWJNb3VzZUV2 ZW50OjpCdXR0b246Ok5vQnV0dG9uOworICAgIGlmIChldmVudE1heVN0YXJ0RHJhZykKKyAgICAg ICAgc2FuZGJveEV4dGVuc2lvbnMgPSBTYW5kYm94RXh0ZW5zaW9uOjpjcmVhdGVIYW5kbGVzRm9y TWFjaExvb2t1cCh7ICJjb20uYXBwbGUuaWNvbnNlcnZpY2VzIl9zLCAiY29tLmFwcGxlLmljb25z ZXJ2aWNlcy5zdG9yZSJfcyB9LCBXVEY6Om51bGxvcHQpOworI2VuZGlmCisgICAgCiAgICAgTE9H KE1vdXNlSGFuZGxpbmcsICJVSVByb2Nlc3M6IHNlbnQgbW91c2UgZXZlbnQgJXMgKHF1ZXVlIHNp emUgJXp1KSIsIHdlYk1vdXNlRXZlbnRUeXBlU3RyaW5nKGV2ZW50VHlwZSksIG1fbW91c2VFdmVu dFF1ZXVlLnNpemUoKSk7Ci0gICAgc2VuZChNZXNzYWdlczo6V2ViUGFnZTo6TW91c2VFdmVudChl dmVudCkpOworICAgIHNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6Ok1vdXNlRXZlbnQoZXZlbnQsIHNh bmRib3hFeHRlbnNpb25zKSk7CiB9CiAKIHZvaWQgV2ViUGFnZVByb3h5Ojpkb0FmdGVyUHJvY2Vz c2luZ0FsbFBlbmRpbmdNb3VzZUV2ZW50cyhXVEY6OkZ1bmN0aW9uPHZvaWQgKCk+JiYgYWN0aW9u KQpJbmRleDogU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAJ KHJldmlzaW9uIDI2OTkxNSkKKysrIFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dl YlBhZ2UuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yODIxLDEwICsyODIxLDE0IEBAIHN0YXRpYyBi b29sIGhhbmRsZU1vdXNlRXZlbnQoY29uc3QgV2ViTW8KICAgICB9CiB9CiAKLXZvaWQgV2ViUGFn ZTo6bW91c2VFdmVudChjb25zdCBXZWJNb3VzZUV2ZW50JiBtb3VzZUV2ZW50KQordm9pZCBXZWJQ YWdlOjptb3VzZUV2ZW50KGNvbnN0IFdlYk1vdXNlRXZlbnQmIG1vdXNlRXZlbnQsIE9wdGlvbmFs PFNhbmRib3hFeHRlbnNpb246OkhhbmRsZUFycmF5PiYmIHNhbmRib3hFeHRlbnNpb25zKQogewog ICAgIFNldEZvclNjb3BlPGJvb2w+IHVzZXJJc0ludGVyYWN0aW5nQ2hhbmdlIHsgbV91c2VySXNJ bnRlcmFjdGluZywgdHJ1ZSB9OwogCisgICAgVmVjdG9yPFJlZlB0cjxTYW5kYm94RXh0ZW5zaW9u Pj4gbW91c2VFdmVudFNhbmRib3hFeHRlbnNpb25zOworICAgIGlmIChzYW5kYm94RXh0ZW5zaW9u cykKKyAgICAgICAgbW91c2VFdmVudFNhbmRib3hFeHRlbnNpb25zID0gY29uc3VtZVNhbmRib3hF eHRlbnNpb25zKFdURk1vdmUoKnNhbmRib3hFeHRlbnNpb25zKSk7CisKICAgICBtX3VzZXJBY3Rp dml0eS5pbXB1bHNlKCk7CiAKICAgICBib29sIHNob3VsZEhhbmRsZUV2ZW50ID0gdHJ1ZTsKQEAg LTI4NTksNiArMjg2Myw4IEBAIHZvaWQgV2ViUGFnZTo6bW91c2VFdmVudChjb25zdCBXZWJNb3Vz ZUUKICAgICB9CiAKICAgICBzZW5kKE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OkRpZFJlY2VpdmVF dmVudChzdGF0aWNfY2FzdDx1aW50MzJfdD4obW91c2VFdmVudC50eXBlKCkpLCBoYW5kbGVkKSk7 CisKKyAgICByZXZva2VTYW5kYm94RXh0ZW5zaW9ucyhtb3VzZUV2ZW50U2FuZGJveEV4dGVuc2lv bnMpOwogfQogCiBzdGF0aWMgYm9vbCBoYW5kbGVXaGVlbEV2ZW50KGNvbnN0IFdlYldoZWVsRXZl bnQmIHdoZWVsRXZlbnQsIFBhZ2UqIHBhZ2UsIE9wdGlvblNldDxXaGVlbEV2ZW50UHJvY2Vzc2lu Z1N0ZXBzPiBwcm9jZXNzaW5nU3RlcHMpCkBAIC00MTU1LDcgKzQxNjEsNyBAQCB2b2lkIFdlYlBh Z2U6OmRyYWdDYW5jZWxsZWQoKQogICAgIG1faXNTdGFydGluZ0RyYWcgPSBmYWxzZTsKICAgICBt X3BhZ2UtPm1haW5GcmFtZSgpLmV2ZW50SGFuZGxlcigpLmRyYWdDYW5jZWxsZWQoKTsKIH0KLSAg ICAKKwogI2VuZGlmIC8vIEVOQUJMRShEUkFHX1NVUFBPUlQpCiAKIFdlYlVuZG9TdGVwKiBXZWJQ YWdlOjp3ZWJVbmRvU3RlcChXZWJVbmRvU3RlcElEIHN0ZXBJRCkKQEAgLTUyNjAsMTggKzUyNjYs MTggQEAgdm9pZCBXZWJQYWdlOjpoYW5kbGVBbHRlcm5hdGl2ZVRleHRVSVJlcwogdm9pZCBXZWJQ YWdlOjpzaW11bGF0ZU1vdXNlRG93bihpbnQgYnV0dG9uLCBXZWJDb3JlOjpJbnRQb2ludCBwb3Np dGlvbiwgaW50IGNsaWNrQ291bnQsIFdLRXZlbnRNb2RpZmllcnMgbW9kaWZpZXJzLCBXYWxsVGlt ZSB0aW1lKQogewogICAgIHN0YXRpY19hc3NlcnQoc2l6ZW9mKFdLRXZlbnRNb2RpZmllcnMpID49 IHNpemVvZihXZWJFdmVudDo6TW9kaWZpZXIpLCAiV0tFdmVudE1vZGlmaWVycyBtdXN0IGJlIGdy ZWF0ZXIgdGhhbiBvciBlcXVhbCB0byB0aGUgc2l6ZSBvZiBXZWJFdmVudDo6TW9kaWZpZXIiKTsK LSAgICBtb3VzZUV2ZW50KFdlYk1vdXNlRXZlbnQoV2ViTW91c2VFdmVudDo6TW91c2VEb3duLCBz dGF0aWNfY2FzdDxXZWJNb3VzZUV2ZW50OjpCdXR0b24+KGJ1dHRvbiksIDAsIHBvc2l0aW9uLCBw b3NpdGlvbiwgMCwgMCwgMCwgY2xpY2tDb3VudCwgT3B0aW9uU2V0PFdlYkV2ZW50OjpNb2RpZmll cj46OmZyb21SYXcobW9kaWZpZXJzKSwgdGltZSwgV2ViQ29yZTo6Rm9yY2VBdENsaWNrLCBXZWJN b3VzZUV2ZW50OjpOb1RhcCkpOworICAgIG1vdXNlRXZlbnQoV2ViTW91c2VFdmVudChXZWJNb3Vz ZUV2ZW50OjpNb3VzZURvd24sIHN0YXRpY19jYXN0PFdlYk1vdXNlRXZlbnQ6OkJ1dHRvbj4oYnV0 dG9uKSwgMCwgcG9zaXRpb24sIHBvc2l0aW9uLCAwLCAwLCAwLCBjbGlja0NvdW50LCBPcHRpb25T ZXQ8V2ViRXZlbnQ6Ok1vZGlmaWVyPjo6ZnJvbVJhdyhtb2RpZmllcnMpLCB0aW1lLCBXZWJDb3Jl OjpGb3JjZUF0Q2xpY2ssIFdlYk1vdXNlRXZlbnQ6Ok5vVGFwKSwgV1RGOjpudWxsb3B0KTsKIH0K IAogdm9pZCBXZWJQYWdlOjpzaW11bGF0ZU1vdXNlVXAoaW50IGJ1dHRvbiwgV2ViQ29yZTo6SW50 UG9pbnQgcG9zaXRpb24sIGludCBjbGlja0NvdW50LCBXS0V2ZW50TW9kaWZpZXJzIG1vZGlmaWVy cywgV2FsbFRpbWUgdGltZSkKIHsKICAgICBzdGF0aWNfYXNzZXJ0KHNpemVvZihXS0V2ZW50TW9k aWZpZXJzKSA+PSBzaXplb2YoV2ViRXZlbnQ6Ok1vZGlmaWVyKSwgIldLRXZlbnRNb2RpZmllcnMg bXVzdCBiZSBncmVhdGVyIHRoYW4gb3IgZXF1YWwgdG8gdGhlIHNpemUgb2YgV2ViRXZlbnQ6Ok1v ZGlmaWVyIik7Ci0gICAgbW91c2VFdmVudChXZWJNb3VzZUV2ZW50KFdlYk1vdXNlRXZlbnQ6Ok1v dXNlVXAsIHN0YXRpY19jYXN0PFdlYk1vdXNlRXZlbnQ6OkJ1dHRvbj4oYnV0dG9uKSwgMCwgcG9z aXRpb24sIHBvc2l0aW9uLCAwLCAwLCAwLCBjbGlja0NvdW50LCBPcHRpb25TZXQ8V2ViRXZlbnQ6 Ok1vZGlmaWVyPjo6ZnJvbVJhdyhtb2RpZmllcnMpLCB0aW1lLCBXZWJDb3JlOjpGb3JjZUF0Q2xp Y2ssIFdlYk1vdXNlRXZlbnQ6Ok5vVGFwKSk7CisgICAgbW91c2VFdmVudChXZWJNb3VzZUV2ZW50 KFdlYk1vdXNlRXZlbnQ6Ok1vdXNlVXAsIHN0YXRpY19jYXN0PFdlYk1vdXNlRXZlbnQ6OkJ1dHRv bj4oYnV0dG9uKSwgMCwgcG9zaXRpb24sIHBvc2l0aW9uLCAwLCAwLCAwLCBjbGlja0NvdW50LCBP cHRpb25TZXQ8V2ViRXZlbnQ6Ok1vZGlmaWVyPjo6ZnJvbVJhdyhtb2RpZmllcnMpLCB0aW1lLCBX ZWJDb3JlOjpGb3JjZUF0Q2xpY2ssIFdlYk1vdXNlRXZlbnQ6Ok5vVGFwKSwgV1RGOjpudWxsb3B0 KTsKIH0KIAogdm9pZCBXZWJQYWdlOjpzaW11bGF0ZU1vdXNlTW90aW9uKFdlYkNvcmU6OkludFBv aW50IHBvc2l0aW9uLCBXYWxsVGltZSB0aW1lKQogewotICAgIG1vdXNlRXZlbnQoV2ViTW91c2VF dmVudChXZWJNb3VzZUV2ZW50OjpNb3VzZU1vdmUsIFdlYk1vdXNlRXZlbnQ6Ok5vQnV0dG9uLCAw LCBwb3NpdGlvbiwgcG9zaXRpb24sIDAsIDAsIDAsIDAsIE9wdGlvblNldDxXZWJFdmVudDo6TW9k aWZpZXI+IHsgfSwgdGltZSwgMCwgV2ViTW91c2VFdmVudDo6Tm9UYXApKTsKKyAgICBtb3VzZUV2 ZW50KFdlYk1vdXNlRXZlbnQoV2ViTW91c2VFdmVudDo6TW91c2VNb3ZlLCBXZWJNb3VzZUV2ZW50 OjpOb0J1dHRvbiwgMCwgcG9zaXRpb24sIHBvc2l0aW9uLCAwLCAwLCAwLCAwLCBPcHRpb25TZXQ8 V2ViRXZlbnQ6Ok1vZGlmaWVyPiB7IH0sIHRpbWUsIDAsIFdlYk1vdXNlRXZlbnQ6Ok5vVGFwKSwg V1RGOjpudWxsb3B0KTsKIH0KIAogdm9pZCBXZWJQYWdlOjpzZXRDb21wb3NpdGlvbkZvclRlc3Rp bmcoY29uc3QgU3RyaW5nJiBjb21wb3NpdGlvblN0cmluZywgdWludDY0X3QgZnJvbSwgdWludDY0 X3QgbGVuZ3RoLCBib29sIHN1cHByZXNzVW5kZXJsaW5lLCBjb25zdCBWZWN0b3I8Q29tcG9zaXRp b25IaWdobGlnaHQ+JiBoaWdobGlnaHRzKQpAQCAtNzA1MSw2ICs3MDU3LDI3IEBAIFJlbW90ZVJl bmRlcmluZ0JhY2tlbmRQcm94eSYgV2ViUGFnZTo6ZW4KIH0KICNlbmRpZgogCitWZWN0b3I8UmVm UHRyPFNhbmRib3hFeHRlbnNpb24+PiBXZWJQYWdlOjpjb25zdW1lU2FuZGJveEV4dGVuc2lvbnMo U2FuZGJveEV4dGVuc2lvbjo6SGFuZGxlQXJyYXkmJiBzYW5kYm94RXh0ZW5zaW9ucykKK3sKKyAg ICBWZWN0b3I8UmVmUHRyPFNhbmRib3hFeHRlbnNpb24+PiBkcmFnU2FuZGJveEV4dGVuc2lvbnM7 CisgICAgZm9yIChhdXRvJiBzYW5kYm94RXh0ZW5zaW9uIDogc2FuZGJveEV4dGVuc2lvbnMpIHsK KyAgICAgICAgYXV0byBleHRlbnNpb24gPSBTYW5kYm94RXh0ZW5zaW9uOjpjcmVhdGUoV1RGTW92 ZShzYW5kYm94RXh0ZW5zaW9uKSk7CisgICAgICAgIGlmICghZXh0ZW5zaW9uKQorICAgICAgICAg ICAgY29udGludWU7CisgICAgICAgIGJvb2wgb2sgPSBleHRlbnNpb24tPmNvbnN1bWUoKTsKKyAg ICAgICAgQVNTRVJUX1VOVVNFRChvaywgb2spOworICAgICAgICBkcmFnU2FuZGJveEV4dGVuc2lv bnMuYXBwZW5kKFdURk1vdmUoZXh0ZW5zaW9uKSk7CisgICAgfQorICAgIHJldHVybiBkcmFnU2Fu ZGJveEV4dGVuc2lvbnM7Cit9CisKK3ZvaWQgV2ViUGFnZTo6cmV2b2tlU2FuZGJveEV4dGVuc2lv bnMoVmVjdG9yPFJlZlB0cjxTYW5kYm94RXh0ZW5zaW9uPj4mIHNhbmRib3hFeHRlbnNpb25zKQor eworICAgIGZvciAoYXV0byYgc2FuZGJveEV4dGVuc2lvbiA6IHNhbmRib3hFeHRlbnNpb25zKQor ICAgICAgICBzYW5kYm94RXh0ZW5zaW9uLT5yZXZva2UoKTsKKyAgICBzYW5kYm94RXh0ZW5zaW9u cy5jbGVhcigpOworfQorCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKIAogI3VuZGVmIFJFTEVBU0Vf TE9HX0lGX0FMTE9XRUQKSW5kZXg6IFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dl YlBhZ2UuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9X ZWJQYWdlLmgJKHJldmlzaW9uIDI2OTkxNSkKKysrIFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9X ZWJQYWdlL1dlYlBhZ2UuaAkod29ya2luZyBjb3B5KQpAQCAtMTQ4OCw3ICsxNDg4LDcgQEAgcHJp dmF0ZToKIAogICAgIHZvaWQgc2V0TmVlZHNGb250QXR0cmlidXRlcyhib29sKTsKIAotICAgIHZv aWQgbW91c2VFdmVudChjb25zdCBXZWJNb3VzZUV2ZW50Jik7CisgICAgdm9pZCBtb3VzZUV2ZW50 KGNvbnN0IFdlYk1vdXNlRXZlbnQmLCBPcHRpb25hbDxTYW5kYm94RXh0ZW5zaW9uOjpIYW5kbGVB cnJheT4mJiBzYW5kYm94RXh0ZW5zaW9ucyk7CiAgICAgdm9pZCBrZXlFdmVudChjb25zdCBXZWJL ZXlib2FyZEV2ZW50Jik7CiAKICNpZiBFTkFCTEUoSU9TX1RPVUNIX0VWRU5UUykKQEAgLTE3ODMs NiArMTc4Myw5IEBAIHByaXZhdGU6CiAKICAgICB2b2lkIHBsYXRmb3JtRGlkU2NhbGVQYWdlKCk7 CiAKKyAgICBWZWN0b3I8UmVmUHRyPFNhbmRib3hFeHRlbnNpb24+PiBjb25zdW1lU2FuZGJveEV4 dGVuc2lvbnMoU2FuZGJveEV4dGVuc2lvbjo6SGFuZGxlQXJyYXkmJik7CisgICAgdm9pZCByZXZv a2VTYW5kYm94RXh0ZW5zaW9ucyhWZWN0b3I8UmVmUHRyPFNhbmRib3hFeHRlbnNpb24+PiYgc2Fu ZGJveEV4dGVuc2lvbnMpOworICAgIAogICAgIFdlYkNvcmU6OlBhZ2VJZGVudGlmaWVyIG1faWRl bnRpZmllcjsKIAogICAgIHN0ZDo6dW5pcXVlX3B0cjxXZWJDb3JlOjpQYWdlPiBtX3BhZ2U7Cklu ZGV4OiBTb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLm1lc3NhZ2VzLmlu Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2Uu bWVzc2FnZXMuaW4JKHJldmlzaW9uIDI2OTkxNSkKKysrIFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vz cy9XZWJQYWdlL1dlYlBhZ2UubWVzc2FnZXMuaW4JKHdvcmtpbmcgY29weSkKQEAgLTQ1LDcgKzQ1 LDcgQEAgbWVzc2FnZXMgLT4gV2ViUGFnZSBMZWdhY3lSZWNlaXZlciB7CiAKICAgICBFeGVjdXRl RWRpdENvbW1hbmRXaXRoQ2FsbGJhY2soU3RyaW5nIG5hbWUsIFN0cmluZyBhcmd1bWVudCkgLT4g KCkgQXN5bmMKICAgICBLZXlFdmVudChXZWJLaXQ6OldlYktleWJvYXJkRXZlbnQgZXZlbnQpCi0g ICAgTW91c2VFdmVudChXZWJLaXQ6OldlYk1vdXNlRXZlbnQgZXZlbnQpCisgICAgTW91c2VFdmVu dChXZWJLaXQ6OldlYk1vdXNlRXZlbnQgZXZlbnQsIE9wdGlvbmFsPFdlYktpdDo6U2FuZGJveEV4 dGVuc2lvbjo6SGFuZGxlQXJyYXk+IHNhbmRib3hFeHRlbnNpb25zKQogI2lmIFBMQVRGT1JNKElP U19GQU1JTFkpCiAgICAgU2V0Vmlld3BvcnRDb25maWd1cmF0aW9uVmlld0xheW91dFNpemUoV2Vi Q29yZTo6RmxvYXRTaXplIHNpemUsIGRvdWJsZSBzY2FsZUZhY3RvciwgZG91YmxlIG1pbmltdW1F ZmZlY3RpdmVEZXZpY2VXaWR0aCkKICAgICBTZXRNYXhpbXVtVW5vYnNjdXJlZFNpemUoV2ViQ29y ZTo6RmxvYXRTaXplIHNpemUpCg== 414976 2020-11-28 03:56:38 -0800 2020-11-28 04:52:26 -0800 Patch bug-219159-20201128035714.patch text/plain 9157 pvollan SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNzAyMTUpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI4IEBACisyMDIwLTExLTI4ICBQZXIgQXJuZSBW b2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbbWFjT1NdIElzc3VlIHNhbmRi b3ggZXh0ZW5zaW9uIHRvIGljb24gc2VydmljZXMgd2hlbiBzdGFydGluZyBhIGRyYWcgb3BlcmF0 aW9uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTkx NTkKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzcxNTg1ODc2PgorCisgICAgICAgIFJldmlld2Vk IGJ5IEJyZW50IEZ1bGdoYW0uCisKKyAgICAgICAgSXNzdWUgc2FuZGJveCBleHRlbnNpb24gdG8g aWNvbiBzZXJ2aWNlcyB3aGVuIHN0YXJ0aW5nIGEgZHJhZyBvcGVyYXRpb24gb24gbWFjT1MsIHNp bmNlIHRoZSBXZWJDb250ZW50IHByb2Nlc3MgbmVlZHMKKyAgICAgICAgYWNjZXNzIHRvIHRoZXNl IHNlcnZpY2VzIHdoZW4gYSBkcmFnIGlzIHN0YXJ0ZWQuIFRoaXMgcGF0Y2ggZGV0ZWN0cyB3aGVu IGEgZHJhZyBpcyBhYm91dCB0byBzdGFydCwgYW5kIHNlbmRzIHNhbmRib3gKKyAgICAgICAgZXh0 ZW5zaW9ucyB0byB0aGUgaWNvbiBzZXJ2aWNlcyBhbG9uZyB3aXRoIHRoZSBtb3VzZSBldmVudC4g VGhlIHNhbmRib3ggZXh0ZW5zaW9ucyBhcmUgdGhlbiB0ZW1wb3JhcmlseSBjb25zdW1lZAorICAg ICAgICB3aGlsZSBoYW5kbGluZyB0aGUgbW91c2UgZXZlbnQgaW4gdGhlIFdlYkNvbnRlbnQgcHJv Y2Vzcy4KKworICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwOgorICAgICAgICAo V2ViS2l0OjpXZWJQYWdlUHJveHk6OnByb2Nlc3NOZXh0UXVldWVkTW91c2VFdmVudCk6CisgICAg ICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwOgorICAgICAgICAoV2ViS2l0OjpX ZWJQYWdlOjptb3VzZUV2ZW50KToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZTo6c2ltdWxhdGVN b3VzZURvd24pOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjpzaW11bGF0ZU1vdXNlVXApOgor ICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjpzaW11bGF0ZU1vdXNlTW90aW9uKToKKyAgICAgICAg KFdlYktpdDo6V2ViUGFnZTo6Y29uc3VtZVNhbmRib3hFeHRlbnNpb25zKToKKyAgICAgICAgKFdl YktpdDo6V2ViUGFnZTo6cmV2b2tlU2FuZGJveEV4dGVuc2lvbnMpOgorICAgICAgICAqIFdlYlBy b2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmg6CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dl YlBhZ2UubWVzc2FnZXMuaW46CisKIDIwMjAtMTEtMjcgIEZ1amlpIEhpcm9ub3JpICA8SGlyb25v cmkuRnVqaWlAc29ueS5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcmV2ZXJ0aW5nIHIyNzAy MTAuCkluZGV4OiBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAJKHJldmlz aW9uIDI3MDIxNSkKKysrIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAJ KHdvcmtpbmcgY29weSkKQEAgLTI2MDAsOCArMjYwMCwxNiBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6 cHJvY2Vzc05leHRRdWV1ZWRNb3VzCiAgICAgICAgIG1fcHJvY2Vzcy0+c3RhcnRSZXNwb25zaXZl bmVzc1RpbWVyKCk7CiAgICAgfQogCisgICAgT3B0aW9uYWw8U2FuZGJveEV4dGVuc2lvbjo6SGFu ZGxlQXJyYXk+IHNhbmRib3hFeHRlbnNpb25zOworCisjaWYgUExBVEZPUk0oTUFDKQorICAgIGJv b2wgZXZlbnRNYXlTdGFydERyYWcgPSAhbV9jdXJyZW50RHJhZ09wZXJhdGlvbiAmJiBldmVudFR5 cGUgPT0gV2ViRXZlbnQ6Ok1vdXNlTW92ZSAmJiBldmVudC5idXR0b24oKSAhPSBXZWJNb3VzZUV2 ZW50OjpCdXR0b246Ok5vQnV0dG9uOworICAgIGlmIChldmVudE1heVN0YXJ0RHJhZykKKyAgICAg ICAgc2FuZGJveEV4dGVuc2lvbnMgPSBTYW5kYm94RXh0ZW5zaW9uOjpjcmVhdGVIYW5kbGVzRm9y TWFjaExvb2t1cCh7ICJjb20uYXBwbGUuaWNvbnNlcnZpY2VzIl9zLCAiY29tLmFwcGxlLmljb25z ZXJ2aWNlcy5zdG9yZSJfcyB9LCBXVEY6Om51bGxvcHQpOworI2VuZGlmCisgICAgCiAgICAgTE9H KE1vdXNlSGFuZGxpbmcsICJVSVByb2Nlc3M6IHNlbnQgbW91c2UgZXZlbnQgJXMgKHF1ZXVlIHNp emUgJXp1KSIsIHdlYk1vdXNlRXZlbnRUeXBlU3RyaW5nKGV2ZW50VHlwZSksIG1fbW91c2VFdmVu dFF1ZXVlLnNpemUoKSk7Ci0gICAgc2VuZChNZXNzYWdlczo6V2ViUGFnZTo6TW91c2VFdmVudChl dmVudCkpOworICAgIHNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6Ok1vdXNlRXZlbnQoZXZlbnQsIHNh bmRib3hFeHRlbnNpb25zKSk7CiB9CiAKIHZvaWQgV2ViUGFnZVByb3h5Ojpkb0FmdGVyUHJvY2Vz c2luZ0FsbFBlbmRpbmdNb3VzZUV2ZW50cyhXVEY6OkZ1bmN0aW9uPHZvaWQgKCk+JiYgYWN0aW9u KQpJbmRleDogU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAJ KHJldmlzaW9uIDI3MDIxNSkKKysrIFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dl YlBhZ2UuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yODAzLDcgKzI4MDMsNyBAQCBzdGF0aWMgYm9v bCBoYW5kbGVNb3VzZUV2ZW50KGNvbnN0IFdlYk1vCiAgICAgfQogfQogCi12b2lkIFdlYlBhZ2U6 Om1vdXNlRXZlbnQoY29uc3QgV2ViTW91c2VFdmVudCYgbW91c2VFdmVudCkKK3ZvaWQgV2ViUGFn ZTo6bW91c2VFdmVudChjb25zdCBXZWJNb3VzZUV2ZW50JiBtb3VzZUV2ZW50LCBPcHRpb25hbDxT YW5kYm94RXh0ZW5zaW9uOjpIYW5kbGVBcnJheT4mJiBzYW5kYm94RXh0ZW5zaW9ucykKIHsKICAg ICBTZXRGb3JTY29wZTxib29sPiB1c2VySXNJbnRlcmFjdGluZ0NoYW5nZSB7IG1fdXNlcklzSW50 ZXJhY3RpbmcsIHRydWUgfTsKIApAQCAtMjgyNiw2ICsyODI2LDEwIEBAIHZvaWQgV2ViUGFnZTo6 bW91c2VFdmVudChjb25zdCBXZWJNb3VzZUUKICAgICAgICAgcmV0dXJuOwogICAgIH0KIAorICAg IFZlY3RvcjxSZWZQdHI8U2FuZGJveEV4dGVuc2lvbj4+IG1vdXNlRXZlbnRTYW5kYm94RXh0ZW5z aW9uczsKKyAgICBpZiAoc2FuZGJveEV4dGVuc2lvbnMpCisgICAgICAgIG1vdXNlRXZlbnRTYW5k Ym94RXh0ZW5zaW9ucyA9IGNvbnN1bWVTYW5kYm94RXh0ZW5zaW9ucyhXVEZNb3ZlKCpzYW5kYm94 RXh0ZW5zaW9ucykpOworCiAgICAgYm9vbCBoYW5kbGVkID0gZmFsc2U7CiAKICNpZiAhUExBVEZP Uk0oSU9TX0ZBTUlMWSkKQEAgLTI4NDEsNiArMjg0NSw4IEBAIHZvaWQgV2ViUGFnZTo6bW91c2VF dmVudChjb25zdCBXZWJNb3VzZUUKICAgICB9CiAKICAgICBzZW5kKE1lc3NhZ2VzOjpXZWJQYWdl UHJveHk6OkRpZFJlY2VpdmVFdmVudChzdGF0aWNfY2FzdDx1aW50MzJfdD4obW91c2VFdmVudC50 eXBlKCkpLCBoYW5kbGVkKSk7CisKKyAgICByZXZva2VTYW5kYm94RXh0ZW5zaW9ucyhtb3VzZUV2 ZW50U2FuZGJveEV4dGVuc2lvbnMpOwogfQogCiBzdGF0aWMgYm9vbCBoYW5kbGVXaGVlbEV2ZW50 KGNvbnN0IFdlYldoZWVsRXZlbnQmIHdoZWVsRXZlbnQsIFBhZ2UqIHBhZ2UsIE9wdGlvblNldDxX aGVlbEV2ZW50UHJvY2Vzc2luZ1N0ZXBzPiBwcm9jZXNzaW5nU3RlcHMpCkBAIC00MTM3LDcgKzQx NDMsNyBAQCB2b2lkIFdlYlBhZ2U6OmRyYWdDYW5jZWxsZWQoKQogICAgIG1faXNTdGFydGluZ0Ry YWcgPSBmYWxzZTsKICAgICBtX3BhZ2UtPm1haW5GcmFtZSgpLmV2ZW50SGFuZGxlcigpLmRyYWdD YW5jZWxsZWQoKTsKIH0KLSAgICAKKwogI2VuZGlmIC8vIEVOQUJMRShEUkFHX1NVUFBPUlQpCiAK IFdlYlVuZG9TdGVwKiBXZWJQYWdlOjp3ZWJVbmRvU3RlcChXZWJVbmRvU3RlcElEIHN0ZXBJRCkK QEAgLTUyNDIsMTggKzUyNDgsMTggQEAgdm9pZCBXZWJQYWdlOjpoYW5kbGVBbHRlcm5hdGl2ZVRl eHRVSVJlcwogdm9pZCBXZWJQYWdlOjpzaW11bGF0ZU1vdXNlRG93bihpbnQgYnV0dG9uLCBXZWJD b3JlOjpJbnRQb2ludCBwb3NpdGlvbiwgaW50IGNsaWNrQ291bnQsIFdLRXZlbnRNb2RpZmllcnMg bW9kaWZpZXJzLCBXYWxsVGltZSB0aW1lKQogewogICAgIHN0YXRpY19hc3NlcnQoc2l6ZW9mKFdL RXZlbnRNb2RpZmllcnMpID49IHNpemVvZihXZWJFdmVudDo6TW9kaWZpZXIpLCAiV0tFdmVudE1v ZGlmaWVycyBtdXN0IGJlIGdyZWF0ZXIgdGhhbiBvciBlcXVhbCB0byB0aGUgc2l6ZSBvZiBXZWJF dmVudDo6TW9kaWZpZXIiKTsKLSAgICBtb3VzZUV2ZW50KFdlYk1vdXNlRXZlbnQoV2ViTW91c2VF dmVudDo6TW91c2VEb3duLCBzdGF0aWNfY2FzdDxXZWJNb3VzZUV2ZW50OjpCdXR0b24+KGJ1dHRv biksIDAsIHBvc2l0aW9uLCBwb3NpdGlvbiwgMCwgMCwgMCwgY2xpY2tDb3VudCwgT3B0aW9uU2V0 PFdlYkV2ZW50OjpNb2RpZmllcj46OmZyb21SYXcobW9kaWZpZXJzKSwgdGltZSwgV2ViQ29yZTo6 Rm9yY2VBdENsaWNrLCBXZWJNb3VzZUV2ZW50OjpOb1RhcCkpOworICAgIG1vdXNlRXZlbnQoV2Vi TW91c2VFdmVudChXZWJNb3VzZUV2ZW50OjpNb3VzZURvd24sIHN0YXRpY19jYXN0PFdlYk1vdXNl RXZlbnQ6OkJ1dHRvbj4oYnV0dG9uKSwgMCwgcG9zaXRpb24sIHBvc2l0aW9uLCAwLCAwLCAwLCBj bGlja0NvdW50LCBPcHRpb25TZXQ8V2ViRXZlbnQ6Ok1vZGlmaWVyPjo6ZnJvbVJhdyhtb2RpZmll cnMpLCB0aW1lLCBXZWJDb3JlOjpGb3JjZUF0Q2xpY2ssIFdlYk1vdXNlRXZlbnQ6Ok5vVGFwKSwg V1RGOjpudWxsb3B0KTsKIH0KIAogdm9pZCBXZWJQYWdlOjpzaW11bGF0ZU1vdXNlVXAoaW50IGJ1 dHRvbiwgV2ViQ29yZTo6SW50UG9pbnQgcG9zaXRpb24sIGludCBjbGlja0NvdW50LCBXS0V2ZW50 TW9kaWZpZXJzIG1vZGlmaWVycywgV2FsbFRpbWUgdGltZSkKIHsKICAgICBzdGF0aWNfYXNzZXJ0 KHNpemVvZihXS0V2ZW50TW9kaWZpZXJzKSA+PSBzaXplb2YoV2ViRXZlbnQ6Ok1vZGlmaWVyKSwg IldLRXZlbnRNb2RpZmllcnMgbXVzdCBiZSBncmVhdGVyIHRoYW4gb3IgZXF1YWwgdG8gdGhlIHNp emUgb2YgV2ViRXZlbnQ6Ok1vZGlmaWVyIik7Ci0gICAgbW91c2VFdmVudChXZWJNb3VzZUV2ZW50 KFdlYk1vdXNlRXZlbnQ6Ok1vdXNlVXAsIHN0YXRpY19jYXN0PFdlYk1vdXNlRXZlbnQ6OkJ1dHRv bj4oYnV0dG9uKSwgMCwgcG9zaXRpb24sIHBvc2l0aW9uLCAwLCAwLCAwLCBjbGlja0NvdW50LCBP cHRpb25TZXQ8V2ViRXZlbnQ6Ok1vZGlmaWVyPjo6ZnJvbVJhdyhtb2RpZmllcnMpLCB0aW1lLCBX ZWJDb3JlOjpGb3JjZUF0Q2xpY2ssIFdlYk1vdXNlRXZlbnQ6Ok5vVGFwKSk7CisgICAgbW91c2VF dmVudChXZWJNb3VzZUV2ZW50KFdlYk1vdXNlRXZlbnQ6Ok1vdXNlVXAsIHN0YXRpY19jYXN0PFdl Yk1vdXNlRXZlbnQ6OkJ1dHRvbj4oYnV0dG9uKSwgMCwgcG9zaXRpb24sIHBvc2l0aW9uLCAwLCAw LCAwLCBjbGlja0NvdW50LCBPcHRpb25TZXQ8V2ViRXZlbnQ6Ok1vZGlmaWVyPjo6ZnJvbVJhdyht b2RpZmllcnMpLCB0aW1lLCBXZWJDb3JlOjpGb3JjZUF0Q2xpY2ssIFdlYk1vdXNlRXZlbnQ6Ok5v VGFwKSwgV1RGOjpudWxsb3B0KTsKIH0KIAogdm9pZCBXZWJQYWdlOjpzaW11bGF0ZU1vdXNlTW90 aW9uKFdlYkNvcmU6OkludFBvaW50IHBvc2l0aW9uLCBXYWxsVGltZSB0aW1lKQogewotICAgIG1v dXNlRXZlbnQoV2ViTW91c2VFdmVudChXZWJNb3VzZUV2ZW50OjpNb3VzZU1vdmUsIFdlYk1vdXNl RXZlbnQ6Ok5vQnV0dG9uLCAwLCBwb3NpdGlvbiwgcG9zaXRpb24sIDAsIDAsIDAsIDAsIE9wdGlv blNldDxXZWJFdmVudDo6TW9kaWZpZXI+IHsgfSwgdGltZSwgMCwgV2ViTW91c2VFdmVudDo6Tm9U YXApKTsKKyAgICBtb3VzZUV2ZW50KFdlYk1vdXNlRXZlbnQoV2ViTW91c2VFdmVudDo6TW91c2VN b3ZlLCBXZWJNb3VzZUV2ZW50OjpOb0J1dHRvbiwgMCwgcG9zaXRpb24sIHBvc2l0aW9uLCAwLCAw LCAwLCAwLCBPcHRpb25TZXQ8V2ViRXZlbnQ6Ok1vZGlmaWVyPiB7IH0sIHRpbWUsIDAsIFdlYk1v dXNlRXZlbnQ6Ok5vVGFwKSwgV1RGOjpudWxsb3B0KTsKIH0KIAogdm9pZCBXZWJQYWdlOjpzZXRD b21wb3NpdGlvbkZvclRlc3RpbmcoY29uc3QgU3RyaW5nJiBjb21wb3NpdGlvblN0cmluZywgdWlu dDY0X3QgZnJvbSwgdWludDY0X3QgbGVuZ3RoLCBib29sIHN1cHByZXNzVW5kZXJsaW5lLCBjb25z dCBWZWN0b3I8Q29tcG9zaXRpb25IaWdobGlnaHQ+JiBoaWdobGlnaHRzKQpAQCAtNzAzMyw2ICs3 MDM5LDI3IEBAIFJlbW90ZVJlbmRlcmluZ0JhY2tlbmRQcm94eSYgV2ViUGFnZTo6ZW4KIH0KICNl bmRpZgogCitWZWN0b3I8UmVmUHRyPFNhbmRib3hFeHRlbnNpb24+PiBXZWJQYWdlOjpjb25zdW1l U2FuZGJveEV4dGVuc2lvbnMoU2FuZGJveEV4dGVuc2lvbjo6SGFuZGxlQXJyYXkmJiBzYW5kYm94 RXh0ZW5zaW9ucykKK3sKKyAgICBWZWN0b3I8UmVmUHRyPFNhbmRib3hFeHRlbnNpb24+PiBkcmFn U2FuZGJveEV4dGVuc2lvbnM7CisgICAgZm9yIChhdXRvJiBzYW5kYm94RXh0ZW5zaW9uIDogc2Fu ZGJveEV4dGVuc2lvbnMpIHsKKyAgICAgICAgYXV0byBleHRlbnNpb24gPSBTYW5kYm94RXh0ZW5z aW9uOjpjcmVhdGUoV1RGTW92ZShzYW5kYm94RXh0ZW5zaW9uKSk7CisgICAgICAgIGlmICghZXh0 ZW5zaW9uKQorICAgICAgICAgICAgY29udGludWU7CisgICAgICAgIGJvb2wgb2sgPSBleHRlbnNp b24tPmNvbnN1bWUoKTsKKyAgICAgICAgQVNTRVJUX1VOVVNFRChvaywgb2spOworICAgICAgICBk cmFnU2FuZGJveEV4dGVuc2lvbnMuYXBwZW5kKFdURk1vdmUoZXh0ZW5zaW9uKSk7CisgICAgfQor ICAgIHJldHVybiBkcmFnU2FuZGJveEV4dGVuc2lvbnM7Cit9CisKK3ZvaWQgV2ViUGFnZTo6cmV2 b2tlU2FuZGJveEV4dGVuc2lvbnMoVmVjdG9yPFJlZlB0cjxTYW5kYm94RXh0ZW5zaW9uPj4mIHNh bmRib3hFeHRlbnNpb25zKQoreworICAgIGZvciAoYXV0byYgc2FuZGJveEV4dGVuc2lvbiA6IHNh bmRib3hFeHRlbnNpb25zKQorICAgICAgICBzYW5kYm94RXh0ZW5zaW9uLT5yZXZva2UoKTsKKyAg ICBzYW5kYm94RXh0ZW5zaW9ucy5jbGVhcigpOworfQorCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQK IAogI3VuZGVmIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQKSW5kZXg6IFNvdXJjZS9XZWJLaXQvV2Vi UHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1dl YlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmgJKHJldmlzaW9uIDI3MDIxNSkKKysrIFNvdXJjZS9X ZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaAkod29ya2luZyBjb3B5KQpAQCAtMTQ4 OCw3ICsxNDg4LDcgQEAgcHJpdmF0ZToKIAogICAgIHZvaWQgc2V0TmVlZHNGb250QXR0cmlidXRl cyhib29sKTsKIAotICAgIHZvaWQgbW91c2VFdmVudChjb25zdCBXZWJNb3VzZUV2ZW50Jik7Cisg ICAgdm9pZCBtb3VzZUV2ZW50KGNvbnN0IFdlYk1vdXNlRXZlbnQmLCBPcHRpb25hbDxTYW5kYm94 RXh0ZW5zaW9uOjpIYW5kbGVBcnJheT4mJiBzYW5kYm94RXh0ZW5zaW9ucyk7CiAgICAgdm9pZCBr ZXlFdmVudChjb25zdCBXZWJLZXlib2FyZEV2ZW50Jik7CiAKICNpZiBFTkFCTEUoSU9TX1RPVUNI X0VWRU5UUykKQEAgLTE3ODMsNiArMTc4Myw5IEBAIHByaXZhdGU6CiAKICAgICB2b2lkIHBsYXRm b3JtRGlkU2NhbGVQYWdlKCk7CiAKKyAgICBWZWN0b3I8UmVmUHRyPFNhbmRib3hFeHRlbnNpb24+ PiBjb25zdW1lU2FuZGJveEV4dGVuc2lvbnMoU2FuZGJveEV4dGVuc2lvbjo6SGFuZGxlQXJyYXkm Jik7CisgICAgdm9pZCByZXZva2VTYW5kYm94RXh0ZW5zaW9ucyhWZWN0b3I8UmVmUHRyPFNhbmRi b3hFeHRlbnNpb24+PiYgc2FuZGJveEV4dGVuc2lvbnMpOworICAgIAogICAgIFdlYkNvcmU6OlBh Z2VJZGVudGlmaWVyIG1faWRlbnRpZmllcjsKIAogICAgIHN0ZDo6dW5pcXVlX3B0cjxXZWJDb3Jl OjpQYWdlPiBtX3BhZ2U7CkluZGV4OiBTb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9X ZWJQYWdlLm1lc3NhZ2VzLmluCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vz cy9XZWJQYWdlL1dlYlBhZ2UubWVzc2FnZXMuaW4JKHJldmlzaW9uIDI3MDIxNSkKKysrIFNvdXJj ZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UubWVzc2FnZXMuaW4JKHdvcmtpbmcg Y29weSkKQEAgLTQ1LDcgKzQ1LDcgQEAgbWVzc2FnZXMgLT4gV2ViUGFnZSBMZWdhY3lSZWNlaXZl ciB7CiAKICAgICBFeGVjdXRlRWRpdENvbW1hbmRXaXRoQ2FsbGJhY2soU3RyaW5nIG5hbWUsIFN0 cmluZyBhcmd1bWVudCkgLT4gKCkgQXN5bmMKICAgICBLZXlFdmVudChXZWJLaXQ6OldlYktleWJv YXJkRXZlbnQgZXZlbnQpCi0gICAgTW91c2VFdmVudChXZWJLaXQ6OldlYk1vdXNlRXZlbnQgZXZl bnQpCisgICAgTW91c2VFdmVudChXZWJLaXQ6OldlYk1vdXNlRXZlbnQgZXZlbnQsIE9wdGlvbmFs PFdlYktpdDo6U2FuZGJveEV4dGVuc2lvbjo6SGFuZGxlQXJyYXk+IHNhbmRib3hFeHRlbnNpb25z KQogI2lmIFBMQVRGT1JNKElPU19GQU1JTFkpCiAgICAgU2V0Vmlld3BvcnRDb25maWd1cmF0aW9u Vmlld0xheW91dFNpemUoV2ViQ29yZTo6RmxvYXRTaXplIHNpemUsIGRvdWJsZSBzY2FsZUZhY3Rv ciwgZG91YmxlIG1pbmltdW1FZmZlY3RpdmVEZXZpY2VXaWR0aCkKICAgICBTZXRNYXhpbXVtVW5v YnNjdXJlZFNpemUoV2ViQ29yZTo6RmxvYXRTaXplIHNpemUpCg==