181419 2018-01-08 17:27:06 -0800 Pass around Vector<Ref<WebContextMenuItem>> instead of WKArrayRef or Vector<WebContextMenuItemData> 2018-01-08 19:08:59 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 achristensen achristensen rniwa thorton webkit-bug-importer oldest_to_newest 1387017 0 achristensen 2018-01-08 17:27:06 -0800 Pass around Vector<Ref<WebContextMenuItem>> instead of WKArrayRef or Vector<WebContextMenuItemData> 1387019 1 330763 achristensen 2018-01-08 17:28:20 -0800 Created attachment 330763 Patch 1387024 2 330766 achristensen 2018-01-08 17:35:18 -0800 Created attachment 330766 Patch 1387025 3 330767 achristensen 2018-01-08 17:40:04 -0800 Created attachment 330767 Patch 1387033 4 achristensen 2018-01-08 17:54:06 -0800 http://trac.webkit.org/r226602 1387034 5 webkit-bug-importer 2018-01-08 17:58:42 -0800 <rdar://problem/36366090> 1387071 6 rniwa 2018-01-08 19:08:59 -0800 This patch appears to have broken iOS builds: /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator11.0.sdk/System/Library/Frameworks/System.framework/PrivateHeaders -include /Volumes/Data/EWS/WebKit/WebKitBuild/PrecompiledHeaders/WebKit2Prefix-drveltbyitydmohjorffrkcgteab/WebKit2Prefix.h -MMD -MT dependencies -MF /Volumes/Data/EWS/WebKit/WebKitBuild/WebKit.build/Release-iphonesimulator/WebKit.build/Objects-normal/x86_64/WKContextMenuListener.d --serialize-diagnostics /Volumes/Data/EWS/WebKit/WebKitBuild/WebKit.build/Release-iphonesimulator/WebKit.build/Objects-normal/x86_64/WKContextMenuListener.dia -c /Volumes/Data/EWS/WebKit/Source/WebKit/UIProcess/API/C/WKContextMenuListener.cpp -o /Volumes/Data/EWS/WebKit/WebKitBuild/WebKit.build/Release-iphonesimulator/WebKit.build/Objects-normal/x86_64/WKContextMenuListener.o /Volumes/Data/EWS/WebKit/Source/WebKit/UIProcess/API/C/WKContextMenuListener.cpp:63:18: error: use of undeclared identifier 'items' UNUSED_PARAM(items); ^ Fix attempted in https://trac.webkit.org/changeset/226608 330763 2018-01-08 17:28:20 -0800 2018-01-08 17:35:16 -0800 Patch bug-181419-20180108172819.patch text/plain 7344 achristensen SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyMjY2MDEpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI0IEBACisyMDE4LTAxLTA4ICBBbGV4IENocmlz dGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUGFzcyBhcm91bmQg VmVjdG9yPFJlZjxXZWJDb250ZXh0TWVudUl0ZW0+PiBpbnN0ZWFkIG9mIFdLQXJyYXlSZWYgb3Ig VmVjdG9yPFdlYkNvbnRleHRNZW51SXRlbURhdGE+CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODE0MTkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBQYXNzaW5nIGEgV0tBcnJheVJlZiB0byBhbiBBUEkgb2Jq ZWN0IGlzIG1lc3N5IGFuZCB3YXMgcHJldmVudGluZyBtZSBmcm9tIG1vdmluZyB0aGluZ3MgYXJv dW5kIGFuZCBtYWtpbmcgT2JqQyBTUEkuCisgICAgICAgIE5vIGNoYW5nZSBpbiBiZWhhdmlvci4g IEp1c3QgdXNpbmcgZGlmZmVyZW50IGxheWVyaW5nIGFic3RyYWN0aW9ucyBmb3IgdGhlIHNhbWUg ZGF0YS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQy9XS0NvbnRleHRNZW51TGlzdGVuZXIu Y3BwOgorICAgICAgICAoV0tDb250ZXh0TWVudUxpc3RlbmVyVXNlQ29udGV4dE1lbnVJdGVtcyk6 CisgICAgICAgICogVUlQcm9jZXNzL1dlYkNvbnRleHRNZW51TGlzdGVuZXJQcm94eS5jcHA6Cisg ICAgICAgIChXZWJLaXQ6OldlYkNvbnRleHRNZW51TGlzdGVuZXJQcm94eTo6dXNlQ29udGV4dE1l bnVJdGVtcyk6CisgICAgICAgICogVUlQcm9jZXNzL1dlYkNvbnRleHRNZW51TGlzdGVuZXJQcm94 eS5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJDb250ZXh0TWVudVByb3h5Lmg6CisgICAgICAg ICogVUlQcm9jZXNzL21hYy9XZWJDb250ZXh0TWVudVByb3h5TWFjLmg6CisgICAgICAgICogVUlQ cm9jZXNzL21hYy9XZWJDb250ZXh0TWVudVByb3h5TWFjLm1tOgorICAgICAgICAoV2ViS2l0OjpX ZWJDb250ZXh0TWVudVByb3h5TWFjOjpzaG93Q29udGV4dE1lbnVXaXRoSXRlbXMpOgorICAgICAg ICAoV2ViS2l0OjpXZWJDb250ZXh0TWVudVByb3h5TWFjOjpzaG93Q29udGV4dE1lbnUpOgorCiAy MDE4LTAxLTA4ICBKb2huIFdpbGFuZGVyICA8d2lsYW5kZXJAYXBwbGUuY29tPgogCiAgICAgICAg IFN0b3JhZ2UgQWNjZXNzIEFQSTogUmVtb3ZlIGFjY2VzcyBmb3IgYWxsIGZyYW1lcyB1bmRlciBh IHBhZ2Ugd2hlbiB0aGUgcGFnZSBpcyBjbG9zZWQKSW5kZXg6IFNvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL1dlYkNvbnRleHRNZW51TGlzdGVuZXJQcm94eS5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYktpdC9VSVByb2Nlc3MvV2ViQ29udGV4dE1lbnVMaXN0ZW5lclByb3h5LmNwcAkocmV2aXNp b24gMjI2MzY5KQorKysgU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViQ29udGV4dE1lbnVMaXN0 ZW5lclByb3h5LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDcsMjQgKzQ3LDEyIEBAIFdlYkNvbnRl eHRNZW51TGlzdGVuZXJQcm94eTo6fldlYkNvbnRleHQKIHsKIH0KIAotdm9pZCBXZWJDb250ZXh0 TWVudUxpc3RlbmVyUHJveHk6OnVzZUNvbnRleHRNZW51SXRlbXMoV0tBcnJheVJlZiBpdGVtcykK K3ZvaWQgV2ViQ29udGV4dE1lbnVMaXN0ZW5lclByb3h5Ojp1c2VDb250ZXh0TWVudUl0ZW1zKFZl Y3RvcjxSZWY8V2ViQ29udGV4dE1lbnVJdGVtPj4mJiBpdGVtcykKIHsKICAgICBpZiAoIW1fY29u dGV4dE1lbnVNYWMpCiAgICAgICAgIHJldHVybjsKIAotICAgIFJlZlB0cjxBUEk6OkFycmF5PiBh cnJheSA9IHRvSW1wbChpdGVtcyk7Ci0gICAgc2l6ZV90IG5ld1NpemUgPSBhcnJheSA/IGFycmF5 LT5zaXplKCkgOiAwOwotICAgIFZlY3RvcjxXZWJDb250ZXh0TWVudUl0ZW1EYXRhPiBkYXRhSXRl bXM7Ci0gICAgZGF0YUl0ZW1zLnJlc2VydmVJbml0aWFsQ2FwYWNpdHkobmV3U2l6ZSk7Ci0gICAg Zm9yIChzaXplX3QgaSA9IDA7IGkgPCBuZXdTaXplOyArK2kpIHsKLSAgICAgICAgV2ViQ29udGV4 dE1lbnVJdGVtKiBpdGVtID0gYXJyYXktPmF0PFdlYkNvbnRleHRNZW51SXRlbT4oaSk7Ci0gICAg ICAgIGlmICghaXRlbSkKLSAgICAgICAgICAgIGNvbnRpbnVlOwotCi0gICAgICAgIGRhdGFJdGVt cy51bmNoZWNrZWRBcHBlbmQoaXRlbS0+ZGF0YSgpKTsKLSAgICB9Ci0KLSAgICBtX2NvbnRleHRN ZW51TWFjLT5zaG93Q29udGV4dE1lbnVXaXRoSXRlbXMoV1RGTW92ZShkYXRhSXRlbXMpKTsKKyAg ICBtX2NvbnRleHRNZW51TWFjLT5zaG93Q29udGV4dE1lbnVXaXRoSXRlbXMoV1RGTW92ZShpdGVt cykpOwogfQogCiB2b2lkIFdlYkNvbnRleHRNZW51TGlzdGVuZXJQcm94eTo6aW52YWxpZGF0ZSgp CkluZGV4OiBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJDb250ZXh0TWVudUxpc3RlbmVyUHJv eHkuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJDb250ZXh0TWVu dUxpc3RlbmVyUHJveHkuaAkocmV2aXNpb24gMjI2MzY5KQorKysgU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvV2ViQ29udGV4dE1lbnVMaXN0ZW5lclByb3h5LmgJKHdvcmtpbmcgY29weSkKQEAgLTQ0 LDcgKzQ0LDcgQEAgcHVibGljOgogCiAgICAgdmlydHVhbCB+V2ViQ29udGV4dE1lbnVMaXN0ZW5l clByb3h5KCk7CiAKLSAgICB2b2lkIHVzZUNvbnRleHRNZW51SXRlbXMoV0tBcnJheVJlZiBpdGVt cyk7CisgICAgdm9pZCB1c2VDb250ZXh0TWVudUl0ZW1zKFZlY3RvcjxSZWY8V2ViQ29udGV4dE1l bnVJdGVtPj4mJik7CiAKICAgICB2b2lkIGludmFsaWRhdGUoKTsKIHByaXZhdGU6CkluZGV4OiBT b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJDb250ZXh0TWVudVByb3h5LmgKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViQ29udGV4dE1lbnVQcm94eS5oCShyZXZpc2lv biAyMjYzNjkpCisrKyBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJDb250ZXh0TWVudVByb3h5 LmgJKHdvcmtpbmcgY29weSkKQEAgLTQxLDcgKzQxLDcgQEAgcHVibGljOgogCiAgICAgdmlydHVh bCB2b2lkIHNob3coKSA9IDA7CiAKLSAgICB2aXJ0dWFsIHZvaWQgc2hvd0NvbnRleHRNZW51V2l0 aEl0ZW1zKFZlY3RvcjxXZWJDb250ZXh0TWVudUl0ZW1EYXRhPiYmKSA9IDA7CisgICAgdmlydHVh bCB2b2lkIHNob3dDb250ZXh0TWVudVdpdGhJdGVtcyhjb25zdCBWZWN0b3I8UmVmPFdlYkNvbnRl eHRNZW51SXRlbT4+JikgPSAwOwogCiBwcm90ZWN0ZWQ6CiAgICAgV2ViQ29udGV4dE1lbnVQcm94 eShDb250ZXh0TWVudUNvbnRleHREYXRhJiYsIGNvbnN0IFVzZXJEYXRhJik7CkluZGV4OiBTb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQy9XS0NvbnRleHRNZW51TGlzdGVuZXIuY3BwCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9DL1dLQ29udGV4dE1lbnVMaXN0 ZW5lci5jcHAJKHJldmlzaW9uIDIyNjM2OSkKKysrIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQ SS9DL1dLQ29udGV4dE1lbnVMaXN0ZW5lci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTI2LDcgKzI2 LDkgQEAKICNpbmNsdWRlICJjb25maWcuaCIKICNpbmNsdWRlICJXS0NvbnRleHRNZW51TGlzdGVu ZXIuaCIKIAorI2luY2x1ZGUgIkFQSUFycmF5LmgiCiAjaW5jbHVkZSAiV0tBUElDYXN0LmgiCisj aW5jbHVkZSAiV2ViQ29udGV4dE1lbnVJdGVtLmgiCiAjaW5jbHVkZSAiV2ViQ29udGV4dE1lbnVM aXN0ZW5lclByb3h5LmgiCiAKIHVzaW5nIG5hbWVzcGFjZSBXZWJLaXQ7CkBAIC00MCwxMCArNDIs MjIgQEAgV0tUeXBlSUQgV0tDb250ZXh0TWVudUxpc3RlbmVyR2V0VHlwZUlEKAogI2VuZGlmCiB9 CiAKLXZvaWQgV0tDb250ZXh0TWVudUxpc3RlbmVyVXNlQ29udGV4dE1lbnVJdGVtcyhXS0NvbnRl eHRNZW51TGlzdGVuZXJSZWYgbGlzdGVuZXJSZWYsIFdLQXJyYXlSZWYgaXRlbXMpCit2b2lkIFdL Q29udGV4dE1lbnVMaXN0ZW5lclVzZUNvbnRleHRNZW51SXRlbXMoV0tDb250ZXh0TWVudUxpc3Rl bmVyUmVmIGxpc3RlbmVyUmVmLCBXS0FycmF5UmVmIGFycmF5UmVmKQogewogI2lmIEVOQUJMRShD T05URVhUX01FTlVTKQotICAgIHRvSW1wbChsaXN0ZW5lclJlZiktPnVzZUNvbnRleHRNZW51SXRl bXMoaXRlbXMpOworICAgIFJlZlB0cjxBUEk6OkFycmF5PiBhcnJheSA9IHRvSW1wbChhcnJheVJl Zik7CisgICAgc2l6ZV90IG5ld1NpemUgPSBhcnJheSA/IGFycmF5LT5zaXplKCkgOiAwOworICAg IFZlY3RvcjxSZWY8V2ViQ29udGV4dE1lbnVJdGVtPj4gaXRlbXM7CisgICAgaXRlbXMucmVzZXJ2 ZUluaXRpYWxDYXBhY2l0eShuZXdTaXplKTsKKyAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IG5l d1NpemU7ICsraSkgeworICAgICAgICBXZWJDb250ZXh0TWVudUl0ZW0qIGl0ZW0gPSBhcnJheS0+ YXQ8V2ViQ29udGV4dE1lbnVJdGVtPihpKTsKKyAgICAgICAgaWYgKCFpdGVtKQorICAgICAgICAg ICAgY29udGludWU7CisgICAgICAgIAorICAgICAgICBpdGVtcy51bmNoZWNrZWRBcHBlbmQoKml0 ZW0pOworICAgIH0KKworICAgIHRvSW1wbChsaXN0ZW5lclJlZiktPnVzZUNvbnRleHRNZW51SXRl bXMoV1RGTW92ZShpdGVtcykpOwogI2Vsc2UKICAgICBVTlVTRURfUEFSQU0obGlzdGVuZXJSZWYp OwogICAgIFVOVVNFRF9QQVJBTShpdGVtcyk7CkluZGV4OiBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9tYWMvV2ViQ29udGV4dE1lbnVQcm94eU1hYy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL21hYy9XZWJDb250ZXh0TWVudVByb3h5TWFjLmgJKHJldmlzaW9uIDIyNjM2 OSkKKysrIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL21hYy9XZWJDb250ZXh0TWVudVByb3h5TWFj LmgJKHdvcmtpbmcgY29weSkKQEAgLTU0LDcgKzU0LDcgQEAgcHVibGljOgogICAgIH5XZWJDb250 ZXh0TWVudVByb3h5TWFjKCk7CiAKICAgICB2b2lkIGNvbnRleHRNZW51SXRlbVNlbGVjdGVkKGNv bnN0IFdlYkNvbnRleHRNZW51SXRlbURhdGEmKTsKLSAgICB2b2lkIHNob3dDb250ZXh0TWVudVdp dGhJdGVtcyhWZWN0b3I8V2ViQ29udGV4dE1lbnVJdGVtRGF0YT4mJikgb3ZlcnJpZGU7CisgICAg dm9pZCBzaG93Q29udGV4dE1lbnVXaXRoSXRlbXMoY29uc3QgVmVjdG9yPFJlZjxXZWJDb250ZXh0 TWVudUl0ZW0+PiYpIG92ZXJyaWRlOwogCiAjaWYgRU5BQkxFKFNFUlZJQ0VfQ09OVFJPTFMpCiAg ICAgdm9pZCBjbGVhclNlcnZpY2VzTWVudSgpOwpJbmRleDogU291cmNlL1dlYktpdC9VSVByb2Nl c3MvbWFjL1dlYkNvbnRleHRNZW51UHJveHlNYWMubW0KPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YktpdC9VSVByb2Nlc3MvbWFjL1dlYkNvbnRleHRNZW51UHJveHlNYWMubW0JKHJldmlzaW9uIDIy NjM2OSkKKysrIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL21hYy9XZWJDb250ZXh0TWVudVByb3h5 TWFjLm1tCSh3b3JraW5nIGNvcHkpCkBAIC00NTEsOSArNDUxLDE0IEBAIFJldGFpblB0cjxOU01l bnVJdGVtPiBXZWJDb250ZXh0TWVudVByb3gKICAgICB9CiB9CiAKLXZvaWQgV2ViQ29udGV4dE1l bnVQcm94eU1hYzo6c2hvd0NvbnRleHRNZW51V2l0aEl0ZW1zKFZlY3RvcjxXZWJDb250ZXh0TWVu dUl0ZW1EYXRhPiYmIGl0ZW1zKQordm9pZCBXZWJDb250ZXh0TWVudVByb3h5TWFjOjpzaG93Q29u dGV4dE1lbnVXaXRoSXRlbXMoY29uc3QgVmVjdG9yPFJlZjxXZWJDb250ZXh0TWVudUl0ZW0+PiYg aXRlbXMpCiB7Ci0gICAgYXV0byBtZW51ID0gY3JlYXRlQ29udGV4dE1lbnVGcm9tSXRlbXMoaXRl bXMpOworICAgIFZlY3RvcjxXZWJDb250ZXh0TWVudUl0ZW1EYXRhPiBkYXRhOworICAgIGRhdGEu cmVzZXJ2ZUluaXRpYWxDYXBhY2l0eShpdGVtcy5zaXplKCkpOworICAgIGZvciAoYXV0byYgaXRl bSA6IGl0ZW1zKQorICAgICAgICBkYXRhLnVuY2hlY2tlZEFwcGVuZChpdGVtLT5kYXRhKCkpOwor ICAgIAorICAgIGF1dG8gbWVudSA9IGNyZWF0ZUNvbnRleHRNZW51RnJvbUl0ZW1zKGRhdGEpOwog ICAgIFtbV0tNZW51VGFyZ2V0IHNoYXJlZE1lbnVUYXJnZXRdIHNldE1lbnVQcm94eTp0aGlzXTsK ICAgICBtX21lbnUgPSBtX3BhZ2UuY29udGV4dE1lbnVDbGllbnQoKS5tZW51RnJvbVByb3Bvc2Vk TWVudShtX3BhZ2UsIG1lbnUuZ2V0KCksIG1fY29udGV4dC53ZWJIaXRUZXN0UmVzdWx0RGF0YSgp LCBtX3VzZXJEYXRhLm9iamVjdCgpKTsKIApAQCAtNDkzLDE0ICs0OTgsMTIgQEAgdm9pZCBXZWJD b250ZXh0TWVudVByb3h5TWFjOjpzaG93Q29udGV4dAogICAgIGlmIChtX3BhZ2UuY29udGV4dE1l bnVDbGllbnQoKS5zaG93Q29udGV4dE1lbnUobV9wYWdlLCBtX2NvbnRleHQubWVudUxvY2F0aW9u KCksIHVzZVByb3Bvc2VkSXRlbXMgPyBwcm9wb3NlZEFQSUl0ZW1zIDogY2xpZW50SXRlbXMpKQog ICAgICAgICByZXR1cm47CiAKLSAgICBWZWN0b3I8V2ViQ29udGV4dE1lbnVJdGVtRGF0YT4gaXRl bXM7Ci0gICAgZm9yIChhdXRvJiBpdGVtIDogKHVzZVByb3Bvc2VkSXRlbXMgPyBwcm9wb3NlZEFQ SUl0ZW1zIDogY2xpZW50SXRlbXMpKQotICAgICAgICBpdGVtcy5hcHBlbmQoaXRlbS0+ZGF0YSgp KTsKLQorICAgIGF1dG8mJiBpdGVtcyA9IFdURk1vdmUodXNlUHJvcG9zZWRJdGVtcyA/IHByb3Bv c2VkQVBJSXRlbXMgOiBjbGllbnRJdGVtcyk7CisgICAgCiAgICAgaWYgKGl0ZW1zLmlzRW1wdHko KSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgc2hvd0NvbnRleHRNZW51V2l0aEl0ZW1zKFdURk1v dmUoaXRlbXMpKTsKKyAgICBzaG93Q29udGV4dE1lbnVXaXRoSXRlbXMoaXRlbXMpOwogfQogCiBO U1dpbmRvdyAqV2ViQ29udGV4dE1lbnVQcm94eU1hYzo6d2luZG93KCkgY29uc3QK 330766 2018-01-08 17:35:18 -0800 2018-01-08 17:40:02 -0800 Patch bug-181419-20180108173517.patch text/plain 8764 achristensen SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyMjY2MDEpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI0IEBACisyMDE4LTAxLTA4ICBBbGV4IENocmlz dGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUGFzcyBhcm91bmQg VmVjdG9yPFJlZjxXZWJDb250ZXh0TWVudUl0ZW0+PiBpbnN0ZWFkIG9mIFdLQXJyYXlSZWYgb3Ig VmVjdG9yPFdlYkNvbnRleHRNZW51SXRlbURhdGE+CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODE0MTkKKworICAgICAgICBSZXZpZXdlZCBieSBUaW0g SG9ydG9uLgorCisgICAgICAgIFBhc3NpbmcgYSBXS0FycmF5UmVmIHRvIGFuIEFQSSBvYmplY3Qg aXMgbWVzc3kgYW5kIHdhcyBwcmV2ZW50aW5nIG1lIGZyb20gbW92aW5nIHRoaW5ncyBhcm91bmQg YW5kIG1ha2luZyBPYmpDIFNQSS4KKyAgICAgICAgTm8gY2hhbmdlIGluIGJlaGF2aW9yLiAgSnVz dCB1c2luZyBkaWZmZXJlbnQgbGF5ZXJpbmcgYWJzdHJhY3Rpb25zIGZvciB0aGUgc2FtZSBkYXRh LgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9DL1dLQ29udGV4dE1lbnVMaXN0ZW5lci5jcHA6 CisgICAgICAgIChXS0NvbnRleHRNZW51TGlzdGVuZXJVc2VDb250ZXh0TWVudUl0ZW1zKToKKyAg ICAgICAgKiBVSVByb2Nlc3MvV2ViQ29udGV4dE1lbnVMaXN0ZW5lclByb3h5LmNwcDoKKyAgICAg ICAgKFdlYktpdDo6V2ViQ29udGV4dE1lbnVMaXN0ZW5lclByb3h5Ojp1c2VDb250ZXh0TWVudUl0 ZW1zKToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViQ29udGV4dE1lbnVMaXN0ZW5lclByb3h5Lmg6 CisgICAgICAgICogVUlQcm9jZXNzL1dlYkNvbnRleHRNZW51UHJveHkuaDoKKyAgICAgICAgKiBV SVByb2Nlc3MvbWFjL1dlYkNvbnRleHRNZW51UHJveHlNYWMuaDoKKyAgICAgICAgKiBVSVByb2Nl c3MvbWFjL1dlYkNvbnRleHRNZW51UHJveHlNYWMubW06CisgICAgICAgIChXZWJLaXQ6OldlYkNv bnRleHRNZW51UHJveHlNYWM6OnNob3dDb250ZXh0TWVudVdpdGhJdGVtcyk6CisgICAgICAgIChX ZWJLaXQ6OldlYkNvbnRleHRNZW51UHJveHlNYWM6OnNob3dDb250ZXh0TWVudSk6CisKIDIwMTgt MDEtMDggIEpvaG4gV2lsYW5kZXIgIDx3aWxhbmRlckBhcHBsZS5jb20+CiAKICAgICAgICAgU3Rv cmFnZSBBY2Nlc3MgQVBJOiBSZW1vdmUgYWNjZXNzIGZvciBhbGwgZnJhbWVzIHVuZGVyIGEgcGFn ZSB3aGVuIHRoZSBwYWdlIGlzIGNsb3NlZApJbmRleDogU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv V2ViQ29udGV4dE1lbnVMaXN0ZW5lclByb3h5LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9XZWJDb250ZXh0TWVudUxpc3RlbmVyUHJveHkuY3BwCShyZXZpc2lvbiAy MjYzNjkpCisrKyBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJDb250ZXh0TWVudUxpc3RlbmVy UHJveHkuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00NywyNCArNDcsMTIgQEAgV2ViQ29udGV4dE1l bnVMaXN0ZW5lclByb3h5Ojp+V2ViQ29udGV4dAogewogfQogCi12b2lkIFdlYkNvbnRleHRNZW51 TGlzdGVuZXJQcm94eTo6dXNlQ29udGV4dE1lbnVJdGVtcyhXS0FycmF5UmVmIGl0ZW1zKQordm9p ZCBXZWJDb250ZXh0TWVudUxpc3RlbmVyUHJveHk6OnVzZUNvbnRleHRNZW51SXRlbXMoVmVjdG9y PFJlZjxXZWJDb250ZXh0TWVudUl0ZW0+PiYmIGl0ZW1zKQogewogICAgIGlmICghbV9jb250ZXh0 TWVudU1hYykKICAgICAgICAgcmV0dXJuOwogCi0gICAgUmVmUHRyPEFQSTo6QXJyYXk+IGFycmF5 ID0gdG9JbXBsKGl0ZW1zKTsKLSAgICBzaXplX3QgbmV3U2l6ZSA9IGFycmF5ID8gYXJyYXktPnNp emUoKSA6IDA7Ci0gICAgVmVjdG9yPFdlYkNvbnRleHRNZW51SXRlbURhdGE+IGRhdGFJdGVtczsK LSAgICBkYXRhSXRlbXMucmVzZXJ2ZUluaXRpYWxDYXBhY2l0eShuZXdTaXplKTsKLSAgICBmb3Ig KHNpemVfdCBpID0gMDsgaSA8IG5ld1NpemU7ICsraSkgewotICAgICAgICBXZWJDb250ZXh0TWVu dUl0ZW0qIGl0ZW0gPSBhcnJheS0+YXQ8V2ViQ29udGV4dE1lbnVJdGVtPihpKTsKLSAgICAgICAg aWYgKCFpdGVtKQotICAgICAgICAgICAgY29udGludWU7Ci0KLSAgICAgICAgZGF0YUl0ZW1zLnVu Y2hlY2tlZEFwcGVuZChpdGVtLT5kYXRhKCkpOwotICAgIH0KLQotICAgIG1fY29udGV4dE1lbnVN YWMtPnNob3dDb250ZXh0TWVudVdpdGhJdGVtcyhXVEZNb3ZlKGRhdGFJdGVtcykpOworICAgIG1f Y29udGV4dE1lbnVNYWMtPnNob3dDb250ZXh0TWVudVdpdGhJdGVtcyhXVEZNb3ZlKGl0ZW1zKSk7 CiB9CiAKIHZvaWQgV2ViQ29udGV4dE1lbnVMaXN0ZW5lclByb3h5OjppbnZhbGlkYXRlKCkKSW5k ZXg6IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYkNvbnRleHRNZW51TGlzdGVuZXJQcm94eS5o Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYkNvbnRleHRNZW51TGlz dGVuZXJQcm94eS5oCShyZXZpc2lvbiAyMjYzNjkpCisrKyBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9XZWJDb250ZXh0TWVudUxpc3RlbmVyUHJveHkuaAkod29ya2luZyBjb3B5KQpAQCAtNDQsNyAr NDQsNyBAQCBwdWJsaWM6CiAKICAgICB2aXJ0dWFsIH5XZWJDb250ZXh0TWVudUxpc3RlbmVyUHJv eHkoKTsKIAotICAgIHZvaWQgdXNlQ29udGV4dE1lbnVJdGVtcyhXS0FycmF5UmVmIGl0ZW1zKTsK KyAgICB2b2lkIHVzZUNvbnRleHRNZW51SXRlbXMoVmVjdG9yPFJlZjxXZWJDb250ZXh0TWVudUl0 ZW0+PiYmKTsKIAogICAgIHZvaWQgaW52YWxpZGF0ZSgpOwogcHJpdmF0ZToKSW5kZXg6IFNvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL1dlYkNvbnRleHRNZW51UHJveHkuaAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJDb250ZXh0TWVudVByb3h5LmgJKHJldmlzaW9uIDIy NjM2OSkKKysrIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYkNvbnRleHRNZW51UHJveHkuaAko d29ya2luZyBjb3B5KQpAQCAtNDEsNyArNDEsNyBAQCBwdWJsaWM6CiAKICAgICB2aXJ0dWFsIHZv aWQgc2hvdygpID0gMDsKIAotICAgIHZpcnR1YWwgdm9pZCBzaG93Q29udGV4dE1lbnVXaXRoSXRl bXMoVmVjdG9yPFdlYkNvbnRleHRNZW51SXRlbURhdGE+JiYpID0gMDsKKyAgICB2aXJ0dWFsIHZv aWQgc2hvd0NvbnRleHRNZW51V2l0aEl0ZW1zKGNvbnN0IFZlY3RvcjxSZWY8V2ViQ29udGV4dE1l bnVJdGVtPj4mKSA9IDA7CiAKIHByb3RlY3RlZDoKICAgICBXZWJDb250ZXh0TWVudVByb3h5KENv bnRleHRNZW51Q29udGV4dERhdGEmJiwgY29uc3QgVXNlckRhdGEmKTsKSW5kZXg6IFNvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL0FQSS9DL1dLQ29udGV4dE1lbnVMaXN0ZW5lci5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0MvV0tDb250ZXh0TWVudUxpc3RlbmVy LmNwcAkocmV2aXNpb24gMjI2MzY5KQorKysgU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0Mv V0tDb250ZXh0TWVudUxpc3RlbmVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjYsNyArMjYsOSBA QAogI2luY2x1ZGUgImNvbmZpZy5oIgogI2luY2x1ZGUgIldLQ29udGV4dE1lbnVMaXN0ZW5lci5o IgogCisjaW5jbHVkZSAiQVBJQXJyYXkuaCIKICNpbmNsdWRlICJXS0FQSUNhc3QuaCIKKyNpbmNs dWRlICJXZWJDb250ZXh0TWVudUl0ZW0uaCIKICNpbmNsdWRlICJXZWJDb250ZXh0TWVudUxpc3Rl bmVyUHJveHkuaCIKIAogdXNpbmcgbmFtZXNwYWNlIFdlYktpdDsKQEAgLTQwLDEwICs0MiwyMiBA QCBXS1R5cGVJRCBXS0NvbnRleHRNZW51TGlzdGVuZXJHZXRUeXBlSUQoCiAjZW5kaWYKIH0KIAot dm9pZCBXS0NvbnRleHRNZW51TGlzdGVuZXJVc2VDb250ZXh0TWVudUl0ZW1zKFdLQ29udGV4dE1l bnVMaXN0ZW5lclJlZiBsaXN0ZW5lclJlZiwgV0tBcnJheVJlZiBpdGVtcykKK3ZvaWQgV0tDb250 ZXh0TWVudUxpc3RlbmVyVXNlQ29udGV4dE1lbnVJdGVtcyhXS0NvbnRleHRNZW51TGlzdGVuZXJS ZWYgbGlzdGVuZXJSZWYsIFdLQXJyYXlSZWYgYXJyYXlSZWYpCiB7CiAjaWYgRU5BQkxFKENPTlRF WFRfTUVOVVMpCi0gICAgdG9JbXBsKGxpc3RlbmVyUmVmKS0+dXNlQ29udGV4dE1lbnVJdGVtcyhp dGVtcyk7CisgICAgUmVmUHRyPEFQSTo6QXJyYXk+IGFycmF5ID0gdG9JbXBsKGFycmF5UmVmKTsK KyAgICBzaXplX3QgbmV3U2l6ZSA9IGFycmF5ID8gYXJyYXktPnNpemUoKSA6IDA7CisgICAgVmVj dG9yPFJlZjxXZWJDb250ZXh0TWVudUl0ZW0+PiBpdGVtczsKKyAgICBpdGVtcy5yZXNlcnZlSW5p dGlhbENhcGFjaXR5KG5ld1NpemUpOworICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgbmV3U2l6 ZTsgKytpKSB7CisgICAgICAgIFdlYkNvbnRleHRNZW51SXRlbSogaXRlbSA9IGFycmF5LT5hdDxX ZWJDb250ZXh0TWVudUl0ZW0+KGkpOworICAgICAgICBpZiAoIWl0ZW0pCisgICAgICAgICAgICBj b250aW51ZTsKKyAgICAgICAgCisgICAgICAgIGl0ZW1zLnVuY2hlY2tlZEFwcGVuZCgqaXRlbSk7 CisgICAgfQorCisgICAgdG9JbXBsKGxpc3RlbmVyUmVmKS0+dXNlQ29udGV4dE1lbnVJdGVtcyhX VEZNb3ZlKGl0ZW1zKSk7CiAjZWxzZQogICAgIFVOVVNFRF9QQVJBTShsaXN0ZW5lclJlZik7CiAg ICAgVU5VU0VEX1BBUkFNKGl0ZW1zKTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2d0 ay9XZWJDb250ZXh0TWVudVByb3h5R3RrLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9ndGsvV2ViQ29udGV4dE1lbnVQcm94eUd0ay5jcHAJKHJldmlzaW9uIDIyNjM2 OSkKKysrIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2d0ay9XZWJDb250ZXh0TWVudVByb3h5R3Rr LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTc1LDcgKzE3NSw3IEBAIHZvaWQgV2ViQ29udGV4dE1l bnVQcm94eUd0azo6c2hvdygpCiAgICAgICAgICAgICAgICAgICAgZXZlbnQgPyBldmVudC0+YnV0 dG9uLmJ1dHRvbiA6IDMsIGV2ZW50ID8gZXZlbnQtPmJ1dHRvbi50aW1lIDogR0RLX0NVUlJFTlRf VElNRSk7CiB9CiAKLXZvaWQgV2ViQ29udGV4dE1lbnVQcm94eUd0azo6c2hvd0NvbnRleHRNZW51 V2l0aEl0ZW1zKFZlY3RvcjxXZWJDb250ZXh0TWVudUl0ZW1EYXRhPiYmKQordm9pZCBXZWJDb250 ZXh0TWVudVByb3h5R3RrOjpzaG93Q29udGV4dE1lbnVXaXRoSXRlbXMoY29uc3QgVmVjdG9yPFJl ZjxXZWJDb250ZXh0TWVudUl0ZW0+PiYpCiB7CiB9CiAKSW5kZXg6IFNvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL2d0ay9XZWJDb250ZXh0TWVudVByb3h5R3RrLmgKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYktpdC9VSVByb2Nlc3MvZ3RrL1dlYkNvbnRleHRNZW51UHJveHlHdGsuaAkocmV2aXNpb24g MjI2MzY5KQorKysgU291cmNlL1dlYktpdC9VSVByb2Nlc3MvZ3RrL1dlYkNvbnRleHRNZW51UHJv eHlHdGsuaAkod29ya2luZyBjb3B5KQpAQCAtNTUsNyArNTUsNyBAQCBwdWJsaWM6CiBwcml2YXRl OgogICAgIFdlYkNvbnRleHRNZW51UHJveHlHdGsoR3RrV2lkZ2V0KiwgV2ViUGFnZVByb3h5Jiwg Q29udGV4dE1lbnVDb250ZXh0RGF0YSYmLCBjb25zdCBVc2VyRGF0YSYpOwogICAgIHZvaWQgc2hv dygpIG92ZXJyaWRlOwotICAgIHZvaWQgc2hvd0NvbnRleHRNZW51V2l0aEl0ZW1zKFZlY3RvcjxX ZWJDb250ZXh0TWVudUl0ZW1EYXRhPiYmKSBvdmVycmlkZTsKKyAgICB2b2lkIHNob3dDb250ZXh0 TWVudVdpdGhJdGVtcyhjb25zdCBWZWN0b3I8UmVmPFdlYkNvbnRleHRNZW51SXRlbT4+Jikgb3Zl cnJpZGU7CiAgICAgdm9pZCBhcHBlbmQoR01lbnUqLCBjb25zdCBXZWJDb250ZXh0TWVudUl0ZW1H bGliJik7CiAgICAgR1JlZlB0cjxHTWVudT4gYnVpbGRNZW51KGNvbnN0IFZlY3RvcjxXZWJDb250 ZXh0TWVudUl0ZW1HbGliPiYpOwogICAgIHZvaWQgcG9wdWxhdGUoY29uc3QgVmVjdG9yPFJlZjxX ZWJDb250ZXh0TWVudUl0ZW0+PiYpOwpJbmRleDogU291cmNlL1dlYktpdC9VSVByb2Nlc3MvbWFj L1dlYkNvbnRleHRNZW51UHJveHlNYWMuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9tYWMvV2ViQ29udGV4dE1lbnVQcm94eU1hYy5oCShyZXZpc2lvbiAyMjYzNjkpCisr KyBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9tYWMvV2ViQ29udGV4dE1lbnVQcm94eU1hYy5oCSh3 b3JraW5nIGNvcHkpCkBAIC01NCw3ICs1NCw3IEBAIHB1YmxpYzoKICAgICB+V2ViQ29udGV4dE1l bnVQcm94eU1hYygpOwogCiAgICAgdm9pZCBjb250ZXh0TWVudUl0ZW1TZWxlY3RlZChjb25zdCBX ZWJDb250ZXh0TWVudUl0ZW1EYXRhJik7Ci0gICAgdm9pZCBzaG93Q29udGV4dE1lbnVXaXRoSXRl bXMoVmVjdG9yPFdlYkNvbnRleHRNZW51SXRlbURhdGE+JiYpIG92ZXJyaWRlOworICAgIHZvaWQg c2hvd0NvbnRleHRNZW51V2l0aEl0ZW1zKGNvbnN0IFZlY3RvcjxSZWY8V2ViQ29udGV4dE1lbnVJ dGVtPj4mKSBvdmVycmlkZTsKIAogI2lmIEVOQUJMRShTRVJWSUNFX0NPTlRST0xTKQogICAgIHZv aWQgY2xlYXJTZXJ2aWNlc01lbnUoKTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL21h Yy9XZWJDb250ZXh0TWVudVByb3h5TWFjLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL21hYy9XZWJDb250ZXh0TWVudVByb3h5TWFjLm1tCShyZXZpc2lvbiAyMjYzNjkp CisrKyBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9tYWMvV2ViQ29udGV4dE1lbnVQcm94eU1hYy5t bQkod29ya2luZyBjb3B5KQpAQCAtNDUxLDkgKzQ1MSwxNCBAQCBSZXRhaW5QdHI8TlNNZW51SXRl bT4gV2ViQ29udGV4dE1lbnVQcm94CiAgICAgfQogfQogCi12b2lkIFdlYkNvbnRleHRNZW51UHJv eHlNYWM6OnNob3dDb250ZXh0TWVudVdpdGhJdGVtcyhWZWN0b3I8V2ViQ29udGV4dE1lbnVJdGVt RGF0YT4mJiBpdGVtcykKK3ZvaWQgV2ViQ29udGV4dE1lbnVQcm94eU1hYzo6c2hvd0NvbnRleHRN ZW51V2l0aEl0ZW1zKGNvbnN0IFZlY3RvcjxSZWY8V2ViQ29udGV4dE1lbnVJdGVtPj4mIGl0ZW1z KQogewotICAgIGF1dG8gbWVudSA9IGNyZWF0ZUNvbnRleHRNZW51RnJvbUl0ZW1zKGl0ZW1zKTsK KyAgICBWZWN0b3I8V2ViQ29udGV4dE1lbnVJdGVtRGF0YT4gZGF0YTsKKyAgICBkYXRhLnJlc2Vy dmVJbml0aWFsQ2FwYWNpdHkoaXRlbXMuc2l6ZSgpKTsKKyAgICBmb3IgKGF1dG8mIGl0ZW0gOiBp dGVtcykKKyAgICAgICAgZGF0YS51bmNoZWNrZWRBcHBlbmQoaXRlbS0+ZGF0YSgpKTsKKyAgICAK KyAgICBhdXRvIG1lbnUgPSBjcmVhdGVDb250ZXh0TWVudUZyb21JdGVtcyhkYXRhKTsKICAgICBb W1dLTWVudVRhcmdldCBzaGFyZWRNZW51VGFyZ2V0XSBzZXRNZW51UHJveHk6dGhpc107CiAgICAg bV9tZW51ID0gbV9wYWdlLmNvbnRleHRNZW51Q2xpZW50KCkubWVudUZyb21Qcm9wb3NlZE1lbnUo bV9wYWdlLCBtZW51LmdldCgpLCBtX2NvbnRleHQud2ViSGl0VGVzdFJlc3VsdERhdGEoKSwgbV91 c2VyRGF0YS5vYmplY3QoKSk7CiAKQEAgLTQ5MywxNCArNDk4LDEyIEBAIHZvaWQgV2ViQ29udGV4 dE1lbnVQcm94eU1hYzo6c2hvd0NvbnRleHQKICAgICBpZiAobV9wYWdlLmNvbnRleHRNZW51Q2xp ZW50KCkuc2hvd0NvbnRleHRNZW51KG1fcGFnZSwgbV9jb250ZXh0Lm1lbnVMb2NhdGlvbigpLCB1 c2VQcm9wb3NlZEl0ZW1zID8gcHJvcG9zZWRBUElJdGVtcyA6IGNsaWVudEl0ZW1zKSkKICAgICAg ICAgcmV0dXJuOwogCi0gICAgVmVjdG9yPFdlYkNvbnRleHRNZW51SXRlbURhdGE+IGl0ZW1zOwot ICAgIGZvciAoYXV0byYgaXRlbSA6ICh1c2VQcm9wb3NlZEl0ZW1zID8gcHJvcG9zZWRBUElJdGVt cyA6IGNsaWVudEl0ZW1zKSkKLSAgICAgICAgaXRlbXMuYXBwZW5kKGl0ZW0tPmRhdGEoKSk7Ci0K KyAgICBhdXRvJiYgaXRlbXMgPSBXVEZNb3ZlKHVzZVByb3Bvc2VkSXRlbXMgPyBwcm9wb3NlZEFQ SUl0ZW1zIDogY2xpZW50SXRlbXMpOworICAgIAogICAgIGlmIChpdGVtcy5pc0VtcHR5KCkpCiAg ICAgICAgIHJldHVybjsKIAotICAgIHNob3dDb250ZXh0TWVudVdpdGhJdGVtcyhXVEZNb3ZlKGl0 ZW1zKSk7CisgICAgc2hvd0NvbnRleHRNZW51V2l0aEl0ZW1zKGl0ZW1zKTsKIH0KIAogTlNXaW5k b3cgKldlYkNvbnRleHRNZW51UHJveHlNYWM6OndpbmRvdygpIGNvbnN0Cg== 330767 2018-01-08 17:40:04 -0800 2018-01-08 17:40:20 -0800 Patch bug-181419-20180108174003.patch text/plain 9361 achristensen SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyMjY2MDEpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI0IEBACisyMDE4LTAxLTA4ICBBbGV4IENocmlz dGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUGFzcyBhcm91bmQg VmVjdG9yPFJlZjxXZWJDb250ZXh0TWVudUl0ZW0+PiBpbnN0ZWFkIG9mIFdLQXJyYXlSZWYgb3Ig VmVjdG9yPFdlYkNvbnRleHRNZW51SXRlbURhdGE+CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODE0MTkKKworICAgICAgICBSZXZpZXdlZCBieSBUaW0g SG9ydG9uLgorCisgICAgICAgIFBhc3NpbmcgYSBXS0FycmF5UmVmIHRvIGFuIEFQSSBvYmplY3Qg aXMgbWVzc3kgYW5kIHdhcyBwcmV2ZW50aW5nIG1lIGZyb20gbW92aW5nIHRoaW5ncyBhcm91bmQg YW5kIG1ha2luZyBPYmpDIFNQSS4KKyAgICAgICAgTm8gY2hhbmdlIGluIGJlaGF2aW9yLiAgSnVz dCB1c2luZyBkaWZmZXJlbnQgbGF5ZXJpbmcgYWJzdHJhY3Rpb25zIGZvciB0aGUgc2FtZSBkYXRh LgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9DL1dLQ29udGV4dE1lbnVMaXN0ZW5lci5jcHA6 CisgICAgICAgIChXS0NvbnRleHRNZW51TGlzdGVuZXJVc2VDb250ZXh0TWVudUl0ZW1zKToKKyAg ICAgICAgKiBVSVByb2Nlc3MvV2ViQ29udGV4dE1lbnVMaXN0ZW5lclByb3h5LmNwcDoKKyAgICAg ICAgKFdlYktpdDo6V2ViQ29udGV4dE1lbnVMaXN0ZW5lclByb3h5Ojp1c2VDb250ZXh0TWVudUl0 ZW1zKToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViQ29udGV4dE1lbnVMaXN0ZW5lclByb3h5Lmg6 CisgICAgICAgICogVUlQcm9jZXNzL1dlYkNvbnRleHRNZW51UHJveHkuaDoKKyAgICAgICAgKiBV SVByb2Nlc3MvbWFjL1dlYkNvbnRleHRNZW51UHJveHlNYWMuaDoKKyAgICAgICAgKiBVSVByb2Nl c3MvbWFjL1dlYkNvbnRleHRNZW51UHJveHlNYWMubW06CisgICAgICAgIChXZWJLaXQ6OldlYkNv bnRleHRNZW51UHJveHlNYWM6OnNob3dDb250ZXh0TWVudVdpdGhJdGVtcyk6CisgICAgICAgIChX ZWJLaXQ6OldlYkNvbnRleHRNZW51UHJveHlNYWM6OnNob3dDb250ZXh0TWVudSk6CisKIDIwMTgt MDEtMDggIEpvaG4gV2lsYW5kZXIgIDx3aWxhbmRlckBhcHBsZS5jb20+CiAKICAgICAgICAgU3Rv cmFnZSBBY2Nlc3MgQVBJOiBSZW1vdmUgYWNjZXNzIGZvciBhbGwgZnJhbWVzIHVuZGVyIGEgcGFn ZSB3aGVuIHRoZSBwYWdlIGlzIGNsb3NlZApJbmRleDogU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv V2ViQ29udGV4dE1lbnVMaXN0ZW5lclByb3h5LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9XZWJDb250ZXh0TWVudUxpc3RlbmVyUHJveHkuY3BwCShyZXZpc2lvbiAy MjYzNjkpCisrKyBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJDb250ZXh0TWVudUxpc3RlbmVy UHJveHkuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00NywyNCArNDcsMTIgQEAgV2ViQ29udGV4dE1l bnVMaXN0ZW5lclByb3h5Ojp+V2ViQ29udGV4dAogewogfQogCi12b2lkIFdlYkNvbnRleHRNZW51 TGlzdGVuZXJQcm94eTo6dXNlQ29udGV4dE1lbnVJdGVtcyhXS0FycmF5UmVmIGl0ZW1zKQordm9p ZCBXZWJDb250ZXh0TWVudUxpc3RlbmVyUHJveHk6OnVzZUNvbnRleHRNZW51SXRlbXMoVmVjdG9y PFJlZjxXZWJDb250ZXh0TWVudUl0ZW0+PiYmIGl0ZW1zKQogewogICAgIGlmICghbV9jb250ZXh0 TWVudU1hYykKICAgICAgICAgcmV0dXJuOwogCi0gICAgUmVmUHRyPEFQSTo6QXJyYXk+IGFycmF5 ID0gdG9JbXBsKGl0ZW1zKTsKLSAgICBzaXplX3QgbmV3U2l6ZSA9IGFycmF5ID8gYXJyYXktPnNp emUoKSA6IDA7Ci0gICAgVmVjdG9yPFdlYkNvbnRleHRNZW51SXRlbURhdGE+IGRhdGFJdGVtczsK LSAgICBkYXRhSXRlbXMucmVzZXJ2ZUluaXRpYWxDYXBhY2l0eShuZXdTaXplKTsKLSAgICBmb3Ig KHNpemVfdCBpID0gMDsgaSA8IG5ld1NpemU7ICsraSkgewotICAgICAgICBXZWJDb250ZXh0TWVu dUl0ZW0qIGl0ZW0gPSBhcnJheS0+YXQ8V2ViQ29udGV4dE1lbnVJdGVtPihpKTsKLSAgICAgICAg aWYgKCFpdGVtKQotICAgICAgICAgICAgY29udGludWU7Ci0KLSAgICAgICAgZGF0YUl0ZW1zLnVu Y2hlY2tlZEFwcGVuZChpdGVtLT5kYXRhKCkpOwotICAgIH0KLQotICAgIG1fY29udGV4dE1lbnVN YWMtPnNob3dDb250ZXh0TWVudVdpdGhJdGVtcyhXVEZNb3ZlKGRhdGFJdGVtcykpOworICAgIG1f Y29udGV4dE1lbnVNYWMtPnNob3dDb250ZXh0TWVudVdpdGhJdGVtcyhXVEZNb3ZlKGl0ZW1zKSk7 CiB9CiAKIHZvaWQgV2ViQ29udGV4dE1lbnVMaXN0ZW5lclByb3h5OjppbnZhbGlkYXRlKCkKSW5k ZXg6IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYkNvbnRleHRNZW51TGlzdGVuZXJQcm94eS5o Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYkNvbnRleHRNZW51TGlz dGVuZXJQcm94eS5oCShyZXZpc2lvbiAyMjYzNjkpCisrKyBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9XZWJDb250ZXh0TWVudUxpc3RlbmVyUHJveHkuaAkod29ya2luZyBjb3B5KQpAQCAtNDQsNyAr NDQsNyBAQCBwdWJsaWM6CiAKICAgICB2aXJ0dWFsIH5XZWJDb250ZXh0TWVudUxpc3RlbmVyUHJv eHkoKTsKIAotICAgIHZvaWQgdXNlQ29udGV4dE1lbnVJdGVtcyhXS0FycmF5UmVmIGl0ZW1zKTsK KyAgICB2b2lkIHVzZUNvbnRleHRNZW51SXRlbXMoVmVjdG9yPFJlZjxXZWJDb250ZXh0TWVudUl0 ZW0+PiYmKTsKIAogICAgIHZvaWQgaW52YWxpZGF0ZSgpOwogcHJpdmF0ZToKSW5kZXg6IFNvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL1dlYkNvbnRleHRNZW51UHJveHkuaAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJDb250ZXh0TWVudVByb3h5LmgJKHJldmlzaW9uIDIy NjM2OSkKKysrIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYkNvbnRleHRNZW51UHJveHkuaAko d29ya2luZyBjb3B5KQpAQCAtNDEsNyArNDEsNyBAQCBwdWJsaWM6CiAKICAgICB2aXJ0dWFsIHZv aWQgc2hvdygpID0gMDsKIAotICAgIHZpcnR1YWwgdm9pZCBzaG93Q29udGV4dE1lbnVXaXRoSXRl bXMoVmVjdG9yPFdlYkNvbnRleHRNZW51SXRlbURhdGE+JiYpID0gMDsKKyAgICB2aXJ0dWFsIHZv aWQgc2hvd0NvbnRleHRNZW51V2l0aEl0ZW1zKGNvbnN0IFZlY3RvcjxSZWY8V2ViQ29udGV4dE1l bnVJdGVtPj4mKSA9IDA7CiAKIHByb3RlY3RlZDoKICAgICBXZWJDb250ZXh0TWVudVByb3h5KENv bnRleHRNZW51Q29udGV4dERhdGEmJiwgY29uc3QgVXNlckRhdGEmKTsKSW5kZXg6IFNvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL0FQSS9DL1dLQ29udGV4dE1lbnVMaXN0ZW5lci5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0MvV0tDb250ZXh0TWVudUxpc3RlbmVy LmNwcAkocmV2aXNpb24gMjI2MzY5KQorKysgU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0Mv V0tDb250ZXh0TWVudUxpc3RlbmVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjYsNyArMjYsOSBA QAogI2luY2x1ZGUgImNvbmZpZy5oIgogI2luY2x1ZGUgIldLQ29udGV4dE1lbnVMaXN0ZW5lci5o IgogCisjaW5jbHVkZSAiQVBJQXJyYXkuaCIKICNpbmNsdWRlICJXS0FQSUNhc3QuaCIKKyNpbmNs dWRlICJXZWJDb250ZXh0TWVudUl0ZW0uaCIKICNpbmNsdWRlICJXZWJDb250ZXh0TWVudUxpc3Rl bmVyUHJveHkuaCIKIAogdXNpbmcgbmFtZXNwYWNlIFdlYktpdDsKQEAgLTQwLDEwICs0MiwyMiBA QCBXS1R5cGVJRCBXS0NvbnRleHRNZW51TGlzdGVuZXJHZXRUeXBlSUQoCiAjZW5kaWYKIH0KIAot dm9pZCBXS0NvbnRleHRNZW51TGlzdGVuZXJVc2VDb250ZXh0TWVudUl0ZW1zKFdLQ29udGV4dE1l bnVMaXN0ZW5lclJlZiBsaXN0ZW5lclJlZiwgV0tBcnJheVJlZiBpdGVtcykKK3ZvaWQgV0tDb250 ZXh0TWVudUxpc3RlbmVyVXNlQ29udGV4dE1lbnVJdGVtcyhXS0NvbnRleHRNZW51TGlzdGVuZXJS ZWYgbGlzdGVuZXJSZWYsIFdLQXJyYXlSZWYgYXJyYXlSZWYpCiB7CiAjaWYgRU5BQkxFKENPTlRF WFRfTUVOVVMpCi0gICAgdG9JbXBsKGxpc3RlbmVyUmVmKS0+dXNlQ29udGV4dE1lbnVJdGVtcyhp dGVtcyk7CisgICAgUmVmUHRyPEFQSTo6QXJyYXk+IGFycmF5ID0gdG9JbXBsKGFycmF5UmVmKTsK KyAgICBzaXplX3QgbmV3U2l6ZSA9IGFycmF5ID8gYXJyYXktPnNpemUoKSA6IDA7CisgICAgVmVj dG9yPFJlZjxXZWJDb250ZXh0TWVudUl0ZW0+PiBpdGVtczsKKyAgICBpdGVtcy5yZXNlcnZlSW5p dGlhbENhcGFjaXR5KG5ld1NpemUpOworICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgbmV3U2l6 ZTsgKytpKSB7CisgICAgICAgIFdlYkNvbnRleHRNZW51SXRlbSogaXRlbSA9IGFycmF5LT5hdDxX ZWJDb250ZXh0TWVudUl0ZW0+KGkpOworICAgICAgICBpZiAoIWl0ZW0pCisgICAgICAgICAgICBj b250aW51ZTsKKyAgICAgICAgCisgICAgICAgIGl0ZW1zLnVuY2hlY2tlZEFwcGVuZCgqaXRlbSk7 CisgICAgfQorCisgICAgdG9JbXBsKGxpc3RlbmVyUmVmKS0+dXNlQ29udGV4dE1lbnVJdGVtcyhX VEZNb3ZlKGl0ZW1zKSk7CiAjZWxzZQogICAgIFVOVVNFRF9QQVJBTShsaXN0ZW5lclJlZik7CiAg ICAgVU5VU0VEX1BBUkFNKGl0ZW1zKTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2d0 ay9XZWJDb250ZXh0TWVudVByb3h5R3RrLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9ndGsvV2ViQ29udGV4dE1lbnVQcm94eUd0ay5jcHAJKHJldmlzaW9uIDIyNjM2 OSkKKysrIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2d0ay9XZWJDb250ZXh0TWVudVByb3h5R3Rr LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTc1LDcgKzE3NSw3IEBAIHZvaWQgV2ViQ29udGV4dE1l bnVQcm94eUd0azo6c2hvdygpCiAgICAgICAgICAgICAgICAgICAgZXZlbnQgPyBldmVudC0+YnV0 dG9uLmJ1dHRvbiA6IDMsIGV2ZW50ID8gZXZlbnQtPmJ1dHRvbi50aW1lIDogR0RLX0NVUlJFTlRf VElNRSk7CiB9CiAKLXZvaWQgV2ViQ29udGV4dE1lbnVQcm94eUd0azo6c2hvd0NvbnRleHRNZW51 V2l0aEl0ZW1zKFZlY3RvcjxXZWJDb250ZXh0TWVudUl0ZW1EYXRhPiYmKQordm9pZCBXZWJDb250 ZXh0TWVudVByb3h5R3RrOjpzaG93Q29udGV4dE1lbnVXaXRoSXRlbXMoY29uc3QgVmVjdG9yPFJl ZjxXZWJDb250ZXh0TWVudUl0ZW0+PiYpCiB7CiB9CiAKSW5kZXg6IFNvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL2d0ay9XZWJDb250ZXh0TWVudVByb3h5R3RrLmgKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYktpdC9VSVByb2Nlc3MvZ3RrL1dlYkNvbnRleHRNZW51UHJveHlHdGsuaAkocmV2aXNpb24g MjI2MzY5KQorKysgU291cmNlL1dlYktpdC9VSVByb2Nlc3MvZ3RrL1dlYkNvbnRleHRNZW51UHJv eHlHdGsuaAkod29ya2luZyBjb3B5KQpAQCAtNTUsNyArNTUsNyBAQCBwdWJsaWM6CiBwcml2YXRl OgogICAgIFdlYkNvbnRleHRNZW51UHJveHlHdGsoR3RrV2lkZ2V0KiwgV2ViUGFnZVByb3h5Jiwg Q29udGV4dE1lbnVDb250ZXh0RGF0YSYmLCBjb25zdCBVc2VyRGF0YSYpOwogICAgIHZvaWQgc2hv dygpIG92ZXJyaWRlOwotICAgIHZvaWQgc2hvd0NvbnRleHRNZW51V2l0aEl0ZW1zKFZlY3RvcjxX ZWJDb250ZXh0TWVudUl0ZW1EYXRhPiYmKSBvdmVycmlkZTsKKyAgICB2b2lkIHNob3dDb250ZXh0 TWVudVdpdGhJdGVtcyhjb25zdCBWZWN0b3I8UmVmPFdlYkNvbnRleHRNZW51SXRlbT4+Jikgb3Zl cnJpZGU7CiAgICAgdm9pZCBhcHBlbmQoR01lbnUqLCBjb25zdCBXZWJDb250ZXh0TWVudUl0ZW1H bGliJik7CiAgICAgR1JlZlB0cjxHTWVudT4gYnVpbGRNZW51KGNvbnN0IFZlY3RvcjxXZWJDb250 ZXh0TWVudUl0ZW1HbGliPiYpOwogICAgIHZvaWQgcG9wdWxhdGUoY29uc3QgVmVjdG9yPFJlZjxX ZWJDb250ZXh0TWVudUl0ZW0+PiYpOwpJbmRleDogU291cmNlL1dlYktpdC9VSVByb2Nlc3MvbWFj L1dlYkNvbnRleHRNZW51UHJveHlNYWMuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9tYWMvV2ViQ29udGV4dE1lbnVQcm94eU1hYy5oCShyZXZpc2lvbiAyMjYzNjkpCisr KyBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9tYWMvV2ViQ29udGV4dE1lbnVQcm94eU1hYy5oCSh3 b3JraW5nIGNvcHkpCkBAIC01NCw3ICs1NCw3IEBAIHB1YmxpYzoKICAgICB+V2ViQ29udGV4dE1l bnVQcm94eU1hYygpOwogCiAgICAgdm9pZCBjb250ZXh0TWVudUl0ZW1TZWxlY3RlZChjb25zdCBX ZWJDb250ZXh0TWVudUl0ZW1EYXRhJik7Ci0gICAgdm9pZCBzaG93Q29udGV4dE1lbnVXaXRoSXRl bXMoVmVjdG9yPFdlYkNvbnRleHRNZW51SXRlbURhdGE+JiYpIG92ZXJyaWRlOworICAgIHZvaWQg c2hvd0NvbnRleHRNZW51V2l0aEl0ZW1zKGNvbnN0IFZlY3RvcjxSZWY8V2ViQ29udGV4dE1lbnVJ dGVtPj4mKSBvdmVycmlkZTsKIAogI2lmIEVOQUJMRShTRVJWSUNFX0NPTlRST0xTKQogICAgIHZv aWQgY2xlYXJTZXJ2aWNlc01lbnUoKTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL21h Yy9XZWJDb250ZXh0TWVudVByb3h5TWFjLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL21hYy9XZWJDb250ZXh0TWVudVByb3h5TWFjLm1tCShyZXZpc2lvbiAyMjYzNjkp CisrKyBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9tYWMvV2ViQ29udGV4dE1lbnVQcm94eU1hYy5t bQkod29ya2luZyBjb3B5KQpAQCAtNDUxLDkgKzQ1MSwxNCBAQCBSZXRhaW5QdHI8TlNNZW51SXRl bT4gV2ViQ29udGV4dE1lbnVQcm94CiAgICAgfQogfQogCi12b2lkIFdlYkNvbnRleHRNZW51UHJv eHlNYWM6OnNob3dDb250ZXh0TWVudVdpdGhJdGVtcyhWZWN0b3I8V2ViQ29udGV4dE1lbnVJdGVt RGF0YT4mJiBpdGVtcykKK3ZvaWQgV2ViQ29udGV4dE1lbnVQcm94eU1hYzo6c2hvd0NvbnRleHRN ZW51V2l0aEl0ZW1zKGNvbnN0IFZlY3RvcjxSZWY8V2ViQ29udGV4dE1lbnVJdGVtPj4mIGl0ZW1z KQogewotICAgIGF1dG8gbWVudSA9IGNyZWF0ZUNvbnRleHRNZW51RnJvbUl0ZW1zKGl0ZW1zKTsK KyAgICBWZWN0b3I8V2ViQ29udGV4dE1lbnVJdGVtRGF0YT4gZGF0YTsKKyAgICBkYXRhLnJlc2Vy dmVJbml0aWFsQ2FwYWNpdHkoaXRlbXMuc2l6ZSgpKTsKKyAgICBmb3IgKGF1dG8mIGl0ZW0gOiBp dGVtcykKKyAgICAgICAgZGF0YS51bmNoZWNrZWRBcHBlbmQoaXRlbS0+ZGF0YSgpKTsKKyAgICAK KyAgICBhdXRvIG1lbnUgPSBjcmVhdGVDb250ZXh0TWVudUZyb21JdGVtcyhkYXRhKTsKICAgICBb W1dLTWVudVRhcmdldCBzaGFyZWRNZW51VGFyZ2V0XSBzZXRNZW51UHJveHk6dGhpc107CiAgICAg bV9tZW51ID0gbV9wYWdlLmNvbnRleHRNZW51Q2xpZW50KCkubWVudUZyb21Qcm9wb3NlZE1lbnUo bV9wYWdlLCBtZW51LmdldCgpLCBtX2NvbnRleHQud2ViSGl0VGVzdFJlc3VsdERhdGEoKSwgbV91 c2VyRGF0YS5vYmplY3QoKSk7CiAKQEAgLTQ5MywxNCArNDk4LDEyIEBAIHZvaWQgV2ViQ29udGV4 dE1lbnVQcm94eU1hYzo6c2hvd0NvbnRleHQKICAgICBpZiAobV9wYWdlLmNvbnRleHRNZW51Q2xp ZW50KCkuc2hvd0NvbnRleHRNZW51KG1fcGFnZSwgbV9jb250ZXh0Lm1lbnVMb2NhdGlvbigpLCB1 c2VQcm9wb3NlZEl0ZW1zID8gcHJvcG9zZWRBUElJdGVtcyA6IGNsaWVudEl0ZW1zKSkKICAgICAg ICAgcmV0dXJuOwogCi0gICAgVmVjdG9yPFdlYkNvbnRleHRNZW51SXRlbURhdGE+IGl0ZW1zOwot ICAgIGZvciAoYXV0byYgaXRlbSA6ICh1c2VQcm9wb3NlZEl0ZW1zID8gcHJvcG9zZWRBUElJdGVt cyA6IGNsaWVudEl0ZW1zKSkKLSAgICAgICAgaXRlbXMuYXBwZW5kKGl0ZW0tPmRhdGEoKSk7Ci0K KyAgICBhdXRvJiYgaXRlbXMgPSBXVEZNb3ZlKHVzZVByb3Bvc2VkSXRlbXMgPyBwcm9wb3NlZEFQ SUl0ZW1zIDogY2xpZW50SXRlbXMpOworICAgIAogICAgIGlmIChpdGVtcy5pc0VtcHR5KCkpCiAg ICAgICAgIHJldHVybjsKIAotICAgIHNob3dDb250ZXh0TWVudVdpdGhJdGVtcyhXVEZNb3ZlKGl0 ZW1zKSk7CisgICAgc2hvd0NvbnRleHRNZW51V2l0aEl0ZW1zKGl0ZW1zKTsKIH0KIAogTlNXaW5k b3cgKldlYkNvbnRleHRNZW51UHJveHlNYWM6OndpbmRvdygpIGNvbnN0CkluZGV4OiBTb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy93cGUvV2ViQ29udGV4dE1lbnVQcm94eVdQRS5oCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL3dwZS9XZWJDb250ZXh0TWVudVByb3h5V1BFLmgJ KHJldmlzaW9uIDIyNjM2OSkKKysrIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL3dwZS9XZWJDb250 ZXh0TWVudVByb3h5V1BFLmgJKHdvcmtpbmcgY29weSkKQEAgLTM2LDcgKzM2LDcgQEAgcHVibGlj OgogICAgICAgICByZXR1cm4gYWRvcHRSZWYoKm5ldyBXZWJDb250ZXh0TWVudVByb3h5V1BFKFdU Rk1vdmUoY29udGV4dCksIHVzZXJEYXRhKSk7CiAgICAgfQogCi0gICAgdm9pZCBzaG93Q29udGV4 dE1lbnVXaXRoSXRlbXMoVmVjdG9yPFdlYkNvbnRleHRNZW51SXRlbURhdGE+JiYpIGZpbmFsIHsg fQorICAgIHZvaWQgc2hvd0NvbnRleHRNZW51V2l0aEl0ZW1zKGNvbnN0IFZlY3RvcjxSZWY8V2Vi Q29udGV4dE1lbnVJdGVtPj4mKSBmaW5hbCB7IH0KICAgICB2b2lkIHNob3coKSBmaW5hbCB7IH07 CiAKIHByaXZhdGU6Cg==