147708 2015-08-05 17:07:32 -0700 PDFPlugins are clipped in link previews (and remain so when opened) 2015-08-05 18:07:19 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 thorton thorton andersca commit-queue sam simon.fraser oldest_to_newest 1115193 0 thorton 2015-08-05 17:07:32 -0700 PDFPlugins are clipped in link previews (and remain so when opened) 1115195 1 258324 thorton 2015-08-05 17:08:45 -0700 Created attachment 258324 Patch 1115196 2 258325 thorton 2015-08-05 17:09:29 -0700 Created attachment 258325 Patch 1115197 3 thorton 2015-08-05 17:10:05 -0700 I fully recognize how horrifying this patch is and apologize in advance :( 1115198 4 commit-queue 2015-08-05 17:11:09 -0700 Attachment 258325 did not pass style-queue: ERROR: Source/WebKit2/UIProcess/API/mac/WKView.mm:4346: The parameter name "!" adds no information, so it should be removed. [readability/parameter_name] [5] ERROR: Source/WebKit2/UIProcess/API/mac/WKView.mm:4375: The parameter name "!" adds no information, so it should be removed. [readability/parameter_name] [5] Total errors found: 2 in 11 files If any of these errors are false positives, please file a bug against check-webkit-style. 1115200 5 258325 simon.fraser 2015-08-05 17:23:15 -0700 Comment on attachment 258325 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=258325&action=review > Source/WebKit2/UIProcess/WebFrameProxy.h:138 > + bool m_containsPluginDocument; I don't see this getting initialized. > Source/WebKit2/WebProcess/WebPage/WebPage.cpp:1424 > + m_page->setPageScaleFactor(1, origin); > + for (auto* pluginView : m_pluginViews) > + pluginView->pageScaleFactorDidChange(); Won't Page::setPageScaleFactor() do the pageScaleFactorDidChange() on every widget? 1115205 6 thorton 2015-08-05 18:05:17 -0700 (In reply to comment #5) > Comment on attachment 258325 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=258325&action=review > > > Source/WebKit2/UIProcess/WebFrameProxy.h:138 > > + bool m_containsPluginDocument; > > I don't see this getting initialized. Good catch. > > Source/WebKit2/WebProcess/WebPage/WebPage.cpp:1424 > > + m_page->setPageScaleFactor(1, origin); > > + for (auto* pluginView : m_pluginViews) > > + pluginView->pageScaleFactorDidChange(); > > Won't Page::setPageScaleFactor() do the pageScaleFactorDidChange() on every > widget? No. Widget doesn't even have such a thing. 1115209 7 thorton 2015-08-05 18:07:19 -0700 http://trac.webkit.org/changeset/188011 258324 2015-08-05 17:08:45 -0700 2015-08-05 17:09:27 -0700 Patch bug-147708-20150805170836.patch text/plain 17353 thorton U3VidmVyc2lvbiBSZXZpc2lvbjogMTg3OTg3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggNTY0Yjk2MjI2NjdhYzdj OGJmODg5ZGQxOTNhMGU5ZGJiNDlmYTZjNC4uN2UxZTE5NzhhZTdlYTI3YmI0MzU4Zjk0MWUxYmVl NzY3MWQ3YTI4ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ4IEBACisyMDE1LTA4LTA1ICBUaW0g SG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgorCisgICAgICAgIFBERlBsdWdpbnMg YXJlIGNsaXBwZWQgaW4gbGluayBwcmV2aWV3cyAoYW5kIHJlbWFpbiBzbyB3aGVuIG9wZW5lZCkK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0NzcwOAor ICAgICAgICA8cmRhcjovL3Byb2JsZW0vMjIwNTUxMzA+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL21hYy9XS1ZpZXcubW06 CisgICAgICAgICgtW1dLVmlldyBpbml0V2l0aEZyYW1lOnByb2Nlc3NQb29sOmNvbmZpZ3VyYXRp b246d2ViVmlldzpdKToKKyAgICAgICAgKC1bV0tWaWV3IF9zdXBwb3J0c0FyYml0cmFyeUxheW91 dE1vZGVzXSk6CisgICAgICAgICgtW1dLVmlldyBfZGlkQ29tbWl0TG9hZEZvck1haW5GcmFtZV0p OgorICAgICAgICAoLVtXS1ZpZXcgX3NldExheW91dE1vZGU6XSk6CisgICAgICAgICgtW1dLVmll dyBfc2V0Vmlld1NjYWxlOl0pOgorICAgICAgICBBdm9pZCB1c2luZyBhbnkgbGF5b3V0IG1vZGUg b3RoZXIgdGhhbiAiVmlld1NpemUiIGZvciBtYWluIGZyYW1lIFBsdWdpbkRvY3VtZW50cywKKyAg ICAgICAgYmVjYXVzZSB0aGV5IHdpbGwgb2Z0ZW4gZW5kIHVwIGJlaGF2aW5nIGluY29ycmVjdGx5 IChlc3BlY2lhbGx5IHdpdGggUERGUGx1Z2luLAorICAgICAgICB3aGljaCBpcyBldmVuIG1vcmUg c3BlY2lhbCBpbiB0aGF0IGl0IHRha2VzIG92ZXIgYXBwbGljYXRpb24gb2YgcGFnZSBzY2FsZSku CisKKyAgICAgICAgU2F2ZSBhbnkgaW5jb21pbmcgY2hhbmdlcyB0byB0aGUgdmlld1NjYWxlIGFu ZCBsYXlvdXRNb2RlLCBhbmQgcmUtYXBwbHkKKyAgICAgICAgdGhlbSBvbmNlIHdlIGxvYWQgc29t ZXRoaW5nIGluIHRoZSBtYWluIGZyYW1lIHRoYXQgaXMgKm5vdCogYSBQbHVnaW5Eb2N1bWVudC4K KworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvbWFjL1dLVmlld0ludGVybmFsLmg6CisgICAgICAg ICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQ YWdlOjpzY2FsZVBhZ2UpOgorICAgICAgICBNYWtlIHN1cmUgdG8gcmVzZXQgV2ViQ29yZSdzIHBh Z2Ugc2NhbGUgaWYgdGhlIG1haW4gZnJhbWUgY29udGFpbnMgYSAKKyAgICAgICAgUGx1Z2luRG9j dW1lbnQgdGhhdCB0YWtlcyBjYXJlIG9mIHBhZ2Ugc2NhbGUgaXRzZWxmLgorCisgICAgICAgIChX ZWJLaXQ6OldlYlBhZ2U6OmRpZENvbW1pdExvYWQpOgorICAgICAgICBEbyB0aGUgc2FtZSB0aGlu ZyBhcyB3aGF0IHdlIGRvIGluIFdLVmlldyBfZGlkQ29tbWl0TG9hZEZvck1haW5GcmFtZSwKKyAg ICAgICAgYnV0IHdpdGhvdXQgdGhlIFVJIHByb2Nlc3Mgcm91bmQtdHJpcCwgdG8gYXZvaWQgYW4g dWdseSBmbGFzaC4KKworICAgICAgICAqIFVJUHJvY2Vzcy9XZWJGcmFtZVByb3h5LmNwcDoKKyAg ICAgICAgKFdlYktpdDo6V2ViRnJhbWVQcm94eTo6ZGlkQ29tbWl0TG9hZCk6CisgICAgICAgICog VUlQcm9jZXNzL1dlYkZyYW1lUHJveHkuaDoKKyAgICAgICAgKFdlYktpdDo6V2ViRnJhbWVQcm94 eTo6Y29udGFpbnNQbHVnaW5Eb2N1bWVudCk6CisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQ cm94eS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6ZGlkQ29tbWl0TG9hZEZv ckZyYW1lKToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5Lmg6CisgICAgICAgICog VUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5tZXNzYWdlcy5pbjoKKyAgICAgICAgKiBVSVByb2Nlc3Mv bWFjL1BhZ2VDbGllbnRJbXBsLm1tOgorICAgICAgICAoV2ViS2l0OjpQYWdlQ2xpZW50SW1wbDo6 ZGlkQ29tbWl0TG9hZEZvck1haW5GcmFtZSk6CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJDb3Jl U3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYkZy YW1lTG9hZGVyQ2xpZW50OjpkaXNwYXRjaERpZENvbW1pdExvYWQpOgorICAgICAgICBQbHVtYiBh bmQga2VlcCB0cmFjayBvZiB3aGV0aGVyIHRoZSBtYWluIGZyYW1lIGNvbnRhaW5zIGEgUGx1Z2lu RG9jdW1lbnQgb3Igbm90LgorCiAyMDE1LTA4LTA1ICBSeW9zdWtlIE5pd2EgIDxybml3YUB3ZWJr aXQub3JnPgogCiAgICAgICAgIFdlYkluc3BlY3RvclByb3h5IHNob3VsZCBtYWtlIFdLV2ViVmll dyBmaXJzdCByZXNwb25kZXIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9B UEkvbWFjL1dLVmlldy5tbSBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvbWFjL1dLVmll dy5tbQppbmRleCA0ZWY3YTU4ODk1Njg5NDI5Y2ZhZjMxMTc4YjBjZDJkNDZmNTIxMmFjLi5kM2E3 NzI2NzI4NWFmYzgzZTQ2OGE1NTRlM2E3NDcyNjdhYmZmYTIwIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvQVBJL21hYy9XS1ZpZXcubW0KKysrIGIvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9tYWMvV0tWaWV3Lm1tCkBAIC0yNjQsNiArMjY0LDggQEAgc3RydWN0IFdL Vmlld0ludGVycHJldEtleUV2ZW50c1BhcmFtZXRlcnMgewogICAgIEJPT0wgX2FsbG93c0xpbmtQ cmV2aWV3OwogCiAgICAgUmV0YWluUHRyPFdLVmlld0xheW91dFN0cmF0ZWd5PiBfbGF5b3V0U3Ry YXRlZ3k7CisgICAgV0tMYXlvdXRNb2RlIF9sYXN0UmVxdWVzdGVkTGF5b3V0TW9kZTsKKyAgICBm bG9hdCBfbGFzdFJlcXVlc3RlZFZpZXdTY2FsZTsKICAgICBDR1NpemUgX21pbmltdW1WaWV3U2l6 ZTsKIAogICAgIFJldGFpblB0cjxDQUxheWVyPiBfcm9vdExheWVyOwpAQCAtMzc3Niw2ICszNzc4 LDggQEAgc3RhdGljIE5TU3RyaW5nICpwYXRoV2l0aFVuaXF1ZUZpbGVuYW1lRm9yUGF0aChOU1N0 cmluZyAqcGF0aCkKICAgICBfZGF0YS0+X2NsaXBzVG9WaXNpYmxlUmVjdCA9IE5POwogICAgIF9k YXRhLT5fdXNlQ29udGVudFByZXBhcmF0aW9uUmVjdEZvclZpc2libGVSZWN0ID0gTk87CiAgICAg X2RhdGEtPl93aW5kb3dPY2NsdXNpb25EZXRlY3Rpb25FbmFibGVkID0gWUVTOworICAgIF9kYXRh LT5fbGFzdFJlcXVlc3RlZExheW91dE1vZGUgPSBrV0tMYXlvdXRNb2RlVmlld1NpemU7CisgICAg X2RhdGEtPl9sYXN0UmVxdWVzdGVkVmlld1NjYWxlID0gMTsKIAogICAgIF9kYXRhLT5fd2luZG93 VmlzaWJpbGl0eU9ic2VydmVyID0gYWRvcHROUyhbW1dLV2luZG93VmlzaWJpbGl0eU9ic2VydmVy IGFsbG9jXSBpbml0V2l0aFZpZXc6c2VsZl0pOwogCkBAIC0zODk0LDYgKzM4OTgsNDEgQEAgc3Rh dGljIE5TU3RyaW5nICpwYXRoV2l0aFVuaXF1ZUZpbGVuYW1lRm9yUGF0aChOU1N0cmluZyAqcGF0 aCkKICAgICAgICAgX2RhdGEtPl9nZXN0dXJlQ29udHJvbGxlci0+ZGlkRmlyc3RWaXN1YWxseU5v bkVtcHR5TGF5b3V0Rm9yTWFpbkZyYW1lKCk7CiB9CiAKKy0gKEJPT0wpX3N1cHBvcnRzQXJiaXRy YXJ5TGF5b3V0TW9kZXMKK3sKKyAgICBXZWJQYWdlUHJveHkqIHBhZ2UgPSBfZGF0YS0+X3BhZ2Uu Z2V0KCk7CisgICAgaWYgKCFwYWdlKQorICAgICAgICByZXR1cm4gWUVTOworICAgIFdlYkZyYW1l UHJveHkqIGZyYW1lID0gcGFnZS0+bWFpbkZyYW1lKCk7CisgICAgaWYgKCFmcmFtZSkKKyAgICAg ICAgcmV0dXJuIFlFUzsKKworICAgIC8vIElmIHdlIGhhdmUgYSBwbHVnaW4gZG9jdW1lbnQgaW4g dGhlIG1haW4gZnJhbWUsIGF2b2lkIHVzaW5nIGN1c3RvbSBXS0xheW91dE1vZGVzCisgICAgLy8g YW5kIGZhbGwgYmFjayB0byB0aGUgZGVmYXVsdHMsIGJlY2F1c2UgdGhlcmUncyBhIGdvb2QgY2hh bmNlIHRoYXQgaXQgd29uJ3Qgd29yayAoZS5nLiB3aXRoIFBERlBsdWdpbikuCisgICAgaWYgKGZy YW1lLT5jb250YWluc1BsdWdpbkRvY3VtZW50KCkpCisgICAgICAgIHJldHVybiBOTzsKKworICAg IHJldHVybiBZRVM7Cit9CisKKy0gKHZvaWQpX2RpZENvbW1pdExvYWRGb3JNYWluRnJhbWUKK3sK KyAgICBpZiAoIVtzZWxmIF9zdXBwb3J0c0FyYml0cmFyeUxheW91dE1vZGVzXSkgeworICAgICAg ICBXS0xheW91dE1vZGUgb2xkUmVxdWVzdGVkTGF5b3V0TW9kZSA9IF9kYXRhLT5fbGFzdFJlcXVl c3RlZExheW91dE1vZGU7CisgICAgICAgIGZsb2F0IG9sZFJlcXVlc3RlZFZpZXdTY2FsZSA9IF9k YXRhLT5fbGFzdFJlcXVlc3RlZFZpZXdTY2FsZTsKKyAgICAgICAgW3NlbGYgX3NldFZpZXdTY2Fs ZToxXTsKKyAgICAgICAgW3NlbGYgX3NldExheW91dE1vZGU6a1dLTGF5b3V0TW9kZVZpZXdTaXpl XTsKKworICAgICAgICAvLyBUaGUgJ2xhc3QgcmVxdWVzdGVkJyBwYXJhbWV0ZXJzIHdpbGwgaGF2 ZSBiZWVuIG92ZXJ3cml0dGVuIGJ5IHNldHRpbmcgdGhlbSBhYm92ZSwgYnV0IHdlIGRvbid0Cisg ICAgICAgIC8vIHdhbnQgdGhpcyB0byBjb3VudCBhcyBhIHJlcXVlc3QgKG9ubHkgY2hhbmdlcyBm cm9tIHRoZSBjbGllbnQgY291bnQpLCBzbyByZXNldCB0aGVtLgorICAgICAgICBfZGF0YS0+X2xh c3RSZXF1ZXN0ZWRMYXlvdXRNb2RlID0gb2xkUmVxdWVzdGVkTGF5b3V0TW9kZTsKKyAgICAgICAg X2RhdGEtPl9sYXN0UmVxdWVzdGVkVmlld1NjYWxlID0gb2xkUmVxdWVzdGVkVmlld1NjYWxlOwor ICAgIH0gZWxzZSBpZiAoX2RhdGEtPl9sYXN0UmVxdWVzdGVkTGF5b3V0TW9kZSAhPSBbX2RhdGEt Pl9sYXlvdXRTdHJhdGVneSBsYXlvdXRNb2RlXSkgeworICAgICAgICBbc2VsZiBfc2V0Vmlld1Nj YWxlOl9kYXRhLT5fbGFzdFJlcXVlc3RlZFZpZXdTY2FsZV07CisgICAgICAgIFtzZWxmIF9zZXRM YXlvdXRNb2RlOl9kYXRhLT5fbGFzdFJlcXVlc3RlZExheW91dE1vZGVdOworICAgIH0KK30KKwog LSAodm9pZClfZGlkRmluaXNoTG9hZEZvck1haW5GcmFtZQogewogICAgIGlmIChfZGF0YS0+X2dl c3R1cmVDb250cm9sbGVyKQpAQCAtNDMwMiw2ICs0MzQxLDExIEBAIHN0YXRpYyBOU1N0cmluZyAq cGF0aFdpdGhVbmlxdWVGaWxlbmFtZUZvclBhdGgoTlNTdHJpbmcgKnBhdGgpCiAKIC0gKHZvaWQp X3NldExheW91dE1vZGU6KFdLTGF5b3V0TW9kZSlsYXlvdXRNb2RlCiB7CisgICAgX2RhdGEtPl9s YXN0UmVxdWVzdGVkTGF5b3V0TW9kZSA9IGxheW91dE1vZGU7CisKKyAgICBpZiAoIVtzZWxmIF9z dXBwb3J0c0FyYml0cmFyeUxheW91dE1vZGVzXSAmJiBsYXlvdXRNb2RlICE9IGtXS0xheW91dE1v ZGVWaWV3U2l6ZSkKKyAgICAgICAgcmV0dXJuOworCiAgICAgaWYgKGxheW91dE1vZGUgPT0gW19k YXRhLT5fbGF5b3V0U3RyYXRlZ3kgbGF5b3V0TW9kZV0pCiAgICAgICAgIHJldHVybjsKIApAQCAt NDMyNiw2ICs0MzcwLDExIEBAIHN0YXRpYyBOU1N0cmluZyAqcGF0aFdpdGhVbmlxdWVGaWxlbmFt ZUZvclBhdGgoTlNTdHJpbmcgKnBhdGgpCiAKIC0gKHZvaWQpX3NldFZpZXdTY2FsZTooQ0dGbG9h dCl2aWV3U2NhbGUKIHsKKyAgICBfZGF0YS0+X2xhc3RSZXF1ZXN0ZWRWaWV3U2NhbGUgPSB2aWV3 U2NhbGU7CisKKyAgICBpZiAoIVtzZWxmIF9zdXBwb3J0c0FyYml0cmFyeUxheW91dE1vZGVzXSAm JiB2aWV3U2NhbGUgIT0gMSkKKyAgICAgICAgcmV0dXJuOworCiAgICAgaWYgKHZpZXdTY2FsZSA8 PSAwIHx8IGlzbmFuKHZpZXdTY2FsZSkgfHwgaXNpbmYodmlld1NjYWxlKSkKICAgICAgICAgW05T RXhjZXB0aW9uIHJhaXNlOk5TSW52YWxpZEFyZ3VtZW50RXhjZXB0aW9uIGZvcm1hdDpAIlZpZXcg c2NhbGUgc2hvdWxkIGJlIGEgcG9zaXRpdmUgbnVtYmVyIl07CiAKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvbWFjL1dLVmlld0ludGVybmFsLmggYi9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL21hYy9XS1ZpZXdJbnRlcm5hbC5oCmluZGV4IDJlYWU2OWM1YzUw OTJlMWNlOTIwMmFmOTIwZTkzNDYyOWEzZGE3YzYuLmZhZjVkYjBhMzVlNjhkOWMxMThlZThlZTA2 NzJhY2Y1NWRhYTYzMzUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkv bWFjL1dLVmlld0ludGVybmFsLmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9t YWMvV0tWaWV3SW50ZXJuYWwuaApAQCAtMTE5LDYgKzExOSw3IEBAIHN0cnVjdCBXZWJQYWdlQ29u ZmlndXJhdGlvbjsKIC0gKEJPT0wpX3N1cHByZXNzVmlzaWJpbGl0eVVwZGF0ZXM7CiAKIC0gKHZv aWQpX2RpZEZpcnN0VmlzdWFsbHlOb25FbXB0eUxheW91dEZvck1haW5GcmFtZTsKKy0gKHZvaWQp X2RpZENvbW1pdExvYWRGb3JNYWluRnJhbWU7CiAtICh2b2lkKV9kaWRGaW5pc2hMb2FkRm9yTWFp bkZyYW1lOwogLSAodm9pZClfZGlkRmFpbExvYWRGb3JNYWluRnJhbWU7CiAtICh2b2lkKV9kaWRT YW1lRG9jdW1lbnROYXZpZ2F0aW9uRm9yTWFpbkZyYW1lOihXZWJLaXQ6OlNhbWVEb2N1bWVudE5h dmlnYXRpb25UeXBlKXR5cGU7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv V2ViRnJhbWVQcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViRnJhbWVQcm94 eS5jcHAKaW5kZXggNTE3ODA0M2I1NDgxOThhYmQ4OWZhMjJlOGU1NDYzZWM2ZDc2NGMxYS4uNDk2 YzBlZWNiOThjOGQxNWFhMWI3M2FkYjY5YzQ4NmQ4MjMzYmE4NCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL1dlYkZyYW1lUHJveHkuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9XZWJGcmFtZVByb3h5LmNwcApAQCAtMTQ0LDcgKzE0NCw3IEBAIHZvaWQgV2Vi RnJhbWVQcm94eTo6ZGlkRmFpbFByb3Zpc2lvbmFsTG9hZCgpCiAgICAgbV9mcmFtZUxvYWRTdGF0 ZS5kaWRGYWlsUHJvdmlzaW9uYWxMb2FkKCk7CiB9CiAKLXZvaWQgV2ViRnJhbWVQcm94eTo6ZGlk Q29tbWl0TG9hZChjb25zdCBTdHJpbmcmIGNvbnRlbnRUeXBlLCBXZWJDZXJ0aWZpY2F0ZUluZm8m IGNlcnRpZmljYXRlSW5mbykKK3ZvaWQgV2ViRnJhbWVQcm94eTo6ZGlkQ29tbWl0TG9hZChjb25z dCBTdHJpbmcmIGNvbnRlbnRUeXBlLCBXZWJDZXJ0aWZpY2F0ZUluZm8mIGNlcnRpZmljYXRlSW5m bywgYm9vbCBjb250YWluc1BsdWdpbkRvY3VtZW50KQogewogICAgIG1fZnJhbWVMb2FkU3RhdGUu ZGlkQ29tbWl0TG9hZCgpOwogCkBAIC0xNTIsNiArMTUyLDcgQEAgdm9pZCBXZWJGcmFtZVByb3h5 OjpkaWRDb21taXRMb2FkKGNvbnN0IFN0cmluZyYgY29udGVudFR5cGUsIFdlYkNlcnRpZmljYXRl SW5mbyYKICAgICBtX01JTUVUeXBlID0gY29udGVudFR5cGU7CiAgICAgbV9pc0ZyYW1lU2V0ID0g ZmFsc2U7CiAgICAgbV9jZXJ0aWZpY2F0ZUluZm8gPSAmY2VydGlmaWNhdGVJbmZvOworICAgIG1f Y29udGFpbnNQbHVnaW5Eb2N1bWVudCA9IGNvbnRhaW5zUGx1Z2luRG9jdW1lbnQ7CiB9CiAKIHZv aWQgV2ViRnJhbWVQcm94eTo6ZGlkRmluaXNoTG9hZCgpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvV2ViRnJhbWVQcm94eS5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L1dlYkZyYW1lUHJveHkuaAppbmRleCBhZGFmYjY4N2QzNGVmYjhkOGVkMjY4ZTMzNDk3ZjU3MjA0 NzJkZjJiLi42ZDRhNDRjNTBhNDFmYTIyNWVjNGQ5MGM5YmZiYjI5YTllMjJhNjhkIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViRnJhbWVQcm94eS5oCisrKyBiL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJGcmFtZVByb3h5LmgKQEAgLTg4LDYgKzg4LDcgQEAgcHVi bGljOgogICAgIGNvbnN0IFN0cmluZyYgdW5yZWFjaGFibGVVUkwoKSBjb25zdCB7IHJldHVybiBt X2ZyYW1lTG9hZFN0YXRlLnVucmVhY2hhYmxlVVJMKCk7IH0KIAogICAgIGNvbnN0IFN0cmluZyYg bWltZVR5cGUoKSBjb25zdCB7IHJldHVybiBtX01JTUVUeXBlOyB9CisgICAgYm9vbCBjb250YWlu c1BsdWdpbkRvY3VtZW50KCkgY29uc3QgeyByZXR1cm4gbV9jb250YWluc1BsdWdpbkRvY3VtZW50 OyB9CiAKICAgICBjb25zdCBTdHJpbmcmIHRpdGxlKCkgY29uc3QgeyByZXR1cm4gbV90aXRsZTsg fQogCkBAIC0xMDgsNyArMTA5LDcgQEAgcHVibGljOgogICAgIHZvaWQgZGlkU3RhcnRQcm92aXNp b25hbExvYWQoY29uc3QgU3RyaW5nJiB1cmwpOwogICAgIHZvaWQgZGlkUmVjZWl2ZVNlcnZlclJl ZGlyZWN0Rm9yUHJvdmlzaW9uYWxMb2FkKGNvbnN0IFN0cmluZyYgdXJsKTsKICAgICB2b2lkIGRp ZEZhaWxQcm92aXNpb25hbExvYWQoKTsKLSAgICB2b2lkIGRpZENvbW1pdExvYWQoY29uc3QgU3Ry aW5nJiBjb250ZW50VHlwZSwgV2ViQ2VydGlmaWNhdGVJbmZvJik7CisgICAgdm9pZCBkaWRDb21t aXRMb2FkKGNvbnN0IFN0cmluZyYgY29udGVudFR5cGUsIFdlYkNlcnRpZmljYXRlSW5mbyYsIGJv b2wgY29udGFpbnNQbHVnaW5Eb2N1bWVudCk7CiAgICAgdm9pZCBkaWRGaW5pc2hMb2FkKCk7CiAg ICAgdm9pZCBkaWRGYWlsTG9hZCgpOwogICAgIHZvaWQgZGlkU2FtZURvY3VtZW50TmF2aWdhdGlv bihjb25zdCBTdHJpbmcmKTsgLy8gZWcuIGFuY2hvciBuYXZpZ2F0aW9uLCBzZXNzaW9uIHN0YXRl IGNoYW5nZS4KQEAgLTEzNCw2ICsxMzUsNyBAQCBwcml2YXRlOgogICAgIFN0cmluZyBtX01JTUVU eXBlOwogICAgIFN0cmluZyBtX3RpdGxlOwogICAgIGJvb2wgbV9pc0ZyYW1lU2V0OworICAgIGJv b2wgbV9jb250YWluc1BsdWdpbkRvY3VtZW50OwogICAgIFJlZlB0cjxXZWJDZXJ0aWZpY2F0ZUlu Zm8+IG1fY2VydGlmaWNhdGVJbmZvOwogICAgIFJlZlB0cjxXZWJGcmFtZUxpc3RlbmVyUHJveHk+ IG1fYWN0aXZlTGlzdGVuZXI7CiAgICAgdWludDY0X3QgbV9mcmFtZUlEOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAppbmRleCBjODBmN2UxODQxMzQwN2M4ZTQzOWQ5 MzZhMGRkZjJmNDMzZDFjYmIyLi44NWQ1Y2U0Y2YxMjE0MjA3Nzg0MGM3OWI3MDIzYmUwODE0ZWMw ODc2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNw cAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcApAQCAtMjk2 NCw3ICsyOTY0LDcgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmNsZWFyTG9hZERlcGVuZGVudENhbGxi YWNrcygpCiAgICAgfQogfQogCi12b2lkIFdlYlBhZ2VQcm94eTo6ZGlkQ29tbWl0TG9hZEZvckZy YW1lKHVpbnQ2NF90IGZyYW1lSUQsIHVpbnQ2NF90IG5hdmlnYXRpb25JRCwgY29uc3QgU3RyaW5n JiBtaW1lVHlwZSwgYm9vbCBmcmFtZUhhc0N1c3RvbUNvbnRlbnRQcm92aWRlciwgdWludDMyX3Qg b3BhcXVlRnJhbWVMb2FkVHlwZSwgY29uc3QgV2ViQ29yZTo6Q2VydGlmaWNhdGVJbmZvJiBjZXJ0 aWZpY2F0ZUluZm8sIGNvbnN0IFVzZXJEYXRhJiB1c2VyRGF0YSkKK3ZvaWQgV2ViUGFnZVByb3h5 OjpkaWRDb21taXRMb2FkRm9yRnJhbWUodWludDY0X3QgZnJhbWVJRCwgdWludDY0X3QgbmF2aWdh dGlvbklELCBjb25zdCBTdHJpbmcmIG1pbWVUeXBlLCBib29sIGZyYW1lSGFzQ3VzdG9tQ29udGVu dFByb3ZpZGVyLCB1aW50MzJfdCBvcGFxdWVGcmFtZUxvYWRUeXBlLCBjb25zdCBXZWJDb3JlOjpD ZXJ0aWZpY2F0ZUluZm8mIGNlcnRpZmljYXRlSW5mbywgYm9vbCBjb250YWluc1BsdWdpbkRvY3Vt ZW50LCBjb25zdCBVc2VyRGF0YSYgdXNlckRhdGEpCiB7CiAgICAgUGFnZUNsaWVudFByb3RlY3Rv ciBwcm90ZWN0b3IobV9wYWdlQ2xpZW50KTsKIApAQCAtMzAwMSw3ICszMDAxLDcgQEAgdm9pZCBX ZWJQYWdlUHJveHk6OmRpZENvbW1pdExvYWRGb3JGcmFtZSh1aW50NjRfdCBmcmFtZUlELCB1aW50 NjRfdCBuYXZpZ2F0aW9uSUQKIAogICAgIGNsZWFyTG9hZERlcGVuZGVudENhbGxiYWNrcygpOwog Ci0gICAgZnJhbWUtPmRpZENvbW1pdExvYWQobWltZVR5cGUsIHdlYkNlcnRpZmljYXRlSW5mbyk7 CisgICAgZnJhbWUtPmRpZENvbW1pdExvYWQobWltZVR5cGUsIHdlYkNlcnRpZmljYXRlSW5mbywg Y29udGFpbnNQbHVnaW5Eb2N1bWVudCk7CiAKICAgICBpZiAoZnJhbWUtPmlzTWFpbkZyYW1lKCkp IHsKICAgICAgICAgbV9tYWluRnJhbWVIYXNDdXN0b21Db250ZW50UHJvdmlkZXIgPSBmcmFtZUhh c0N1c3RvbUNvbnRlbnRQcm92aWRlcjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9XZWJQYWdlUHJveHkuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJv eHkuaAppbmRleCA1MWMxYmQ2YjMwYjM0NGI2YTE1NTg1NTA0ZTI0OWE0YTQ1ODM4ODBmLi40NWVj YTA0YmI2NjcxNTJkZDZmNTE4MTZkYjJkNjI1OWNjZmZkY2Q5IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL1dlYlBhZ2VQcm94eS5oCkBAIC0xMTI1LDcgKzExMjUsNyBAQCBwcml2YXRlOgogICAg IHZvaWQgZGlkUmVjZWl2ZVNlcnZlclJlZGlyZWN0Rm9yUHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUo dWludDY0X3QgZnJhbWVJRCwgdWludDY0X3QgbmF2aWdhdGlvbklELCBjb25zdCBTdHJpbmcmLCBj b25zdCBVc2VyRGF0YSYpOwogICAgIHZvaWQgZGlkQ2hhbmdlUHJvdmlzaW9uYWxVUkxGb3JGcmFt ZSh1aW50NjRfdCBmcmFtZUlELCB1aW50NjRfdCBuYXZpZ2F0aW9uSUQsIGNvbnN0IFN0cmluZyYg dXJsKTsKICAgICB2b2lkIGRpZEZhaWxQcm92aXNpb25hbExvYWRGb3JGcmFtZSh1aW50NjRfdCBm cmFtZUlELCBjb25zdCBTZWN1cml0eU9yaWdpbkRhdGEmIGZyYW1lU2VjdXJpdHlPcmlnaW4sIHVp bnQ2NF90IG5hdmlnYXRpb25JRCwgY29uc3QgU3RyaW5nJiBwcm92aXNpb25hbFVSTCwgY29uc3Qg V2ViQ29yZTo6UmVzb3VyY2VFcnJvciYsIGNvbnN0IFVzZXJEYXRhJik7Ci0gICAgdm9pZCBkaWRD b21taXRMb2FkRm9yRnJhbWUodWludDY0X3QgZnJhbWVJRCwgdWludDY0X3QgbmF2aWdhdGlvbklE LCBjb25zdCBTdHJpbmcmIG1pbWVUeXBlLCBib29sIGZyYW1lSGFzQ3VzdG9tQ29udGVudFByb3Zp ZGVyLCB1aW50MzJfdCBmcmFtZUxvYWRUeXBlLCBjb25zdCBXZWJDb3JlOjpDZXJ0aWZpY2F0ZUlu Zm8mLCBjb25zdCBVc2VyRGF0YSYpOworICAgIHZvaWQgZGlkQ29tbWl0TG9hZEZvckZyYW1lKHVp bnQ2NF90IGZyYW1lSUQsIHVpbnQ2NF90IG5hdmlnYXRpb25JRCwgY29uc3QgU3RyaW5nJiBtaW1l VHlwZSwgYm9vbCBmcmFtZUhhc0N1c3RvbUNvbnRlbnRQcm92aWRlciwgdWludDMyX3QgZnJhbWVM b2FkVHlwZSwgY29uc3QgV2ViQ29yZTo6Q2VydGlmaWNhdGVJbmZvJiwgYm9vbCBjb250YWluc1Bs dWdpbkRvY3VtZW50LCBjb25zdCBVc2VyRGF0YSYpOwogICAgIHZvaWQgZGlkRmluaXNoRG9jdW1l bnRMb2FkRm9yRnJhbWUodWludDY0X3QgZnJhbWVJRCwgdWludDY0X3QgbmF2aWdhdGlvbklELCBj b25zdCBVc2VyRGF0YSYpOwogICAgIHZvaWQgZGlkRmluaXNoTG9hZEZvckZyYW1lKHVpbnQ2NF90 IGZyYW1lSUQsIHVpbnQ2NF90IG5hdmlnYXRpb25JRCwgY29uc3QgVXNlckRhdGEmKTsKICAgICB2 b2lkIGRpZEZhaWxMb2FkRm9yRnJhbWUodWludDY0X3QgZnJhbWVJRCwgdWludDY0X3QgbmF2aWdh dGlvbklELCBjb25zdCBXZWJDb3JlOjpSZXNvdXJjZUVycm9yJiwgY29uc3QgVXNlckRhdGEmKTsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkubWVzc2Fn ZXMuaW4gYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5Lm1lc3NhZ2VzLmlu CmluZGV4IGVkMDdjOTNiNTEwMWMyNDUyMDYxZWUyNDM2YTllN2RjMGUxYzczNTIuLmE0MzgxMDAy ZDM2MDkxOGVkMTAwMTgyZTNkYTg4ZDNkZjc2MDJlYzkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkubWVzc2FnZXMuaW4KKysrIGIvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5tZXNzYWdlcy5pbgpAQCAtMTMwLDcgKzEzMCw3IEBA IG1lc3NhZ2VzIC0+IFdlYlBhZ2VQcm94eSB7CiAgICAgRGlkUmVjZWl2ZVNlcnZlclJlZGlyZWN0 Rm9yUHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUodWludDY0X3QgZnJhbWVJRCwgdWludDY0X3QgbmF2 aWdhdGlvbklELCBTdHJpbmcgdXJsLCBXZWJLaXQ6OlVzZXJEYXRhIHVzZXJEYXRhKQogICAgIERp ZENoYW5nZVByb3Zpc2lvbmFsVVJMRm9yRnJhbWUodWludDY0X3QgZnJhbWVJRCwgdWludDY0X3Qg bmF2aWdhdGlvbklELCBTdHJpbmcgdXJsKQogICAgIERpZEZhaWxQcm92aXNpb25hbExvYWRGb3JG cmFtZSh1aW50NjRfdCBmcmFtZUlELCBzdHJ1Y3QgV2ViS2l0OjpTZWN1cml0eU9yaWdpbkRhdGEg ZnJhbWVTZWN1cml0eU9yaWdpbiwgdWludDY0X3QgbmF2aWdhdGlvbklELCBTdHJpbmcgcHJvdmlz aW9uYWxVUkwsIFdlYkNvcmU6OlJlc291cmNlRXJyb3IgZXJyb3IsIFdlYktpdDo6VXNlckRhdGEg dXNlckRhdGEpCi0gICAgRGlkQ29tbWl0TG9hZEZvckZyYW1lKHVpbnQ2NF90IGZyYW1lSUQsIHVp bnQ2NF90IG5hdmlnYXRpb25JRCwgU3RyaW5nIG1pbWVUeXBlLCBib29sIGhhc0N1c3RvbUNvbnRl bnRQcm92aWRlciwgdWludDMyX3QgbG9hZFR5cGUsIFdlYkNvcmU6OkNlcnRpZmljYXRlSW5mbyBj ZXJ0aWZpY2F0ZUluZm8sIFdlYktpdDo6VXNlckRhdGEgdXNlckRhdGEpCisgICAgRGlkQ29tbWl0 TG9hZEZvckZyYW1lKHVpbnQ2NF90IGZyYW1lSUQsIHVpbnQ2NF90IG5hdmlnYXRpb25JRCwgU3Ry aW5nIG1pbWVUeXBlLCBib29sIGhhc0N1c3RvbUNvbnRlbnRQcm92aWRlciwgdWludDMyX3QgbG9h ZFR5cGUsIFdlYkNvcmU6OkNlcnRpZmljYXRlSW5mbyBjZXJ0aWZpY2F0ZUluZm8sIGJvb2wgY29u dGFpbnNQbHVnaW5Eb2N1bWVudCwgV2ViS2l0OjpVc2VyRGF0YSB1c2VyRGF0YSkKICAgICBEaWRG YWlsTG9hZEZvckZyYW1lKHVpbnQ2NF90IGZyYW1lSUQsIHVpbnQ2NF90IG5hdmlnYXRpb25JRCwg V2ViQ29yZTo6UmVzb3VyY2VFcnJvciBlcnJvciwgV2ViS2l0OjpVc2VyRGF0YSB1c2VyRGF0YSkK ICAgICBEaWRGaW5pc2hEb2N1bWVudExvYWRGb3JGcmFtZSh1aW50NjRfdCBmcmFtZUlELCB1aW50 NjRfdCBuYXZpZ2F0aW9uSUQsIFdlYktpdDo6VXNlckRhdGEgdXNlckRhdGEpCiAgICAgRGlkRmlu aXNoTG9hZEZvckZyYW1lKHVpbnQ2NF90IGZyYW1lSUQsIHVpbnQ2NF90IG5hdmlnYXRpb25JRCwg V2ViS2l0OjpVc2VyRGF0YSB1c2VyRGF0YSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9tYWMvUGFnZUNsaWVudEltcGwubW0gYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv bWFjL1BhZ2VDbGllbnRJbXBsLm1tCmluZGV4IDJlZDNlNzU3ZWE4YTcxMWE0MTM2Y2NkYjkxM2Uz NDU2MWIzMjQyZTUuLjM5NzY4ZGRlNzc2ZWVlZWU3ODU1ZjQ3ZTMyNTMwYTIwN2U4MzcwYjMgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvUGFnZUNsaWVudEltcGwubW0K KysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9QYWdlQ2xpZW50SW1wbC5tbQpAQCAt MzExLDYgKzMxMSw3IEBAIHZvaWQgUGFnZUNsaWVudEltcGw6OnRvb2xUaXBDaGFuZ2VkKGNvbnN0 IFN0cmluZyYgb2xkVG9vbFRpcCwgY29uc3QgU3RyaW5nJiBuZXdUCiAKIHZvaWQgUGFnZUNsaWVu dEltcGw6OmRpZENvbW1pdExvYWRGb3JNYWluRnJhbWUoY29uc3QgU3RyaW5nJiBtaW1lVHlwZSwg Ym9vbCB1c2VDdXN0b21Db250ZW50UHJvdmlkZXIpCiB7CisgICAgW21fd2tWaWV3IF9kaWRDb21t aXRMb2FkRm9yTWFpbkZyYW1lXTsKIH0KIAogdm9pZCBQYWdlQ2xpZW50SW1wbDo6ZGlkRmluaXNo TG9hZGluZ0RhdGFGb3JDdXN0b21Db250ZW50UHJvdmlkZXIoY29uc3QgU3RyaW5nJiBzdWdnZXN0 ZWRGaWxlbmFtZSwgY29uc3QgSVBDOjpEYXRhUmVmZXJlbmNlJiBkYXRhUmVmZXJlbmNlKQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFt ZUxvYWRlckNsaWVudC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBw b3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmNwcAppbmRleCBlZjNhYWZhMTVhMTU2ZTQ2Y2RhNzlk YjExMGUzOTViNzMwNTA1MGU5Li44NmYzZTM4ZDYwMzA2NGFjMTNkNmI0ZTUyYmYxODk2M2E2N2Fm NTYxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0 L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNz L1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmNwcApAQCAtNDY0LDcgKzQ2NCw3 IEBAIHZvaWQgV2ViRnJhbWVMb2FkZXJDbGllbnQ6OmRpc3BhdGNoRGlkQ29tbWl0TG9hZCgpCiAK ICAgICAvLyBOb3RpZnkgdGhlIFVJUHJvY2Vzcy4KIAotICAgIHdlYlBhZ2UtPnNlbmQoTWVzc2Fn ZXM6OldlYlBhZ2VQcm94eTo6RGlkQ29tbWl0TG9hZEZvckZyYW1lKG1fZnJhbWUtPmZyYW1lSUQo KSwgZG9jdW1lbnRMb2FkZXIubmF2aWdhdGlvbklEKCksIGRvY3VtZW50TG9hZGVyLnJlc3BvbnNl KCkubWltZVR5cGUoKSwgbV9mcmFtZUhhc0N1c3RvbUNvbnRlbnRQcm92aWRlciwgc3RhdGljX2Nh c3Q8dWludDMyX3Q+KG1fZnJhbWUtPmNvcmVGcmFtZSgpLT5sb2FkZXIoKS5sb2FkVHlwZSgpKSwg ZG9jdW1lbnRMb2FkZXIucmVzcG9uc2UoKS5jZXJ0aWZpY2F0ZUluZm8oKSwgVXNlckRhdGEoV2Vi UHJvY2Vzczo6c2luZ2xldG9uKCkudHJhbnNmb3JtT2JqZWN0c1RvSGFuZGxlcyh1c2VyRGF0YS5n ZXQoKSkuZ2V0KCkpKSk7CisgICAgd2ViUGFnZS0+c2VuZChNZXNzYWdlczo6V2ViUGFnZVByb3h5 OjpEaWRDb21taXRMb2FkRm9yRnJhbWUobV9mcmFtZS0+ZnJhbWVJRCgpLCBkb2N1bWVudExvYWRl ci5uYXZpZ2F0aW9uSUQoKSwgZG9jdW1lbnRMb2FkZXIucmVzcG9uc2UoKS5taW1lVHlwZSgpLCBt X2ZyYW1lSGFzQ3VzdG9tQ29udGVudFByb3ZpZGVyLCBzdGF0aWNfY2FzdDx1aW50MzJfdD4obV9m cmFtZS0+Y29yZUZyYW1lKCktPmxvYWRlcigpLmxvYWRUeXBlKCkpLCBkb2N1bWVudExvYWRlci5y ZXNwb25zZSgpLmNlcnRpZmljYXRlSW5mbygpLCBtX2ZyYW1lLT5jb3JlRnJhbWUoKS0+ZG9jdW1l bnQoKS0+aXNQbHVnaW5Eb2N1bWVudCgpLCBVc2VyRGF0YShXZWJQcm9jZXNzOjpzaW5nbGV0b24o KS50cmFuc2Zvcm1PYmplY3RzVG9IYW5kbGVzKHVzZXJEYXRhLmdldCgpKS5nZXQoKSkpKTsKICAg ICB3ZWJQYWdlLT5kaWRDb21taXRMb2FkKG1fZnJhbWUpOwogfQogCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAgYi9Tb3VyY2UvV2ViS2l0 Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKaW5kZXggZTVkYzgxOWRlNDBjOTVjN2M2 ZTNkMDliOTVmNmU1NDFkNjM2NGZmYS4uYzA1OWNiMGY1MzU4ZDI2NjAzNjkzZTdiODA5N2UwNjE3 YTQ5ODUwNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dl YlBhZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdl LmNwcApAQCAtMTQxNiw2ICsxNDE2LDEzIEBAIHZvaWQgV2ViUGFnZTo6c2NhbGVQYWdlKGRvdWJs ZSBzY2FsZSwgY29uc3QgSW50UG9pbnQmIG9yaWdpbikKICNlbmRpZgogICAgIFBsdWdpblZpZXcq IHBsdWdpblZpZXcgPSBwbHVnaW5WaWV3Rm9yRnJhbWUoJm1fcGFnZS0+bWFpbkZyYW1lKCkpOwog ICAgIGlmIChwbHVnaW5WaWV3ICYmIHBsdWdpblZpZXctPmhhbmRsZXNQYWdlU2NhbGVGYWN0b3Io KSkgeworICAgICAgICAvLyBJZiB0aGUgbWFpbi1mcmFtZSBwbHVnaW4gd2FudHMgdG8gaGFuZGxl IHRoZSBwYWdlIHNjYWxlIGZhY3RvciwgbWFrZSBzdXJlIHRvIHJlc2V0IFdlYkNvcmUncyBwYWdl IHNjYWxlLgorICAgICAgICBpZiAobV9wYWdlLT5wYWdlU2NhbGVGYWN0b3IoKSAhPSAxKSB7Cisg ICAgICAgICAgICBtX3BhZ2UtPnNldFBhZ2VTY2FsZUZhY3RvcigxLCBvcmlnaW4pOworICAgICAg ICAgICAgZm9yIChhdXRvKiBwbHVnaW5WaWV3IDogbV9wbHVnaW5WaWV3cykKKyAgICAgICAgICAg ICAgICBwbHVnaW5WaWV3LT5wYWdlU2NhbGVGYWN0b3JEaWRDaGFuZ2UoKTsKKyAgICAgICAgfQor CiAgICAgICAgIHBsdWdpblZpZXctPnNldFBhZ2VTY2FsZUZhY3Rvcih0b3RhbFNjYWxlLCBvcmln aW4pOwogICAgICAgICByZXR1cm47CiAgICAgfQpAQCAtNDY2MSw2ICs0NjY4LDE3IEBAIHZvaWQg V2ViUGFnZTo6ZGlkQ29tbWl0TG9hZChXZWJGcmFtZSogZnJhbWUpCiAgICAgaWYgKGZyYW1lLT5j b3JlRnJhbWUoKS0+bG9hZGVyKCkubG9hZFR5cGUoKSA9PSBGcmFtZUxvYWRUeXBlOjpTdGFuZGFy ZCkgewogICAgICAgICBQYWdlKiBwYWdlID0gZnJhbWUtPmNvcmVGcmFtZSgpLT5wYWdlKCk7CiAK KyNpZiBQTEFURk9STShNQUMpCisgICAgICAgIC8vIEFzIGEgdmVyeSBzcGVjaWFsIGNhc2UsIHdl IGRpc2FibGUgbm9uLWRlZmF1bHQgbGF5b3V0IG1vZGVzIGluIFdLVmlldyBmb3IgbWFpbi1mcmFt ZSBQbHVnaW5Eb2N1bWVudHMuCisgICAgICAgIC8vIElkZWFsbHkgd2Ugd291bGQgb25seSB3b3Jy eSBhYm91dCB0aGlzIGluIFdLVmlldyBvciB0aGUgV0tWaWV3TGF5b3V0U3RyYXRlZ2llcywgYnV0 IGlmIHdlIGFsbG93CisgICAgICAgIC8vIGEgcm91bmQtdHJpcCB0byB0aGUgVUkgcHJvY2Vzcywg eW91J2xsIHNlZSB0aGUgd3Jvbmcgc2NhbGUgdGVtcG9yYXJpbHkuIFNvLCB3ZSByZXNldCBpdCBo ZXJlLCBhbmQgdGhlbgorICAgICAgICAvLyBhZ2FpbiBsYXRlciBmcm9tIHRoZSBVSSBwcm9jZXNz LgorICAgICAgICBpZiAoZnJhbWUtPmNvcmVGcmFtZSgpLT5kb2N1bWVudCgpLT5pc1BsdWdpbkRv Y3VtZW50KCkpIHsKKyAgICAgICAgICAgIHNjYWxlVmlldygxKTsKKyAgICAgICAgICAgIHNldFVz ZUZpeGVkTGF5b3V0KGZhbHNlKTsKKyAgICAgICAgfQorI2VuZGlmCisKICAgICAgICAgaWYgKHBh Z2UgJiYgcGFnZS0+cGFnZVNjYWxlRmFjdG9yKCkgIT0gMSkKICAgICAgICAgICAgIHNjYWxlUGFn ZSgxLCBJbnRQb2ludCgpKTsKICAgICB9Cg== 258325 2015-08-05 17:09:29 -0700 2015-08-05 17:23:15 -0700 Patch bug-147708-20150805170920.patch text/plain 17484 thorton U3VidmVyc2lvbiBSZXZpc2lvbjogMTg3OTg3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggNTY0Yjk2MjI2NjdhYzdj OGJmODg5ZGQxOTNhMGU5ZGJiNDlmYTZjNC4uN2UxZTE5NzhhZTdlYTI3YmI0MzU4Zjk0MWUxYmVl NzY3MWQ3YTI4ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ4IEBACisyMDE1LTA4LTA1ICBUaW0g SG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgorCisgICAgICAgIFBERlBsdWdpbnMg YXJlIGNsaXBwZWQgaW4gbGluayBwcmV2aWV3cyAoYW5kIHJlbWFpbiBzbyB3aGVuIG9wZW5lZCkK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0NzcwOAor ICAgICAgICA8cmRhcjovL3Byb2JsZW0vMjIwNTUxMzA+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL21hYy9XS1ZpZXcubW06 CisgICAgICAgICgtW1dLVmlldyBpbml0V2l0aEZyYW1lOnByb2Nlc3NQb29sOmNvbmZpZ3VyYXRp b246d2ViVmlldzpdKToKKyAgICAgICAgKC1bV0tWaWV3IF9zdXBwb3J0c0FyYml0cmFyeUxheW91 dE1vZGVzXSk6CisgICAgICAgICgtW1dLVmlldyBfZGlkQ29tbWl0TG9hZEZvck1haW5GcmFtZV0p OgorICAgICAgICAoLVtXS1ZpZXcgX3NldExheW91dE1vZGU6XSk6CisgICAgICAgICgtW1dLVmll dyBfc2V0Vmlld1NjYWxlOl0pOgorICAgICAgICBBdm9pZCB1c2luZyBhbnkgbGF5b3V0IG1vZGUg b3RoZXIgdGhhbiAiVmlld1NpemUiIGZvciBtYWluIGZyYW1lIFBsdWdpbkRvY3VtZW50cywKKyAg ICAgICAgYmVjYXVzZSB0aGV5IHdpbGwgb2Z0ZW4gZW5kIHVwIGJlaGF2aW5nIGluY29ycmVjdGx5 IChlc3BlY2lhbGx5IHdpdGggUERGUGx1Z2luLAorICAgICAgICB3aGljaCBpcyBldmVuIG1vcmUg c3BlY2lhbCBpbiB0aGF0IGl0IHRha2VzIG92ZXIgYXBwbGljYXRpb24gb2YgcGFnZSBzY2FsZSku CisKKyAgICAgICAgU2F2ZSBhbnkgaW5jb21pbmcgY2hhbmdlcyB0byB0aGUgdmlld1NjYWxlIGFu ZCBsYXlvdXRNb2RlLCBhbmQgcmUtYXBwbHkKKyAgICAgICAgdGhlbSBvbmNlIHdlIGxvYWQgc29t ZXRoaW5nIGluIHRoZSBtYWluIGZyYW1lIHRoYXQgaXMgKm5vdCogYSBQbHVnaW5Eb2N1bWVudC4K KworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvbWFjL1dLVmlld0ludGVybmFsLmg6CisgICAgICAg ICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQ YWdlOjpzY2FsZVBhZ2UpOgorICAgICAgICBNYWtlIHN1cmUgdG8gcmVzZXQgV2ViQ29yZSdzIHBh Z2Ugc2NhbGUgaWYgdGhlIG1haW4gZnJhbWUgY29udGFpbnMgYSAKKyAgICAgICAgUGx1Z2luRG9j dW1lbnQgdGhhdCB0YWtlcyBjYXJlIG9mIHBhZ2Ugc2NhbGUgaXRzZWxmLgorCisgICAgICAgIChX ZWJLaXQ6OldlYlBhZ2U6OmRpZENvbW1pdExvYWQpOgorICAgICAgICBEbyB0aGUgc2FtZSB0aGlu ZyBhcyB3aGF0IHdlIGRvIGluIFdLVmlldyBfZGlkQ29tbWl0TG9hZEZvck1haW5GcmFtZSwKKyAg ICAgICAgYnV0IHdpdGhvdXQgdGhlIFVJIHByb2Nlc3Mgcm91bmQtdHJpcCwgdG8gYXZvaWQgYW4g dWdseSBmbGFzaC4KKworICAgICAgICAqIFVJUHJvY2Vzcy9XZWJGcmFtZVByb3h5LmNwcDoKKyAg ICAgICAgKFdlYktpdDo6V2ViRnJhbWVQcm94eTo6ZGlkQ29tbWl0TG9hZCk6CisgICAgICAgICog VUlQcm9jZXNzL1dlYkZyYW1lUHJveHkuaDoKKyAgICAgICAgKFdlYktpdDo6V2ViRnJhbWVQcm94 eTo6Y29udGFpbnNQbHVnaW5Eb2N1bWVudCk6CisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQ cm94eS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6ZGlkQ29tbWl0TG9hZEZv ckZyYW1lKToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5Lmg6CisgICAgICAgICog VUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5tZXNzYWdlcy5pbjoKKyAgICAgICAgKiBVSVByb2Nlc3Mv bWFjL1BhZ2VDbGllbnRJbXBsLm1tOgorICAgICAgICAoV2ViS2l0OjpQYWdlQ2xpZW50SW1wbDo6 ZGlkQ29tbWl0TG9hZEZvck1haW5GcmFtZSk6CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJDb3Jl U3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYkZy YW1lTG9hZGVyQ2xpZW50OjpkaXNwYXRjaERpZENvbW1pdExvYWQpOgorICAgICAgICBQbHVtYiBh bmQga2VlcCB0cmFjayBvZiB3aGV0aGVyIHRoZSBtYWluIGZyYW1lIGNvbnRhaW5zIGEgUGx1Z2lu RG9jdW1lbnQgb3Igbm90LgorCiAyMDE1LTA4LTA1ICBSeW9zdWtlIE5pd2EgIDxybml3YUB3ZWJr aXQub3JnPgogCiAgICAgICAgIFdlYkluc3BlY3RvclByb3h5IHNob3VsZCBtYWtlIFdLV2ViVmll dyBmaXJzdCByZXNwb25kZXIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9B UEkvbWFjL1dLVmlldy5tbSBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvbWFjL1dLVmll dy5tbQppbmRleCA0ZWY3YTU4ODk1Njg5NDI5Y2ZhZjMxMTc4YjBjZDJkNDZmNTIxMmFjLi5kM2E3 NzI2NzI4NWFmYzgzZTQ2OGE1NTRlM2E3NDcyNjdhYmZmYTIwIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvQVBJL21hYy9XS1ZpZXcubW0KKysrIGIvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9tYWMvV0tWaWV3Lm1tCkBAIC0yNjQsNiArMjY0LDggQEAgc3RydWN0IFdL Vmlld0ludGVycHJldEtleUV2ZW50c1BhcmFtZXRlcnMgewogICAgIEJPT0wgX2FsbG93c0xpbmtQ cmV2aWV3OwogCiAgICAgUmV0YWluUHRyPFdLVmlld0xheW91dFN0cmF0ZWd5PiBfbGF5b3V0U3Ry YXRlZ3k7CisgICAgV0tMYXlvdXRNb2RlIF9sYXN0UmVxdWVzdGVkTGF5b3V0TW9kZTsKKyAgICBm bG9hdCBfbGFzdFJlcXVlc3RlZFZpZXdTY2FsZTsKICAgICBDR1NpemUgX21pbmltdW1WaWV3U2l6 ZTsKIAogICAgIFJldGFpblB0cjxDQUxheWVyPiBfcm9vdExheWVyOwpAQCAtMzc3Niw2ICszNzc4 LDggQEAgc3RhdGljIE5TU3RyaW5nICpwYXRoV2l0aFVuaXF1ZUZpbGVuYW1lRm9yUGF0aChOU1N0 cmluZyAqcGF0aCkKICAgICBfZGF0YS0+X2NsaXBzVG9WaXNpYmxlUmVjdCA9IE5POwogICAgIF9k YXRhLT5fdXNlQ29udGVudFByZXBhcmF0aW9uUmVjdEZvclZpc2libGVSZWN0ID0gTk87CiAgICAg X2RhdGEtPl93aW5kb3dPY2NsdXNpb25EZXRlY3Rpb25FbmFibGVkID0gWUVTOworICAgIF9kYXRh LT5fbGFzdFJlcXVlc3RlZExheW91dE1vZGUgPSBrV0tMYXlvdXRNb2RlVmlld1NpemU7CisgICAg X2RhdGEtPl9sYXN0UmVxdWVzdGVkVmlld1NjYWxlID0gMTsKIAogICAgIF9kYXRhLT5fd2luZG93 VmlzaWJpbGl0eU9ic2VydmVyID0gYWRvcHROUyhbW1dLV2luZG93VmlzaWJpbGl0eU9ic2VydmVy IGFsbG9jXSBpbml0V2l0aFZpZXc6c2VsZl0pOwogCkBAIC0zODk0LDYgKzM4OTgsNDEgQEAgc3Rh dGljIE5TU3RyaW5nICpwYXRoV2l0aFVuaXF1ZUZpbGVuYW1lRm9yUGF0aChOU1N0cmluZyAqcGF0 aCkKICAgICAgICAgX2RhdGEtPl9nZXN0dXJlQ29udHJvbGxlci0+ZGlkRmlyc3RWaXN1YWxseU5v bkVtcHR5TGF5b3V0Rm9yTWFpbkZyYW1lKCk7CiB9CiAKKy0gKEJPT0wpX3N1cHBvcnRzQXJiaXRy YXJ5TGF5b3V0TW9kZXMKK3sKKyAgICBXZWJQYWdlUHJveHkqIHBhZ2UgPSBfZGF0YS0+X3BhZ2Uu Z2V0KCk7CisgICAgaWYgKCFwYWdlKQorICAgICAgICByZXR1cm4gWUVTOworICAgIFdlYkZyYW1l UHJveHkqIGZyYW1lID0gcGFnZS0+bWFpbkZyYW1lKCk7CisgICAgaWYgKCFmcmFtZSkKKyAgICAg ICAgcmV0dXJuIFlFUzsKKworICAgIC8vIElmIHdlIGhhdmUgYSBwbHVnaW4gZG9jdW1lbnQgaW4g dGhlIG1haW4gZnJhbWUsIGF2b2lkIHVzaW5nIGN1c3RvbSBXS0xheW91dE1vZGVzCisgICAgLy8g YW5kIGZhbGwgYmFjayB0byB0aGUgZGVmYXVsdHMsIGJlY2F1c2UgdGhlcmUncyBhIGdvb2QgY2hh bmNlIHRoYXQgaXQgd29uJ3Qgd29yayAoZS5nLiB3aXRoIFBERlBsdWdpbikuCisgICAgaWYgKGZy YW1lLT5jb250YWluc1BsdWdpbkRvY3VtZW50KCkpCisgICAgICAgIHJldHVybiBOTzsKKworICAg IHJldHVybiBZRVM7Cit9CisKKy0gKHZvaWQpX2RpZENvbW1pdExvYWRGb3JNYWluRnJhbWUKK3sK KyAgICBpZiAoIVtzZWxmIF9zdXBwb3J0c0FyYml0cmFyeUxheW91dE1vZGVzXSkgeworICAgICAg ICBXS0xheW91dE1vZGUgb2xkUmVxdWVzdGVkTGF5b3V0TW9kZSA9IF9kYXRhLT5fbGFzdFJlcXVl c3RlZExheW91dE1vZGU7CisgICAgICAgIGZsb2F0IG9sZFJlcXVlc3RlZFZpZXdTY2FsZSA9IF9k YXRhLT5fbGFzdFJlcXVlc3RlZFZpZXdTY2FsZTsKKyAgICAgICAgW3NlbGYgX3NldFZpZXdTY2Fs ZToxXTsKKyAgICAgICAgW3NlbGYgX3NldExheW91dE1vZGU6a1dLTGF5b3V0TW9kZVZpZXdTaXpl XTsKKworICAgICAgICAvLyBUaGUgJ2xhc3QgcmVxdWVzdGVkJyBwYXJhbWV0ZXJzIHdpbGwgaGF2 ZSBiZWVuIG92ZXJ3cml0dGVuIGJ5IHNldHRpbmcgdGhlbSBhYm92ZSwgYnV0IHdlIGRvbid0Cisg ICAgICAgIC8vIHdhbnQgdGhpcyB0byBjb3VudCBhcyBhIHJlcXVlc3QgKG9ubHkgY2hhbmdlcyBm cm9tIHRoZSBjbGllbnQgY291bnQpLCBzbyByZXNldCB0aGVtLgorICAgICAgICBfZGF0YS0+X2xh c3RSZXF1ZXN0ZWRMYXlvdXRNb2RlID0gb2xkUmVxdWVzdGVkTGF5b3V0TW9kZTsKKyAgICAgICAg X2RhdGEtPl9sYXN0UmVxdWVzdGVkVmlld1NjYWxlID0gb2xkUmVxdWVzdGVkVmlld1NjYWxlOwor ICAgIH0gZWxzZSBpZiAoX2RhdGEtPl9sYXN0UmVxdWVzdGVkTGF5b3V0TW9kZSAhPSBbX2RhdGEt Pl9sYXlvdXRTdHJhdGVneSBsYXlvdXRNb2RlXSkgeworICAgICAgICBbc2VsZiBfc2V0Vmlld1Nj YWxlOl9kYXRhLT5fbGFzdFJlcXVlc3RlZFZpZXdTY2FsZV07CisgICAgICAgIFtzZWxmIF9zZXRM YXlvdXRNb2RlOl9kYXRhLT5fbGFzdFJlcXVlc3RlZExheW91dE1vZGVdOworICAgIH0KK30KKwog LSAodm9pZClfZGlkRmluaXNoTG9hZEZvck1haW5GcmFtZQogewogICAgIGlmIChfZGF0YS0+X2dl c3R1cmVDb250cm9sbGVyKQpAQCAtNDMwMiw2ICs0MzQxLDExIEBAIHN0YXRpYyBOU1N0cmluZyAq cGF0aFdpdGhVbmlxdWVGaWxlbmFtZUZvclBhdGgoTlNTdHJpbmcgKnBhdGgpCiAKIC0gKHZvaWQp X3NldExheW91dE1vZGU6KFdLTGF5b3V0TW9kZSlsYXlvdXRNb2RlCiB7CisgICAgX2RhdGEtPl9s YXN0UmVxdWVzdGVkTGF5b3V0TW9kZSA9IGxheW91dE1vZGU7CisKKyAgICBpZiAoIVtzZWxmIF9z dXBwb3J0c0FyYml0cmFyeUxheW91dE1vZGVzXSAmJiBsYXlvdXRNb2RlICE9IGtXS0xheW91dE1v ZGVWaWV3U2l6ZSkKKyAgICAgICAgcmV0dXJuOworCiAgICAgaWYgKGxheW91dE1vZGUgPT0gW19k YXRhLT5fbGF5b3V0U3RyYXRlZ3kgbGF5b3V0TW9kZV0pCiAgICAgICAgIHJldHVybjsKIApAQCAt NDMyNiw2ICs0MzcwLDExIEBAIHN0YXRpYyBOU1N0cmluZyAqcGF0aFdpdGhVbmlxdWVGaWxlbmFt ZUZvclBhdGgoTlNTdHJpbmcgKnBhdGgpCiAKIC0gKHZvaWQpX3NldFZpZXdTY2FsZTooQ0dGbG9h dCl2aWV3U2NhbGUKIHsKKyAgICBfZGF0YS0+X2xhc3RSZXF1ZXN0ZWRWaWV3U2NhbGUgPSB2aWV3 U2NhbGU7CisKKyAgICBpZiAoIVtzZWxmIF9zdXBwb3J0c0FyYml0cmFyeUxheW91dE1vZGVzXSAm JiB2aWV3U2NhbGUgIT0gMSkKKyAgICAgICAgcmV0dXJuOworCiAgICAgaWYgKHZpZXdTY2FsZSA8 PSAwIHx8IGlzbmFuKHZpZXdTY2FsZSkgfHwgaXNpbmYodmlld1NjYWxlKSkKICAgICAgICAgW05T RXhjZXB0aW9uIHJhaXNlOk5TSW52YWxpZEFyZ3VtZW50RXhjZXB0aW9uIGZvcm1hdDpAIlZpZXcg c2NhbGUgc2hvdWxkIGJlIGEgcG9zaXRpdmUgbnVtYmVyIl07CiAKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvbWFjL1dLVmlld0ludGVybmFsLmggYi9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL21hYy9XS1ZpZXdJbnRlcm5hbC5oCmluZGV4IDJlYWU2OWM1YzUw OTJlMWNlOTIwMmFmOTIwZTkzNDYyOWEzZGE3YzYuLmZhZjVkYjBhMzVlNjhkOWMxMThlZThlZTA2 NzJhY2Y1NWRhYTYzMzUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkv bWFjL1dLVmlld0ludGVybmFsLmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9t YWMvV0tWaWV3SW50ZXJuYWwuaApAQCAtMTE5LDYgKzExOSw3IEBAIHN0cnVjdCBXZWJQYWdlQ29u ZmlndXJhdGlvbjsKIC0gKEJPT0wpX3N1cHByZXNzVmlzaWJpbGl0eVVwZGF0ZXM7CiAKIC0gKHZv aWQpX2RpZEZpcnN0VmlzdWFsbHlOb25FbXB0eUxheW91dEZvck1haW5GcmFtZTsKKy0gKHZvaWQp X2RpZENvbW1pdExvYWRGb3JNYWluRnJhbWU7CiAtICh2b2lkKV9kaWRGaW5pc2hMb2FkRm9yTWFp bkZyYW1lOwogLSAodm9pZClfZGlkRmFpbExvYWRGb3JNYWluRnJhbWU7CiAtICh2b2lkKV9kaWRT YW1lRG9jdW1lbnROYXZpZ2F0aW9uRm9yTWFpbkZyYW1lOihXZWJLaXQ6OlNhbWVEb2N1bWVudE5h dmlnYXRpb25UeXBlKXR5cGU7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv V2ViRnJhbWVQcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViRnJhbWVQcm94 eS5jcHAKaW5kZXggNTE3ODA0M2I1NDgxOThhYmQ4OWZhMjJlOGU1NDYzZWM2ZDc2NGMxYS4uNDk2 YzBlZWNiOThjOGQxNWFhMWI3M2FkYjY5YzQ4NmQ4MjMzYmE4NCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL1dlYkZyYW1lUHJveHkuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9XZWJGcmFtZVByb3h5LmNwcApAQCAtMTQ0LDcgKzE0NCw3IEBAIHZvaWQgV2Vi RnJhbWVQcm94eTo6ZGlkRmFpbFByb3Zpc2lvbmFsTG9hZCgpCiAgICAgbV9mcmFtZUxvYWRTdGF0 ZS5kaWRGYWlsUHJvdmlzaW9uYWxMb2FkKCk7CiB9CiAKLXZvaWQgV2ViRnJhbWVQcm94eTo6ZGlk Q29tbWl0TG9hZChjb25zdCBTdHJpbmcmIGNvbnRlbnRUeXBlLCBXZWJDZXJ0aWZpY2F0ZUluZm8m IGNlcnRpZmljYXRlSW5mbykKK3ZvaWQgV2ViRnJhbWVQcm94eTo6ZGlkQ29tbWl0TG9hZChjb25z dCBTdHJpbmcmIGNvbnRlbnRUeXBlLCBXZWJDZXJ0aWZpY2F0ZUluZm8mIGNlcnRpZmljYXRlSW5m bywgYm9vbCBjb250YWluc1BsdWdpbkRvY3VtZW50KQogewogICAgIG1fZnJhbWVMb2FkU3RhdGUu ZGlkQ29tbWl0TG9hZCgpOwogCkBAIC0xNTIsNiArMTUyLDcgQEAgdm9pZCBXZWJGcmFtZVByb3h5 OjpkaWRDb21taXRMb2FkKGNvbnN0IFN0cmluZyYgY29udGVudFR5cGUsIFdlYkNlcnRpZmljYXRl SW5mbyYKICAgICBtX01JTUVUeXBlID0gY29udGVudFR5cGU7CiAgICAgbV9pc0ZyYW1lU2V0ID0g ZmFsc2U7CiAgICAgbV9jZXJ0aWZpY2F0ZUluZm8gPSAmY2VydGlmaWNhdGVJbmZvOworICAgIG1f Y29udGFpbnNQbHVnaW5Eb2N1bWVudCA9IGNvbnRhaW5zUGx1Z2luRG9jdW1lbnQ7CiB9CiAKIHZv aWQgV2ViRnJhbWVQcm94eTo6ZGlkRmluaXNoTG9hZCgpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvV2ViRnJhbWVQcm94eS5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L1dlYkZyYW1lUHJveHkuaAppbmRleCBhZGFmYjY4N2QzNGVmYjhkOGVkMjY4ZTMzNDk3ZjU3MjA0 NzJkZjJiLi42ZDRhNDRjNTBhNDFmYTIyNWVjNGQ5MGM5YmZiYjI5YTllMjJhNjhkIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViRnJhbWVQcm94eS5oCisrKyBiL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJGcmFtZVByb3h5LmgKQEAgLTg4LDYgKzg4LDcgQEAgcHVi bGljOgogICAgIGNvbnN0IFN0cmluZyYgdW5yZWFjaGFibGVVUkwoKSBjb25zdCB7IHJldHVybiBt X2ZyYW1lTG9hZFN0YXRlLnVucmVhY2hhYmxlVVJMKCk7IH0KIAogICAgIGNvbnN0IFN0cmluZyYg bWltZVR5cGUoKSBjb25zdCB7IHJldHVybiBtX01JTUVUeXBlOyB9CisgICAgYm9vbCBjb250YWlu c1BsdWdpbkRvY3VtZW50KCkgY29uc3QgeyByZXR1cm4gbV9jb250YWluc1BsdWdpbkRvY3VtZW50 OyB9CiAKICAgICBjb25zdCBTdHJpbmcmIHRpdGxlKCkgY29uc3QgeyByZXR1cm4gbV90aXRsZTsg fQogCkBAIC0xMDgsNyArMTA5LDcgQEAgcHVibGljOgogICAgIHZvaWQgZGlkU3RhcnRQcm92aXNp b25hbExvYWQoY29uc3QgU3RyaW5nJiB1cmwpOwogICAgIHZvaWQgZGlkUmVjZWl2ZVNlcnZlclJl ZGlyZWN0Rm9yUHJvdmlzaW9uYWxMb2FkKGNvbnN0IFN0cmluZyYgdXJsKTsKICAgICB2b2lkIGRp ZEZhaWxQcm92aXNpb25hbExvYWQoKTsKLSAgICB2b2lkIGRpZENvbW1pdExvYWQoY29uc3QgU3Ry aW5nJiBjb250ZW50VHlwZSwgV2ViQ2VydGlmaWNhdGVJbmZvJik7CisgICAgdm9pZCBkaWRDb21t aXRMb2FkKGNvbnN0IFN0cmluZyYgY29udGVudFR5cGUsIFdlYkNlcnRpZmljYXRlSW5mbyYsIGJv b2wgY29udGFpbnNQbHVnaW5Eb2N1bWVudCk7CiAgICAgdm9pZCBkaWRGaW5pc2hMb2FkKCk7CiAg ICAgdm9pZCBkaWRGYWlsTG9hZCgpOwogICAgIHZvaWQgZGlkU2FtZURvY3VtZW50TmF2aWdhdGlv bihjb25zdCBTdHJpbmcmKTsgLy8gZWcuIGFuY2hvciBuYXZpZ2F0aW9uLCBzZXNzaW9uIHN0YXRl IGNoYW5nZS4KQEAgLTEzNCw2ICsxMzUsNyBAQCBwcml2YXRlOgogICAgIFN0cmluZyBtX01JTUVU eXBlOwogICAgIFN0cmluZyBtX3RpdGxlOwogICAgIGJvb2wgbV9pc0ZyYW1lU2V0OworICAgIGJv b2wgbV9jb250YWluc1BsdWdpbkRvY3VtZW50OwogICAgIFJlZlB0cjxXZWJDZXJ0aWZpY2F0ZUlu Zm8+IG1fY2VydGlmaWNhdGVJbmZvOwogICAgIFJlZlB0cjxXZWJGcmFtZUxpc3RlbmVyUHJveHk+ IG1fYWN0aXZlTGlzdGVuZXI7CiAgICAgdWludDY0X3QgbV9mcmFtZUlEOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAppbmRleCBjODBmN2UxODQxMzQwN2M4ZTQzOWQ5 MzZhMGRkZjJmNDMzZDFjYmIyLi44NWQ1Y2U0Y2YxMjE0MjA3Nzg0MGM3OWI3MDIzYmUwODE0ZWMw ODc2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNw cAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcApAQCAtMjk2 NCw3ICsyOTY0LDcgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmNsZWFyTG9hZERlcGVuZGVudENhbGxi YWNrcygpCiAgICAgfQogfQogCi12b2lkIFdlYlBhZ2VQcm94eTo6ZGlkQ29tbWl0TG9hZEZvckZy YW1lKHVpbnQ2NF90IGZyYW1lSUQsIHVpbnQ2NF90IG5hdmlnYXRpb25JRCwgY29uc3QgU3RyaW5n JiBtaW1lVHlwZSwgYm9vbCBmcmFtZUhhc0N1c3RvbUNvbnRlbnRQcm92aWRlciwgdWludDMyX3Qg b3BhcXVlRnJhbWVMb2FkVHlwZSwgY29uc3QgV2ViQ29yZTo6Q2VydGlmaWNhdGVJbmZvJiBjZXJ0 aWZpY2F0ZUluZm8sIGNvbnN0IFVzZXJEYXRhJiB1c2VyRGF0YSkKK3ZvaWQgV2ViUGFnZVByb3h5 OjpkaWRDb21taXRMb2FkRm9yRnJhbWUodWludDY0X3QgZnJhbWVJRCwgdWludDY0X3QgbmF2aWdh dGlvbklELCBjb25zdCBTdHJpbmcmIG1pbWVUeXBlLCBib29sIGZyYW1lSGFzQ3VzdG9tQ29udGVu dFByb3ZpZGVyLCB1aW50MzJfdCBvcGFxdWVGcmFtZUxvYWRUeXBlLCBjb25zdCBXZWJDb3JlOjpD ZXJ0aWZpY2F0ZUluZm8mIGNlcnRpZmljYXRlSW5mbywgYm9vbCBjb250YWluc1BsdWdpbkRvY3Vt ZW50LCBjb25zdCBVc2VyRGF0YSYgdXNlckRhdGEpCiB7CiAgICAgUGFnZUNsaWVudFByb3RlY3Rv ciBwcm90ZWN0b3IobV9wYWdlQ2xpZW50KTsKIApAQCAtMzAwMSw3ICszMDAxLDcgQEAgdm9pZCBX ZWJQYWdlUHJveHk6OmRpZENvbW1pdExvYWRGb3JGcmFtZSh1aW50NjRfdCBmcmFtZUlELCB1aW50 NjRfdCBuYXZpZ2F0aW9uSUQKIAogICAgIGNsZWFyTG9hZERlcGVuZGVudENhbGxiYWNrcygpOwog Ci0gICAgZnJhbWUtPmRpZENvbW1pdExvYWQobWltZVR5cGUsIHdlYkNlcnRpZmljYXRlSW5mbyk7 CisgICAgZnJhbWUtPmRpZENvbW1pdExvYWQobWltZVR5cGUsIHdlYkNlcnRpZmljYXRlSW5mbywg Y29udGFpbnNQbHVnaW5Eb2N1bWVudCk7CiAKICAgICBpZiAoZnJhbWUtPmlzTWFpbkZyYW1lKCkp IHsKICAgICAgICAgbV9tYWluRnJhbWVIYXNDdXN0b21Db250ZW50UHJvdmlkZXIgPSBmcmFtZUhh c0N1c3RvbUNvbnRlbnRQcm92aWRlcjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9XZWJQYWdlUHJveHkuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJv eHkuaAppbmRleCA1MWMxYmQ2YjMwYjM0NGI2YTE1NTg1NTA0ZTI0OWE0YTQ1ODM4ODBmLi40NWVj YTA0YmI2NjcxNTJkZDZmNTE4MTZkYjJkNjI1OWNjZmZkY2Q5IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL1dlYlBhZ2VQcm94eS5oCkBAIC0xMTI1LDcgKzExMjUsNyBAQCBwcml2YXRlOgogICAg IHZvaWQgZGlkUmVjZWl2ZVNlcnZlclJlZGlyZWN0Rm9yUHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUo dWludDY0X3QgZnJhbWVJRCwgdWludDY0X3QgbmF2aWdhdGlvbklELCBjb25zdCBTdHJpbmcmLCBj b25zdCBVc2VyRGF0YSYpOwogICAgIHZvaWQgZGlkQ2hhbmdlUHJvdmlzaW9uYWxVUkxGb3JGcmFt ZSh1aW50NjRfdCBmcmFtZUlELCB1aW50NjRfdCBuYXZpZ2F0aW9uSUQsIGNvbnN0IFN0cmluZyYg dXJsKTsKICAgICB2b2lkIGRpZEZhaWxQcm92aXNpb25hbExvYWRGb3JGcmFtZSh1aW50NjRfdCBm cmFtZUlELCBjb25zdCBTZWN1cml0eU9yaWdpbkRhdGEmIGZyYW1lU2VjdXJpdHlPcmlnaW4sIHVp bnQ2NF90IG5hdmlnYXRpb25JRCwgY29uc3QgU3RyaW5nJiBwcm92aXNpb25hbFVSTCwgY29uc3Qg V2ViQ29yZTo6UmVzb3VyY2VFcnJvciYsIGNvbnN0IFVzZXJEYXRhJik7Ci0gICAgdm9pZCBkaWRD b21taXRMb2FkRm9yRnJhbWUodWludDY0X3QgZnJhbWVJRCwgdWludDY0X3QgbmF2aWdhdGlvbklE LCBjb25zdCBTdHJpbmcmIG1pbWVUeXBlLCBib29sIGZyYW1lSGFzQ3VzdG9tQ29udGVudFByb3Zp ZGVyLCB1aW50MzJfdCBmcmFtZUxvYWRUeXBlLCBjb25zdCBXZWJDb3JlOjpDZXJ0aWZpY2F0ZUlu Zm8mLCBjb25zdCBVc2VyRGF0YSYpOworICAgIHZvaWQgZGlkQ29tbWl0TG9hZEZvckZyYW1lKHVp bnQ2NF90IGZyYW1lSUQsIHVpbnQ2NF90IG5hdmlnYXRpb25JRCwgY29uc3QgU3RyaW5nJiBtaW1l VHlwZSwgYm9vbCBmcmFtZUhhc0N1c3RvbUNvbnRlbnRQcm92aWRlciwgdWludDMyX3QgZnJhbWVM b2FkVHlwZSwgY29uc3QgV2ViQ29yZTo6Q2VydGlmaWNhdGVJbmZvJiwgYm9vbCBjb250YWluc1Bs dWdpbkRvY3VtZW50LCBjb25zdCBVc2VyRGF0YSYpOwogICAgIHZvaWQgZGlkRmluaXNoRG9jdW1l bnRMb2FkRm9yRnJhbWUodWludDY0X3QgZnJhbWVJRCwgdWludDY0X3QgbmF2aWdhdGlvbklELCBj b25zdCBVc2VyRGF0YSYpOwogICAgIHZvaWQgZGlkRmluaXNoTG9hZEZvckZyYW1lKHVpbnQ2NF90 IGZyYW1lSUQsIHVpbnQ2NF90IG5hdmlnYXRpb25JRCwgY29uc3QgVXNlckRhdGEmKTsKICAgICB2 b2lkIGRpZEZhaWxMb2FkRm9yRnJhbWUodWludDY0X3QgZnJhbWVJRCwgdWludDY0X3QgbmF2aWdh dGlvbklELCBjb25zdCBXZWJDb3JlOjpSZXNvdXJjZUVycm9yJiwgY29uc3QgVXNlckRhdGEmKTsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkubWVzc2Fn ZXMuaW4gYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5Lm1lc3NhZ2VzLmlu CmluZGV4IGVkMDdjOTNiNTEwMWMyNDUyMDYxZWUyNDM2YTllN2RjMGUxYzczNTIuLmE0MzgxMDAy ZDM2MDkxOGVkMTAwMTgyZTNkYTg4ZDNkZjc2MDJlYzkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkubWVzc2FnZXMuaW4KKysrIGIvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5tZXNzYWdlcy5pbgpAQCAtMTMwLDcgKzEzMCw3IEBA IG1lc3NhZ2VzIC0+IFdlYlBhZ2VQcm94eSB7CiAgICAgRGlkUmVjZWl2ZVNlcnZlclJlZGlyZWN0 Rm9yUHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUodWludDY0X3QgZnJhbWVJRCwgdWludDY0X3QgbmF2 aWdhdGlvbklELCBTdHJpbmcgdXJsLCBXZWJLaXQ6OlVzZXJEYXRhIHVzZXJEYXRhKQogICAgIERp ZENoYW5nZVByb3Zpc2lvbmFsVVJMRm9yRnJhbWUodWludDY0X3QgZnJhbWVJRCwgdWludDY0X3Qg bmF2aWdhdGlvbklELCBTdHJpbmcgdXJsKQogICAgIERpZEZhaWxQcm92aXNpb25hbExvYWRGb3JG cmFtZSh1aW50NjRfdCBmcmFtZUlELCBzdHJ1Y3QgV2ViS2l0OjpTZWN1cml0eU9yaWdpbkRhdGEg ZnJhbWVTZWN1cml0eU9yaWdpbiwgdWludDY0X3QgbmF2aWdhdGlvbklELCBTdHJpbmcgcHJvdmlz aW9uYWxVUkwsIFdlYkNvcmU6OlJlc291cmNlRXJyb3IgZXJyb3IsIFdlYktpdDo6VXNlckRhdGEg dXNlckRhdGEpCi0gICAgRGlkQ29tbWl0TG9hZEZvckZyYW1lKHVpbnQ2NF90IGZyYW1lSUQsIHVp bnQ2NF90IG5hdmlnYXRpb25JRCwgU3RyaW5nIG1pbWVUeXBlLCBib29sIGhhc0N1c3RvbUNvbnRl bnRQcm92aWRlciwgdWludDMyX3QgbG9hZFR5cGUsIFdlYkNvcmU6OkNlcnRpZmljYXRlSW5mbyBj ZXJ0aWZpY2F0ZUluZm8sIFdlYktpdDo6VXNlckRhdGEgdXNlckRhdGEpCisgICAgRGlkQ29tbWl0 TG9hZEZvckZyYW1lKHVpbnQ2NF90IGZyYW1lSUQsIHVpbnQ2NF90IG5hdmlnYXRpb25JRCwgU3Ry aW5nIG1pbWVUeXBlLCBib29sIGhhc0N1c3RvbUNvbnRlbnRQcm92aWRlciwgdWludDMyX3QgbG9h ZFR5cGUsIFdlYkNvcmU6OkNlcnRpZmljYXRlSW5mbyBjZXJ0aWZpY2F0ZUluZm8sIGJvb2wgY29u dGFpbnNQbHVnaW5Eb2N1bWVudCwgV2ViS2l0OjpVc2VyRGF0YSB1c2VyRGF0YSkKICAgICBEaWRG YWlsTG9hZEZvckZyYW1lKHVpbnQ2NF90IGZyYW1lSUQsIHVpbnQ2NF90IG5hdmlnYXRpb25JRCwg V2ViQ29yZTo6UmVzb3VyY2VFcnJvciBlcnJvciwgV2ViS2l0OjpVc2VyRGF0YSB1c2VyRGF0YSkK ICAgICBEaWRGaW5pc2hEb2N1bWVudExvYWRGb3JGcmFtZSh1aW50NjRfdCBmcmFtZUlELCB1aW50 NjRfdCBuYXZpZ2F0aW9uSUQsIFdlYktpdDo6VXNlckRhdGEgdXNlckRhdGEpCiAgICAgRGlkRmlu aXNoTG9hZEZvckZyYW1lKHVpbnQ2NF90IGZyYW1lSUQsIHVpbnQ2NF90IG5hdmlnYXRpb25JRCwg V2ViS2l0OjpVc2VyRGF0YSB1c2VyRGF0YSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9tYWMvUGFnZUNsaWVudEltcGwubW0gYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv bWFjL1BhZ2VDbGllbnRJbXBsLm1tCmluZGV4IDJlZDNlNzU3ZWE4YTcxMWE0MTM2Y2NkYjkxM2Uz NDU2MWIzMjQyZTUuLjM5NzY4ZGRlNzc2ZWVlZWU3ODU1ZjQ3ZTMyNTMwYTIwN2U4MzcwYjMgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvUGFnZUNsaWVudEltcGwubW0K KysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9QYWdlQ2xpZW50SW1wbC5tbQpAQCAt MzExLDYgKzMxMSw3IEBAIHZvaWQgUGFnZUNsaWVudEltcGw6OnRvb2xUaXBDaGFuZ2VkKGNvbnN0 IFN0cmluZyYgb2xkVG9vbFRpcCwgY29uc3QgU3RyaW5nJiBuZXdUCiAKIHZvaWQgUGFnZUNsaWVu dEltcGw6OmRpZENvbW1pdExvYWRGb3JNYWluRnJhbWUoY29uc3QgU3RyaW5nJiBtaW1lVHlwZSwg Ym9vbCB1c2VDdXN0b21Db250ZW50UHJvdmlkZXIpCiB7CisgICAgW21fd2tWaWV3IF9kaWRDb21t aXRMb2FkRm9yTWFpbkZyYW1lXTsKIH0KIAogdm9pZCBQYWdlQ2xpZW50SW1wbDo6ZGlkRmluaXNo TG9hZGluZ0RhdGFGb3JDdXN0b21Db250ZW50UHJvdmlkZXIoY29uc3QgU3RyaW5nJiBzdWdnZXN0 ZWRGaWxlbmFtZSwgY29uc3QgSVBDOjpEYXRhUmVmZXJlbmNlJiBkYXRhUmVmZXJlbmNlKQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFt ZUxvYWRlckNsaWVudC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBw b3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmNwcAppbmRleCBlZjNhYWZhMTVhMTU2ZTQ2Y2RhNzlk YjExMGUzOTViNzMwNTA1MGU5Li44NmYzZTM4ZDYwMzA2NGFjMTNkNmI0ZTUyYmYxODk2M2E2N2Fm NTYxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0 L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNz L1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmNwcApAQCAtNDY0LDcgKzQ2NCw3 IEBAIHZvaWQgV2ViRnJhbWVMb2FkZXJDbGllbnQ6OmRpc3BhdGNoRGlkQ29tbWl0TG9hZCgpCiAK ICAgICAvLyBOb3RpZnkgdGhlIFVJUHJvY2Vzcy4KIAotICAgIHdlYlBhZ2UtPnNlbmQoTWVzc2Fn ZXM6OldlYlBhZ2VQcm94eTo6RGlkQ29tbWl0TG9hZEZvckZyYW1lKG1fZnJhbWUtPmZyYW1lSUQo KSwgZG9jdW1lbnRMb2FkZXIubmF2aWdhdGlvbklEKCksIGRvY3VtZW50TG9hZGVyLnJlc3BvbnNl KCkubWltZVR5cGUoKSwgbV9mcmFtZUhhc0N1c3RvbUNvbnRlbnRQcm92aWRlciwgc3RhdGljX2Nh c3Q8dWludDMyX3Q+KG1fZnJhbWUtPmNvcmVGcmFtZSgpLT5sb2FkZXIoKS5sb2FkVHlwZSgpKSwg ZG9jdW1lbnRMb2FkZXIucmVzcG9uc2UoKS5jZXJ0aWZpY2F0ZUluZm8oKSwgVXNlckRhdGEoV2Vi UHJvY2Vzczo6c2luZ2xldG9uKCkudHJhbnNmb3JtT2JqZWN0c1RvSGFuZGxlcyh1c2VyRGF0YS5n ZXQoKSkuZ2V0KCkpKSk7CisgICAgd2ViUGFnZS0+c2VuZChNZXNzYWdlczo6V2ViUGFnZVByb3h5 OjpEaWRDb21taXRMb2FkRm9yRnJhbWUobV9mcmFtZS0+ZnJhbWVJRCgpLCBkb2N1bWVudExvYWRl ci5uYXZpZ2F0aW9uSUQoKSwgZG9jdW1lbnRMb2FkZXIucmVzcG9uc2UoKS5taW1lVHlwZSgpLCBt X2ZyYW1lSGFzQ3VzdG9tQ29udGVudFByb3ZpZGVyLCBzdGF0aWNfY2FzdDx1aW50MzJfdD4obV9m cmFtZS0+Y29yZUZyYW1lKCktPmxvYWRlcigpLmxvYWRUeXBlKCkpLCBkb2N1bWVudExvYWRlci5y ZXNwb25zZSgpLmNlcnRpZmljYXRlSW5mbygpLCBtX2ZyYW1lLT5jb3JlRnJhbWUoKS0+ZG9jdW1l bnQoKS0+aXNQbHVnaW5Eb2N1bWVudCgpLCBVc2VyRGF0YShXZWJQcm9jZXNzOjpzaW5nbGV0b24o KS50cmFuc2Zvcm1PYmplY3RzVG9IYW5kbGVzKHVzZXJEYXRhLmdldCgpKS5nZXQoKSkpKTsKICAg ICB3ZWJQYWdlLT5kaWRDb21taXRMb2FkKG1fZnJhbWUpOwogfQogCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAgYi9Tb3VyY2UvV2ViS2l0 Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKaW5kZXggZTVkYzgxOWRlNDBjOTVjN2M2 ZTNkMDliOTVmNmU1NDFkNjM2NGZmYS4uYzQ5ZDdkYTUyMDQyMDZkN2M4YWIwZmIzMzcxOGQ2YWEw ZTU4MTllNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dl YlBhZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdl LmNwcApAQCAtMTQxNiw2ICsxNDE2LDE0IEBAIHZvaWQgV2ViUGFnZTo6c2NhbGVQYWdlKGRvdWJs ZSBzY2FsZSwgY29uc3QgSW50UG9pbnQmIG9yaWdpbikKICNlbmRpZgogICAgIFBsdWdpblZpZXcq IHBsdWdpblZpZXcgPSBwbHVnaW5WaWV3Rm9yRnJhbWUoJm1fcGFnZS0+bWFpbkZyYW1lKCkpOwog ICAgIGlmIChwbHVnaW5WaWV3ICYmIHBsdWdpblZpZXctPmhhbmRsZXNQYWdlU2NhbGVGYWN0b3Io KSkgeworICAgICAgICAvLyBJZiB0aGUgbWFpbi1mcmFtZSBwbHVnaW4gd2FudHMgdG8gaGFuZGxl IHRoZSBwYWdlIHNjYWxlIGZhY3RvciwgbWFrZSBzdXJlIHRvIHJlc2V0IFdlYkNvcmUncyBwYWdl IHNjYWxlLgorICAgICAgICAvLyBPdGhlcndpc2UsIHdlIGNhbiBlbmQgdXAgd2l0aCBhbiBpbW11 dGFibGUgYnV0IG5vbi0xIHBhZ2Ugc2NhbGUgYXBwbGllZCBieSBXZWJDb3JlIG9uIHRvcCBvZiB3 aGF0ZXZlciB0aGUgcGx1Z2luIGRvZXMuCisgICAgICAgIGlmIChtX3BhZ2UtPnBhZ2VTY2FsZUZh Y3RvcigpICE9IDEpIHsKKyAgICAgICAgICAgIG1fcGFnZS0+c2V0UGFnZVNjYWxlRmFjdG9yKDEs IG9yaWdpbik7CisgICAgICAgICAgICBmb3IgKGF1dG8qIHBsdWdpblZpZXcgOiBtX3BsdWdpblZp ZXdzKQorICAgICAgICAgICAgICAgIHBsdWdpblZpZXctPnBhZ2VTY2FsZUZhY3RvckRpZENoYW5n ZSgpOworICAgICAgICB9CisKICAgICAgICAgcGx1Z2luVmlldy0+c2V0UGFnZVNjYWxlRmFjdG9y KHRvdGFsU2NhbGUsIG9yaWdpbik7CiAgICAgICAgIHJldHVybjsKICAgICB9CkBAIC00NjYxLDYg KzQ2NjksMTcgQEAgdm9pZCBXZWJQYWdlOjpkaWRDb21taXRMb2FkKFdlYkZyYW1lKiBmcmFtZSkK ICAgICBpZiAoZnJhbWUtPmNvcmVGcmFtZSgpLT5sb2FkZXIoKS5sb2FkVHlwZSgpID09IEZyYW1l TG9hZFR5cGU6OlN0YW5kYXJkKSB7CiAgICAgICAgIFBhZ2UqIHBhZ2UgPSBmcmFtZS0+Y29yZUZy YW1lKCktPnBhZ2UoKTsKIAorI2lmIFBMQVRGT1JNKE1BQykKKyAgICAgICAgLy8gQXMgYSB2ZXJ5 IHNwZWNpYWwgY2FzZSwgd2UgZGlzYWJsZSBub24tZGVmYXVsdCBsYXlvdXQgbW9kZXMgaW4gV0tW aWV3IGZvciBtYWluLWZyYW1lIFBsdWdpbkRvY3VtZW50cy4KKyAgICAgICAgLy8gSWRlYWxseSB3 ZSB3b3VsZCBvbmx5IHdvcnJ5IGFib3V0IHRoaXMgaW4gV0tWaWV3IG9yIHRoZSBXS1ZpZXdMYXlv dXRTdHJhdGVnaWVzLCBidXQgaWYgd2UgYWxsb3cKKyAgICAgICAgLy8gYSByb3VuZC10cmlwIHRv IHRoZSBVSSBwcm9jZXNzLCB5b3UnbGwgc2VlIHRoZSB3cm9uZyBzY2FsZSB0ZW1wb3JhcmlseS4g U28sIHdlIHJlc2V0IGl0IGhlcmUsIGFuZCB0aGVuCisgICAgICAgIC8vIGFnYWluIGxhdGVyIGZy b20gdGhlIFVJIHByb2Nlc3MuCisgICAgICAgIGlmIChmcmFtZS0+Y29yZUZyYW1lKCktPmRvY3Vt ZW50KCktPmlzUGx1Z2luRG9jdW1lbnQoKSkgeworICAgICAgICAgICAgc2NhbGVWaWV3KDEpOwor ICAgICAgICAgICAgc2V0VXNlRml4ZWRMYXlvdXQoZmFsc2UpOworICAgICAgICB9CisjZW5kaWYK KwogICAgICAgICBpZiAocGFnZSAmJiBwYWdlLT5wYWdlU2NhbGVGYWN0b3IoKSAhPSAxKQogICAg ICAgICAgICAgc2NhbGVQYWdlKDEsIEludFBvaW50KCkpOwogICAgIH0K