172468 2017-05-22 13:31:32 -0700 Resources in cached parsed stylesheets may bypass content blockers 2017-05-22 16:27:22 -0700 1 1 1 Unclassified WebKit CSS WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 cdumez cdumez achristensen commit-queue ggaren jberlin kling koivisto webkit-bug-importer oldest_to_newest 1311526 0 cdumez 2017-05-22 13:31:32 -0700 Resources in cached parsed stylesheets can bypass content blockers when they are in the memory cache and they do not need revalidation. 1311527 1 cdumez 2017-05-22 13:31:50 -0700 <rdar://problem/31972693> 1311531 2 310909 cdumez 2017-05-22 13:32:52 -0700 Created attachment 310909 WIP Patch Fixes the issue. 1311536 3 cdumez 2017-05-22 13:39:15 -0700 (In reply to Chris Dumez from comment #2) > Created attachment 310909 [details] > WIP Patch > > Fixes the issue. This WIP patch makes the parsed stylesheet cache aware of content blocker so that we do not reuse a cached parsed stylesheet if any of its sub resources is blocked by the content blocker, (in addition to the existing resource revalidation check). 1311584 4 310924 cdumez 2017-05-22 14:45:12 -0700 Created attachment 310924 Patch 1311587 5 310924 ggaren 2017-05-22 14:51:25 -0700 Comment on attachment 310924 Patch r=me 1311618 6 310936 cdumez 2017-05-22 15:21:48 -0700 Created attachment 310936 Patch 1311619 7 310936 cdumez 2017-05-22 15:22:43 -0700 Comment on attachment 310936 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=310936&action=review > Source/WebCore/css/StyleSheetContents.cpp:513 > + if (blockedStatus.blockedLoad || blockedStatus.madeHTTPS) I added "|| blockedStatus.madeHTTPS" based on feedback from Alex and Andreas. 1311653 8 310936 commit-queue 2017-05-22 16:27:20 -0700 Comment on attachment 310936 Patch Clearing flags on attachment: 310936 Committed r217256: <http://trac.webkit.org/changeset/217256> 1311654 9 commit-queue 2017-05-22 16:27:22 -0700 All reviewed patches have been landed. Closing bug. 310909 2017-05-22 13:32:52 -0700 2017-05-22 14:45:10 -0700 WIP Patch 172468_content_blocker_wip.patch text/plain 5938 cdumez ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZVNoZWV0Q29udGVudHMuY3BwIGIv U291cmNlL1dlYkNvcmUvY3NzL1N0eWxlU2hlZXRDb250ZW50cy5jcHAKaW5kZXggYjA2ZjFkNmYx MjQuLjgyMWVhN2VlNjEyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVTaGVl dENvbnRlbnRzLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVTaGVldENvbnRlbnRz LmNwcApAQCAtMjYsMTAgKzI2LDEzIEBACiAjaW5jbHVkZSAiQ1NTU3R5bGVTaGVldC5oIgogI2lu Y2x1ZGUgIkNhY2hlZENTU1N0eWxlU2hlZXQuaCIKICNpbmNsdWRlICJEb2N1bWVudC5oIgorI2lu Y2x1ZGUgIkZyYW1lLmgiCisjaW5jbHVkZSAiRnJhbWVMb2FkZXIuaCIKICNpbmNsdWRlICJNZWRp YUxpc3QuaCIKICNpbmNsdWRlICJOb2RlLmgiCiAjaW5jbHVkZSAiUGFnZS5oIgogI2luY2x1ZGUg IlBhZ2VDb25zb2xlQ2xpZW50LmgiCisjaW5jbHVkZSAiUmVzb3VyY2VMb2FkSW5mby5oIgogI2lu Y2x1ZGUgIlJ1bGVTZXQuaCIKICNpbmNsdWRlICJTZWN1cml0eU9yaWdpbi5oIgogI2luY2x1ZGUg IlN0eWxlUHJvcGVydGllcy5oIgpAQCAtMzksNiArNDIsMTAgQEAKICNpbmNsdWRlIDx3dGYvTmV2 ZXJEZXN0cm95ZWQuaD4KICNpbmNsdWRlIDx3dGYvUmVmLmg+CiAKKyNpZiBFTkFCTEUoQ09OVEVO VF9FWFRFTlNJT05TKQorI2luY2x1ZGUgIlVzZXJDb250ZW50Q29udHJvbGxlci5oIgorI2VuZGlm CisKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogLy8gUm91Z2ggc2l6ZSBlc3RpbWF0ZSBmb3IgdGhl IG1lbW9yeSBjYWNoZS4KQEAgLTQ4NywxNCArNDk0LDI4IEBAIGJvb2wgU3R5bGVTaGVldENvbnRl bnRzOjp0cmF2ZXJzZVN1YnJlc291cmNlcyhjb25zdCBzdGQ6OmZ1bmN0aW9uPGJvb2wgKGNvbnN0 IENhCiAgICAgcmV0dXJuIHRyYXZlcnNlU3VicmVzb3VyY2VzSW5SdWxlcyhtX2NoaWxkUnVsZXMs IGhhbmRsZXIpOwogfQogCi1ib29sIFN0eWxlU2hlZXRDb250ZW50czo6c3VicmVzb3VyY2VzQWxs b3dSZXVzZShDYWNoZVBvbGljeSBjYWNoZVBvbGljeSkgY29uc3QKK2Jvb2wgU3R5bGVTaGVldENv bnRlbnRzOjpzdWJyZXNvdXJjZXNBbGxvd1JldXNlKENhY2hlUG9saWN5IGNhY2hlUG9saWN5LCBG cmFtZUxvYWRlciYgbG9hZGVyKSBjb25zdAogewotICAgIGJvb2wgaGFzRmFpbGVkT3JFeHBpcmVk UmVzb3VyY2VzID0gdHJhdmVyc2VTdWJyZXNvdXJjZXMoW2NhY2hlUG9saWN5XShjb25zdCBDYWNo ZWRSZXNvdXJjZSYgcmVzb3VyY2UpIHsKKyAgICBib29sIGhhc0ZhaWxlZE9yRXhwaXJlZFJlc291 cmNlcyA9IHRyYXZlcnNlU3VicmVzb3VyY2VzKFtjYWNoZVBvbGljeSwgJmxvYWRlcl0oY29uc3Qg Q2FjaGVkUmVzb3VyY2UmIHJlc291cmNlKSB7CiAgICAgICAgIGlmIChyZXNvdXJjZS5sb2FkRmFp bGVkT3JDYW5jZWxlZCgpKQogICAgICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgICAgIC8vIFdl IGNhbid0IHJldmFsaWRhdGUgc3VicmVzb3VyY2VzIGluZGl2aWR1YWxseSBzbyBkb24ndCB1c2Ug cmV1c2UgdGhlIHBhcnNlZCBzaGVldCBpZiB0aGV5IG5lZWQgcmV2YWxpZGF0aW9uLgogICAgICAg ICBpZiAocmVzb3VyY2UubWFrZVJldmFsaWRhdGlvbkRlY2lzaW9uKGNhY2hlUG9saWN5KSAhPSBD YWNoZWRSZXNvdXJjZTo6UmV2YWxpZGF0aW9uRGVjaXNpb246Ok5vKQogICAgICAgICAgICAgcmV0 dXJuIHRydWU7CisKKyNpZiBFTkFCTEUoQ09OVEVOVF9FWFRFTlNJT05TKQorICAgICAgICAvLyBJ ZiBhIGNhY2hlZCBzdWJyZXNvdXJjZSBpcyBibG9ja2VkIGJ5IGEgY29udGVudCBibG9ja2VyLCB3 ZSBjYW5ub3QgcmV1c2UgdGhlIGNhY2hlZCBzdHlsZXNoZWV0LgorICAgICAgICBhdXRvKiBwYWdl ID0gbG9hZGVyLmZyYW1lKCkucGFnZSgpOworICAgICAgICBhdXRvKiBkb2N1bWVudExvYWRlciA9 IGxvYWRlci5kb2N1bWVudExvYWRlcigpOworICAgICAgICBpZiAocGFnZSAmJiBkb2N1bWVudExv YWRlcikgeworICAgICAgICAgICAgY29uc3QgYXV0byYgcmVxdWVzdCA9IHJlc291cmNlLnJlc291 cmNlUmVxdWVzdCgpOworICAgICAgICAgICAgYXV0byBibG9ja2VkU3RhdHVzID0gcGFnZS0+dXNl ckNvbnRlbnRQcm92aWRlcigpLnByb2Nlc3NDb250ZW50RXh0ZW5zaW9uUnVsZXNGb3JMb2FkKHJl cXVlc3QudXJsKCksIHRvUmVzb3VyY2VUeXBlKHJlc291cmNlLnR5cGUoKSksICpkb2N1bWVudExv YWRlcik7CisgICAgICAgICAgICBpZiAoYmxvY2tlZFN0YXR1cy5ibG9ja2VkTG9hZCkKKyAgICAg ICAgICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICAgICAgfQorI2Vsc2UKKyAgICAgICAgVU5VU0VE X1BBUkFNKGxvYWRlcik7CisjZW5kaWYKICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIH0pOwog ICAgIHJldHVybiAhaGFzRmFpbGVkT3JFeHBpcmVkUmVzb3VyY2VzOwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvY3NzL1N0eWxlU2hlZXRDb250ZW50cy5oIGIvU291cmNlL1dlYkNvcmUvY3Nz L1N0eWxlU2hlZXRDb250ZW50cy5oCmluZGV4IGRhNmY2NTkxZDFiLi42MWFjZDA1NGEzMSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlU2hlZXRDb250ZW50cy5oCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2Nzcy9TdHlsZVNoZWV0Q29udGVudHMuaApAQCAtMzcsNiArMzcsNyBAQCBj bGFzcyBDU1NTdHlsZVNoZWV0OwogY2xhc3MgQ2FjaGVkQ1NTU3R5bGVTaGVldDsKIGNsYXNzIENh Y2hlZFJlc291cmNlOwogY2xhc3MgRG9jdW1lbnQ7CitjbGFzcyBGcmFtZUxvYWRlcjsKIGNsYXNz IE5vZGU7CiBjbGFzcyBTZWN1cml0eU9yaWdpbjsKIGNsYXNzIFN0eWxlUnVsZUJhc2U7CkBAIC03 MSw3ICs3Miw3IEBAIHB1YmxpYzoKICAgICBib29sIGlzQ2FjaGVhYmxlKCkgY29uc3Q7CiAKICAg ICBib29sIGlzTG9hZGluZygpIGNvbnN0OwotICAgIGJvb2wgc3VicmVzb3VyY2VzQWxsb3dSZXVz ZShDYWNoZVBvbGljeSkgY29uc3Q7CisgICAgYm9vbCBzdWJyZXNvdXJjZXNBbGxvd1JldXNlKENh Y2hlUG9saWN5LCBGcmFtZUxvYWRlciYpIGNvbnN0OwogICAgIFdFQkNPUkVfRVhQT1JUIGJvb2wg aXNMb2FkaW5nU3VicmVzb3VyY2VzKCkgY29uc3Q7CiAKICAgICB2b2lkIGNoZWNrTG9hZGVkKCk7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxMaW5rRWxlbWVudC5jcHAgYi9T b3VyY2UvV2ViQ29yZS9odG1sL0hUTUxMaW5rRWxlbWVudC5jcHAKaW5kZXggYTdkNWU3M2M0MTIu LjUwZTJjNzVmYzZhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxMaW5rRWxl bWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTGlua0VsZW1lbnQuY3BwCkBA IC0zOTUsNyArMzk1LDcgQEAgdm9pZCBIVE1MTGlua0VsZW1lbnQ6OnNldENTU1N0eWxlU2hlZXQo Y29uc3QgU3RyaW5nJiBocmVmLCBjb25zdCBVUkwmIGJhc2VVUkwsIGMKICAgICBDU1NQYXJzZXJD b250ZXh0IHBhcnNlckNvbnRleHQoZG9jdW1lbnQoKSwgYmFzZVVSTCwgY2hhcnNldCk7CiAgICAg YXV0byBjYWNoZVBvbGljeSA9IGZyYW1lLT5sb2FkZXIoKS5zdWJyZXNvdXJjZUNhY2hlUG9saWN5 KGJhc2VVUkwpOwogCi0gICAgaWYgKGF1dG8gcmVzdG9yZWRTaGVldCA9IGNvbnN0X2Nhc3Q8Q2Fj aGVkQ1NTU3R5bGVTaGVldCo+KGNhY2hlZFN0eWxlU2hlZXQpLT5yZXN0b3JlUGFyc2VkU3R5bGVT aGVldChwYXJzZXJDb250ZXh0LCBjYWNoZVBvbGljeSkpIHsKKyAgICBpZiAoYXV0byByZXN0b3Jl ZFNoZWV0ID0gY29uc3RfY2FzdDxDYWNoZWRDU1NTdHlsZVNoZWV0Kj4oY2FjaGVkU3R5bGVTaGVl dCktPnJlc3RvcmVQYXJzZWRTdHlsZVNoZWV0KHBhcnNlckNvbnRleHQsIGNhY2hlUG9saWN5LCBm cmFtZS0+bG9hZGVyKCkpKSB7CiAgICAgICAgIEFTU0VSVChyZXN0b3JlZFNoZWV0LT5pc0NhY2hl YWJsZSgpKTsKICAgICAgICAgQVNTRVJUKCFyZXN0b3JlZFNoZWV0LT5pc0xvYWRpbmcoKSk7CiAg ICAgICAgIGluaXRpYWxpemVTdHlsZVNoZWV0KHJlc3RvcmVkU2hlZXQucmVsZWFzZU5vbk51bGwo KSwgKmNhY2hlZFN0eWxlU2hlZXQpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVy L2NhY2hlL0NhY2hlZENTU1N0eWxlU2hlZXQuY3BwIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL2Nh Y2hlL0NhY2hlZENTU1N0eWxlU2hlZXQuY3BwCmluZGV4IDA1OTM4NDRkM2M5Li44NTcxZjA5ZGI0 OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZENTU1N0eWxl U2hlZXQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRDU1NTdHls ZVNoZWV0LmNwcApAQCAtMTc0LDExICsxNzQsMTEgQEAgdm9pZCBDYWNoZWRDU1NTdHlsZVNoZWV0 OjpkZXN0cm95RGVjb2RlZERhdGEoKQogICAgIHNldERlY29kZWRTaXplKDApOwogfQogCi1SZWZQ dHI8U3R5bGVTaGVldENvbnRlbnRzPiBDYWNoZWRDU1NTdHlsZVNoZWV0OjpyZXN0b3JlUGFyc2Vk U3R5bGVTaGVldChjb25zdCBDU1NQYXJzZXJDb250ZXh0JiBjb250ZXh0LCBDYWNoZVBvbGljeSBj YWNoZVBvbGljeSkKK1JlZlB0cjxTdHlsZVNoZWV0Q29udGVudHM+IENhY2hlZENTU1N0eWxlU2hl ZXQ6OnJlc3RvcmVQYXJzZWRTdHlsZVNoZWV0KGNvbnN0IENTU1BhcnNlckNvbnRleHQmIGNvbnRl eHQsIENhY2hlUG9saWN5IGNhY2hlUG9saWN5LCBGcmFtZUxvYWRlciYgbG9hZGVyKQogewogICAg IGlmICghbV9wYXJzZWRTdHlsZVNoZWV0Q2FjaGUpCiAgICAgICAgIHJldHVybiBudWxscHRyOwot ICAgIGlmICghbV9wYXJzZWRTdHlsZVNoZWV0Q2FjaGUtPnN1YnJlc291cmNlc0FsbG93UmV1c2Uo Y2FjaGVQb2xpY3kpKSB7CisgICAgaWYgKCFtX3BhcnNlZFN0eWxlU2hlZXRDYWNoZS0+c3VicmVz b3VyY2VzQWxsb3dSZXVzZShjYWNoZVBvbGljeSwgbG9hZGVyKSkgewogICAgICAgICBtX3BhcnNl ZFN0eWxlU2hlZXRDYWNoZS0+cmVtb3ZlZEZyb21NZW1vcnlDYWNoZSgpOwogICAgICAgICBtX3Bh cnNlZFN0eWxlU2hlZXRDYWNoZSA9IG51bGxwdHI7CiAgICAgICAgIHJldHVybiBudWxscHRyOwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZENTU1N0eWxlU2hl ZXQuaCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRDU1NTdHlsZVNoZWV0LmgK aW5kZXggMDEyNzI5YzBiMTguLjUxZmNjZWJlNTgzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9sb2FkZXIvY2FjaGUvQ2FjaGVkQ1NTU3R5bGVTaGVldC5oCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2xvYWRlci9jYWNoZS9DYWNoZWRDU1NTdHlsZVNoZWV0LmgKQEAgLTI2LDYgKzI2LDcgQEAKIAog bmFtZXNwYWNlIFdlYkNvcmUgewogCitjbGFzcyBGcmFtZUxvYWRlcjsKIGNsYXNzIFN0eWxlU2hl ZXRDb250ZW50czsKIGNsYXNzIFRleHRSZXNvdXJjZURlY29kZXI7CiAKQEAgLTM5LDcgKzQwLDcg QEAgcHVibGljOgogICAgIGVudW0gY2xhc3MgTUlNRVR5cGVDaGVja0hpbnQgeyBTdHJpY3QsIExh eCB9OwogICAgIGNvbnN0IFN0cmluZyBzaGVldFRleHQoTUlNRVR5cGVDaGVja0hpbnQgPSBNSU1F VHlwZUNoZWNrSGludDo6U3RyaWN0LCBib29sKiBoYXNWYWxpZE1JTUVUeXBlID0gbnVsbHB0cikg Y29uc3Q7CiAKLSAgICBSZWZQdHI8U3R5bGVTaGVldENvbnRlbnRzPiByZXN0b3JlUGFyc2VkU3R5 bGVTaGVldChjb25zdCBDU1NQYXJzZXJDb250ZXh0JiwgQ2FjaGVQb2xpY3kpOworICAgIFJlZlB0 cjxTdHlsZVNoZWV0Q29udGVudHM+IHJlc3RvcmVQYXJzZWRTdHlsZVNoZWV0KGNvbnN0IENTU1Bh cnNlckNvbnRleHQmLCBDYWNoZVBvbGljeSwgRnJhbWVMb2FkZXImKTsKICAgICB2b2lkIHNhdmVQ YXJzZWRTdHlsZVNoZWV0KFJlZjxTdHlsZVNoZWV0Q29udGVudHM+JiYpOwogCiAjaWYgRU5BQkxF KE5PU05JRkYpCg== 310924 2017-05-22 14:45:12 -0700 2017-05-22 15:21:47 -0700 Patch bug-172468-20170522144511.patch text/plain 7780 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjE3MjIwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODY5NzM4NGUyNDUwMDQw NDBhOTA4OWQ0ZjExNDcwYTE4ZThiMGJlNy4uNzY3OTkzMmNmZjU1N2JiOTAxMjU5YjEwYmYxNGRl MzUxNzQwYzQ5OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDE3LTA1LTIyICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgUmVzb3VyY2VzIGluIGNhY2hl ZCBwYXJzZWQgc3R5bGVzaGVldHMgbWF5IGJ5cGFzcyBjb250ZW50IGJsb2NrZXJzCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzI0NjgKKyAgICAgICAg PHJkYXI6Ly9wcm9ibGVtLzMxOTcyNjkzPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFJlc291cmNlcyBpbiBjYWNoZWQgcGFyc2VkIHN0eWxlc2hlZXRz IGNvdWxkIGJ5cGFzcyBjb250ZW50IGJsb2NrZXJzIHdoZW4gdGhleSB3ZXJlIGluIHRoZSBtZW1v cnkgY2FjaGUgYW5kCisgICAgICAgIHRoZXkgZGlkIG5vdCBuZWVkIHJldmFsaWRhdGlvbi4KKwor ICAgICAgICBUbyBhZGRyZXNzIHRoZSBpc3N1ZSwgSSBtYWRlIFN0eWxlU2hlZXRDb250ZW50czo6 c3VicmVzb3VyY2VzQWxsb3dSZXVzZSgpIHRvIGNoZWNrIGNvbnRlbnQgYmxvY2tlcnMuCisgICAg ICAgIElmIGEgc3VicmVzb3VyY2UgaW4gdGhlIGNhY2hlZCBzdHlsZXNoZWV0IGlzIGJsb2NrZWQs IHRoZW4gd2UgcmV0dXJuIGZhbHNlIGluIHN1YnJlc291cmNlc0FsbG93UmV1c2UoKSBhbmQKKyAg ICAgICAgdGhlIGNhY2hlZCBwYXJzZWQgc3R5bGVzaGVldCB3aWxsIG5vdCBiZSB1c2VkLgorCisg ICAgICAgIE5vIG5ldyB0ZXN0cywgbm90IGN1cnJlbnRseSB0ZXN0YWJsZS4KKworICAgICAgICAq IGNzcy9TdHlsZVNoZWV0Q29udGVudHMuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U3R5bGVTaGVl dENvbnRlbnRzOjpzdWJyZXNvdXJjZXNBbGxvd1JldXNlKToKKyAgICAgICAgKiBjc3MvU3R5bGVT aGVldENvbnRlbnRzLmg6CisgICAgICAgICogaHRtbC9IVE1MTGlua0VsZW1lbnQuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6SFRNTExpbmtFbGVtZW50OjpzZXRDU1NTdHlsZVNoZWV0KToKKyAgICAg ICAgKiBsb2FkZXIvY2FjaGUvQ2FjaGVkQ1NTU3R5bGVTaGVldC5jcHA6CisgICAgICAgIChXZWJD b3JlOjpDYWNoZWRDU1NTdHlsZVNoZWV0OjpyZXN0b3JlUGFyc2VkU3R5bGVTaGVldCk6CisgICAg ICAgICogbG9hZGVyL2NhY2hlL0NhY2hlZENTU1N0eWxlU2hlZXQuaDoKKwogMjAxNy0wNS0yMiAg WmFuIERvYmVyc2VrICA8emRvYmVyc2VrQGlnYWxpYS5jb20+CiAKICAgICAgICAgTmF2aWdhdG9y RU1FOiBudWxsIFJlZlB0cjw+IGRlcmVmZXJlbmNlIGR1ZSB0byBkaWZmZXJlbnQgY2FsbGluZyBj b252ZW50aW9ucwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlU2hlZXRDb250 ZW50cy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVTaGVldENvbnRlbnRzLmNwcAppbmRl eCBiMDZmMWQ2ZjEyNGM3NDBjNmE3OTU4NzE4NWRiMDI1ZWUxNTU1YWIzLi5mNmNhMDM4NjUyZjk1 MjAwNWMyZmNiMjA1Y2U0YjU3ZDgxNmFjZjc3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9j c3MvU3R5bGVTaGVldENvbnRlbnRzLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVT aGVldENvbnRlbnRzLmNwcApAQCAtMjYsMTAgKzI2LDEzIEBACiAjaW5jbHVkZSAiQ1NTU3R5bGVT aGVldC5oIgogI2luY2x1ZGUgIkNhY2hlZENTU1N0eWxlU2hlZXQuaCIKICNpbmNsdWRlICJEb2N1 bWVudC5oIgorI2luY2x1ZGUgIkZyYW1lLmgiCisjaW5jbHVkZSAiRnJhbWVMb2FkZXIuaCIKICNp bmNsdWRlICJNZWRpYUxpc3QuaCIKICNpbmNsdWRlICJOb2RlLmgiCiAjaW5jbHVkZSAiUGFnZS5o IgogI2luY2x1ZGUgIlBhZ2VDb25zb2xlQ2xpZW50LmgiCisjaW5jbHVkZSAiUmVzb3VyY2VMb2Fk SW5mby5oIgogI2luY2x1ZGUgIlJ1bGVTZXQuaCIKICNpbmNsdWRlICJTZWN1cml0eU9yaWdpbi5o IgogI2luY2x1ZGUgIlN0eWxlUHJvcGVydGllcy5oIgpAQCAtMzksNiArNDIsMTAgQEAKICNpbmNs dWRlIDx3dGYvTmV2ZXJEZXN0cm95ZWQuaD4KICNpbmNsdWRlIDx3dGYvUmVmLmg+CiAKKyNpZiBF TkFCTEUoQ09OVEVOVF9FWFRFTlNJT05TKQorI2luY2x1ZGUgIlVzZXJDb250ZW50Q29udHJvbGxl ci5oIgorI2VuZGlmCisKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogLy8gUm91Z2ggc2l6ZSBlc3Rp bWF0ZSBmb3IgdGhlIG1lbW9yeSBjYWNoZS4KQEAgLTQ4NywxNCArNDk0LDI5IEBAIGJvb2wgU3R5 bGVTaGVldENvbnRlbnRzOjp0cmF2ZXJzZVN1YnJlc291cmNlcyhjb25zdCBzdGQ6OmZ1bmN0aW9u PGJvb2wgKGNvbnN0IENhCiAgICAgcmV0dXJuIHRyYXZlcnNlU3VicmVzb3VyY2VzSW5SdWxlcyht X2NoaWxkUnVsZXMsIGhhbmRsZXIpOwogfQogCi1ib29sIFN0eWxlU2hlZXRDb250ZW50czo6c3Vi cmVzb3VyY2VzQWxsb3dSZXVzZShDYWNoZVBvbGljeSBjYWNoZVBvbGljeSkgY29uc3QKK2Jvb2wg U3R5bGVTaGVldENvbnRlbnRzOjpzdWJyZXNvdXJjZXNBbGxvd1JldXNlKENhY2hlUG9saWN5IGNh Y2hlUG9saWN5LCBGcmFtZUxvYWRlciYgbG9hZGVyKSBjb25zdAogewotICAgIGJvb2wgaGFzRmFp bGVkT3JFeHBpcmVkUmVzb3VyY2VzID0gdHJhdmVyc2VTdWJyZXNvdXJjZXMoW2NhY2hlUG9saWN5 XShjb25zdCBDYWNoZWRSZXNvdXJjZSYgcmVzb3VyY2UpIHsKKyAgICBib29sIGhhc0ZhaWxlZE9y RXhwaXJlZFJlc291cmNlcyA9IHRyYXZlcnNlU3VicmVzb3VyY2VzKFtjYWNoZVBvbGljeSwgJmxv YWRlcl0oY29uc3QgQ2FjaGVkUmVzb3VyY2UmIHJlc291cmNlKSB7CiAgICAgICAgIGlmIChyZXNv dXJjZS5sb2FkRmFpbGVkT3JDYW5jZWxlZCgpKQogICAgICAgICAgICAgcmV0dXJuIHRydWU7CiAg ICAgICAgIC8vIFdlIGNhbid0IHJldmFsaWRhdGUgc3VicmVzb3VyY2VzIGluZGl2aWR1YWxseSBz byBkb24ndCB1c2UgcmV1c2UgdGhlIHBhcnNlZCBzaGVldCBpZiB0aGV5IG5lZWQgcmV2YWxpZGF0 aW9uLgogICAgICAgICBpZiAocmVzb3VyY2UubWFrZVJldmFsaWRhdGlvbkRlY2lzaW9uKGNhY2hl UG9saWN5KSAhPSBDYWNoZWRSZXNvdXJjZTo6UmV2YWxpZGF0aW9uRGVjaXNpb246Ok5vKQogICAg ICAgICAgICAgcmV0dXJuIHRydWU7CisKKyNpZiBFTkFCTEUoQ09OVEVOVF9FWFRFTlNJT05TKQor ICAgICAgICAvLyBJZiBhIGNhY2hlZCBzdWJyZXNvdXJjZSBpcyBibG9ja2VkIGJ5IGEgY29udGVu dCBibG9ja2VyLCB3ZSBjYW5ub3QgcmV1c2UgdGhlIGNhY2hlZCBzdHlsZXNoZWV0LgorICAgICAg ICBhdXRvKiBwYWdlID0gbG9hZGVyLmZyYW1lKCkucGFnZSgpOworICAgICAgICBhdXRvKiBkb2N1 bWVudExvYWRlciA9IGxvYWRlci5kb2N1bWVudExvYWRlcigpOworICAgICAgICBpZiAocGFnZSAm JiBkb2N1bWVudExvYWRlcikgeworICAgICAgICAgICAgY29uc3QgYXV0byYgcmVxdWVzdCA9IHJl c291cmNlLnJlc291cmNlUmVxdWVzdCgpOworICAgICAgICAgICAgYXV0byBibG9ja2VkU3RhdHVz ID0gcGFnZS0+dXNlckNvbnRlbnRQcm92aWRlcigpLnByb2Nlc3NDb250ZW50RXh0ZW5zaW9uUnVs ZXNGb3JMb2FkKHJlcXVlc3QudXJsKCksIHRvUmVzb3VyY2VUeXBlKHJlc291cmNlLnR5cGUoKSks ICpkb2N1bWVudExvYWRlcik7CisgICAgICAgICAgICBpZiAoYmxvY2tlZFN0YXR1cy5ibG9ja2Vk TG9hZCkKKyAgICAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICAgICAgfQorI2Vsc2UKKyAg ICAgICAgVU5VU0VEX1BBUkFNKGxvYWRlcik7CisjZW5kaWYKKwogICAgICAgICByZXR1cm4gZmFs c2U7CiAgICAgfSk7CiAgICAgcmV0dXJuICFoYXNGYWlsZWRPckV4cGlyZWRSZXNvdXJjZXM7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVTaGVldENvbnRlbnRzLmggYi9Tb3Vy Y2UvV2ViQ29yZS9jc3MvU3R5bGVTaGVldENvbnRlbnRzLmgKaW5kZXggZGE2ZjY1OTFkMWIxZDQ0 MDZlMjJiNjEwOWFhNTIwODljZmQ1MDQ5Zi4uNjFhY2QwNTRhMzE5MzI0YmFkODNjODQ4MmM4ZGFm MTcwMzI5ODI5OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlU2hlZXRDb250 ZW50cy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZVNoZWV0Q29udGVudHMuaApAQCAt MzcsNiArMzcsNyBAQCBjbGFzcyBDU1NTdHlsZVNoZWV0OwogY2xhc3MgQ2FjaGVkQ1NTU3R5bGVT aGVldDsKIGNsYXNzIENhY2hlZFJlc291cmNlOwogY2xhc3MgRG9jdW1lbnQ7CitjbGFzcyBGcmFt ZUxvYWRlcjsKIGNsYXNzIE5vZGU7CiBjbGFzcyBTZWN1cml0eU9yaWdpbjsKIGNsYXNzIFN0eWxl UnVsZUJhc2U7CkBAIC03MSw3ICs3Miw3IEBAIHB1YmxpYzoKICAgICBib29sIGlzQ2FjaGVhYmxl KCkgY29uc3Q7CiAKICAgICBib29sIGlzTG9hZGluZygpIGNvbnN0OwotICAgIGJvb2wgc3VicmVz b3VyY2VzQWxsb3dSZXVzZShDYWNoZVBvbGljeSkgY29uc3Q7CisgICAgYm9vbCBzdWJyZXNvdXJj ZXNBbGxvd1JldXNlKENhY2hlUG9saWN5LCBGcmFtZUxvYWRlciYpIGNvbnN0OwogICAgIFdFQkNP UkVfRVhQT1JUIGJvb2wgaXNMb2FkaW5nU3VicmVzb3VyY2VzKCkgY29uc3Q7CiAKICAgICB2b2lk IGNoZWNrTG9hZGVkKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxMaW5r RWxlbWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxMaW5rRWxlbWVudC5jcHAKaW5k ZXggYTdkNWU3M2M0MTJiNDUwZmUzMTZmZGEyYmNmYzA4MDFkZDdkNDEzMi4uNTBlMmM3NWZjNmE3 MGRhMmU3Y2I1ZjY4NWI4NTU4M2Y2NjE0NzNmOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv aHRtbC9IVE1MTGlua0VsZW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTExp bmtFbGVtZW50LmNwcApAQCAtMzk1LDcgKzM5NSw3IEBAIHZvaWQgSFRNTExpbmtFbGVtZW50Ojpz ZXRDU1NTdHlsZVNoZWV0KGNvbnN0IFN0cmluZyYgaHJlZiwgY29uc3QgVVJMJiBiYXNlVVJMLCBj CiAgICAgQ1NTUGFyc2VyQ29udGV4dCBwYXJzZXJDb250ZXh0KGRvY3VtZW50KCksIGJhc2VVUkws IGNoYXJzZXQpOwogICAgIGF1dG8gY2FjaGVQb2xpY3kgPSBmcmFtZS0+bG9hZGVyKCkuc3VicmVz b3VyY2VDYWNoZVBvbGljeShiYXNlVVJMKTsKIAotICAgIGlmIChhdXRvIHJlc3RvcmVkU2hlZXQg PSBjb25zdF9jYXN0PENhY2hlZENTU1N0eWxlU2hlZXQqPihjYWNoZWRTdHlsZVNoZWV0KS0+cmVz dG9yZVBhcnNlZFN0eWxlU2hlZXQocGFyc2VyQ29udGV4dCwgY2FjaGVQb2xpY3kpKSB7CisgICAg aWYgKGF1dG8gcmVzdG9yZWRTaGVldCA9IGNvbnN0X2Nhc3Q8Q2FjaGVkQ1NTU3R5bGVTaGVldCo+ KGNhY2hlZFN0eWxlU2hlZXQpLT5yZXN0b3JlUGFyc2VkU3R5bGVTaGVldChwYXJzZXJDb250ZXh0 LCBjYWNoZVBvbGljeSwgZnJhbWUtPmxvYWRlcigpKSkgewogICAgICAgICBBU1NFUlQocmVzdG9y ZWRTaGVldC0+aXNDYWNoZWFibGUoKSk7CiAgICAgICAgIEFTU0VSVCghcmVzdG9yZWRTaGVldC0+ aXNMb2FkaW5nKCkpOwogICAgICAgICBpbml0aWFsaXplU3R5bGVTaGVldChyZXN0b3JlZFNoZWV0 LnJlbGVhc2VOb25OdWxsKCksICpjYWNoZWRTdHlsZVNoZWV0KTsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRDU1NTdHlsZVNoZWV0LmNwcCBiL1NvdXJjZS9X ZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRDU1NTdHlsZVNoZWV0LmNwcAppbmRleCAwNTkzODQ0 ZDNjOWFkM2FkZTM4YzNlMWJlMGYzYWViYTFmYTdmY2Y2Li44NTcxZjA5ZGI0OTMyMzc5NjM0ZDQ0 ZjQyOTVlNWE2MWQyYmRlYzg2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2Fj aGUvQ2FjaGVkQ1NTU3R5bGVTaGVldC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL2Nh Y2hlL0NhY2hlZENTU1N0eWxlU2hlZXQuY3BwCkBAIC0xNzQsMTEgKzE3NCwxMSBAQCB2b2lkIENh Y2hlZENTU1N0eWxlU2hlZXQ6OmRlc3Ryb3lEZWNvZGVkRGF0YSgpCiAgICAgc2V0RGVjb2RlZFNp emUoMCk7CiB9CiAKLVJlZlB0cjxTdHlsZVNoZWV0Q29udGVudHM+IENhY2hlZENTU1N0eWxlU2hl ZXQ6OnJlc3RvcmVQYXJzZWRTdHlsZVNoZWV0KGNvbnN0IENTU1BhcnNlckNvbnRleHQmIGNvbnRl eHQsIENhY2hlUG9saWN5IGNhY2hlUG9saWN5KQorUmVmUHRyPFN0eWxlU2hlZXRDb250ZW50cz4g Q2FjaGVkQ1NTU3R5bGVTaGVldDo6cmVzdG9yZVBhcnNlZFN0eWxlU2hlZXQoY29uc3QgQ1NTUGFy c2VyQ29udGV4dCYgY29udGV4dCwgQ2FjaGVQb2xpY3kgY2FjaGVQb2xpY3ksIEZyYW1lTG9hZGVy JiBsb2FkZXIpCiB7CiAgICAgaWYgKCFtX3BhcnNlZFN0eWxlU2hlZXRDYWNoZSkKICAgICAgICAg cmV0dXJuIG51bGxwdHI7Ci0gICAgaWYgKCFtX3BhcnNlZFN0eWxlU2hlZXRDYWNoZS0+c3VicmVz b3VyY2VzQWxsb3dSZXVzZShjYWNoZVBvbGljeSkpIHsKKyAgICBpZiAoIW1fcGFyc2VkU3R5bGVT aGVldENhY2hlLT5zdWJyZXNvdXJjZXNBbGxvd1JldXNlKGNhY2hlUG9saWN5LCBsb2FkZXIpKSB7 CiAgICAgICAgIG1fcGFyc2VkU3R5bGVTaGVldENhY2hlLT5yZW1vdmVkRnJvbU1lbW9yeUNhY2hl KCk7CiAgICAgICAgIG1fcGFyc2VkU3R5bGVTaGVldENhY2hlID0gbnVsbHB0cjsKICAgICAgICAg cmV0dXJuIG51bGxwdHI7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUv Q2FjaGVkQ1NTU3R5bGVTaGVldC5oIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hl ZENTU1N0eWxlU2hlZXQuaAppbmRleCAwMTI3MjljMGIxOGEyNWRiZGEwMWE0ZjQzYWU4MWMwODFh MmFhMmZjLi41MWZjY2ViZTU4MzY5OGFmNjRkOWI2OTFhODQzZjYwZTFkOWE4MWVlIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkQ1NTU3R5bGVTaGVldC5oCisr KyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRDU1NTdHlsZVNoZWV0LmgKQEAg LTI2LDYgKzI2LDcgQEAKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCitjbGFzcyBGcmFtZUxvYWRl cjsKIGNsYXNzIFN0eWxlU2hlZXRDb250ZW50czsKIGNsYXNzIFRleHRSZXNvdXJjZURlY29kZXI7 CiAKQEAgLTM5LDcgKzQwLDcgQEAgcHVibGljOgogICAgIGVudW0gY2xhc3MgTUlNRVR5cGVDaGVj a0hpbnQgeyBTdHJpY3QsIExheCB9OwogICAgIGNvbnN0IFN0cmluZyBzaGVldFRleHQoTUlNRVR5 cGVDaGVja0hpbnQgPSBNSU1FVHlwZUNoZWNrSGludDo6U3RyaWN0LCBib29sKiBoYXNWYWxpZE1J TUVUeXBlID0gbnVsbHB0cikgY29uc3Q7CiAKLSAgICBSZWZQdHI8U3R5bGVTaGVldENvbnRlbnRz PiByZXN0b3JlUGFyc2VkU3R5bGVTaGVldChjb25zdCBDU1NQYXJzZXJDb250ZXh0JiwgQ2FjaGVQ b2xpY3kpOworICAgIFJlZlB0cjxTdHlsZVNoZWV0Q29udGVudHM+IHJlc3RvcmVQYXJzZWRTdHls ZVNoZWV0KGNvbnN0IENTU1BhcnNlckNvbnRleHQmLCBDYWNoZVBvbGljeSwgRnJhbWVMb2FkZXIm KTsKICAgICB2b2lkIHNhdmVQYXJzZWRTdHlsZVNoZWV0KFJlZjxTdHlsZVNoZWV0Q29udGVudHM+ JiYpOwogCiAjaWYgRU5BQkxFKE5PU05JRkYpCg== 310936 2017-05-22 15:21:48 -0700 2017-05-22 16:27:20 -0700 Patch bug-172468-20170522152147.patch text/plain 7803 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjE3MjUwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMGQ0ODE4M2Q0ZTFhMzIw MTlhNGJkZTBkNWNhNjFjZTM3MGZkZDJjNC4uYTg5MTM3YzY0ZjUyYTFjN2MwYWJhNzE1ZDQzYTQw OTQxYTA0MjQwNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDE3LTA1LTIyICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgUmVzb3VyY2VzIGluIGNhY2hl ZCBwYXJzZWQgc3R5bGVzaGVldHMgbWF5IGJ5cGFzcyBjb250ZW50IGJsb2NrZXJzCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzI0NjgKKyAgICAgICAg PHJkYXI6Ly9wcm9ibGVtLzMxOTcyNjkzPgorCisgICAgICAgIFJldmlld2VkIGJ5IEdlb2ZmcmV5 IEdhcmVuLgorCisgICAgICAgIFJlc291cmNlcyBpbiBjYWNoZWQgcGFyc2VkIHN0eWxlc2hlZXRz IGNvdWxkIGJ5cGFzcyBjb250ZW50IGJsb2NrZXJzIHdoZW4gdGhleSB3ZXJlIGluIHRoZSBtZW1v cnkgY2FjaGUgYW5kCisgICAgICAgIHRoZXkgZGlkIG5vdCBuZWVkIHJldmFsaWRhdGlvbi4KKwor ICAgICAgICBUbyBhZGRyZXNzIHRoZSBpc3N1ZSwgSSBtYWRlIFN0eWxlU2hlZXRDb250ZW50czo6 c3VicmVzb3VyY2VzQWxsb3dSZXVzZSgpIHRvIGNoZWNrIGNvbnRlbnQgYmxvY2tlcnMuCisgICAg ICAgIElmIGEgc3VicmVzb3VyY2UgaW4gdGhlIGNhY2hlZCBzdHlsZXNoZWV0IGlzIGJsb2NrZWQs IHRoZW4gd2UgcmV0dXJuIGZhbHNlIGluIHN1YnJlc291cmNlc0FsbG93UmV1c2UoKSBhbmQKKyAg ICAgICAgdGhlIGNhY2hlZCBwYXJzZWQgc3R5bGVzaGVldCB3aWxsIG5vdCBiZSB1c2VkLgorCisg ICAgICAgIE5vIG5ldyB0ZXN0cywgbm90IGN1cnJlbnRseSB0ZXN0YWJsZS4KKworICAgICAgICAq IGNzcy9TdHlsZVNoZWV0Q29udGVudHMuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U3R5bGVTaGVl dENvbnRlbnRzOjpzdWJyZXNvdXJjZXNBbGxvd1JldXNlKToKKyAgICAgICAgKiBjc3MvU3R5bGVT aGVldENvbnRlbnRzLmg6CisgICAgICAgICogaHRtbC9IVE1MTGlua0VsZW1lbnQuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6SFRNTExpbmtFbGVtZW50OjpzZXRDU1NTdHlsZVNoZWV0KToKKyAgICAg ICAgKiBsb2FkZXIvY2FjaGUvQ2FjaGVkQ1NTU3R5bGVTaGVldC5jcHA6CisgICAgICAgIChXZWJD b3JlOjpDYWNoZWRDU1NTdHlsZVNoZWV0OjpyZXN0b3JlUGFyc2VkU3R5bGVTaGVldCk6CisgICAg ICAgICogbG9hZGVyL2NhY2hlL0NhY2hlZENTU1N0eWxlU2hlZXQuaDoKKwogMjAxNy0wNS0yMiAg QnJpYW4gQnVyZyAgPGJidXJnQGFwcGxlLmNvbT4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiB3 ZWJraXQgcmVsb2FkIHBvbGljeSBzaG91bGQgbWF0Y2ggZGVmYXVsdCBiZWhhdmlvcgpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlU2hlZXRDb250ZW50cy5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9jc3MvU3R5bGVTaGVldENvbnRlbnRzLmNwcAppbmRleCBiMDZmMWQ2ZjEyNGM3NDBj NmE3OTU4NzE4NWRiMDI1ZWUxNTU1YWIzLi45NWVlM2I5ZWUxYjk5ZmJlNTJlZWEwYWExN2FiMTJi MDMzNWNmZWQyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVTaGVldENvbnRl bnRzLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVTaGVldENvbnRlbnRzLmNwcApA QCAtMjYsMTAgKzI2LDEzIEBACiAjaW5jbHVkZSAiQ1NTU3R5bGVTaGVldC5oIgogI2luY2x1ZGUg IkNhY2hlZENTU1N0eWxlU2hlZXQuaCIKICNpbmNsdWRlICJEb2N1bWVudC5oIgorI2luY2x1ZGUg IkZyYW1lLmgiCisjaW5jbHVkZSAiRnJhbWVMb2FkZXIuaCIKICNpbmNsdWRlICJNZWRpYUxpc3Qu aCIKICNpbmNsdWRlICJOb2RlLmgiCiAjaW5jbHVkZSAiUGFnZS5oIgogI2luY2x1ZGUgIlBhZ2VD b25zb2xlQ2xpZW50LmgiCisjaW5jbHVkZSAiUmVzb3VyY2VMb2FkSW5mby5oIgogI2luY2x1ZGUg IlJ1bGVTZXQuaCIKICNpbmNsdWRlICJTZWN1cml0eU9yaWdpbi5oIgogI2luY2x1ZGUgIlN0eWxl UHJvcGVydGllcy5oIgpAQCAtMzksNiArNDIsMTAgQEAKICNpbmNsdWRlIDx3dGYvTmV2ZXJEZXN0 cm95ZWQuaD4KICNpbmNsdWRlIDx3dGYvUmVmLmg+CiAKKyNpZiBFTkFCTEUoQ09OVEVOVF9FWFRF TlNJT05TKQorI2luY2x1ZGUgIlVzZXJDb250ZW50Q29udHJvbGxlci5oIgorI2VuZGlmCisKIG5h bWVzcGFjZSBXZWJDb3JlIHsKIAogLy8gUm91Z2ggc2l6ZSBlc3RpbWF0ZSBmb3IgdGhlIG1lbW9y eSBjYWNoZS4KQEAgLTQ4NywxNCArNDk0LDI5IEBAIGJvb2wgU3R5bGVTaGVldENvbnRlbnRzOjp0 cmF2ZXJzZVN1YnJlc291cmNlcyhjb25zdCBzdGQ6OmZ1bmN0aW9uPGJvb2wgKGNvbnN0IENhCiAg ICAgcmV0dXJuIHRyYXZlcnNlU3VicmVzb3VyY2VzSW5SdWxlcyhtX2NoaWxkUnVsZXMsIGhhbmRs ZXIpOwogfQogCi1ib29sIFN0eWxlU2hlZXRDb250ZW50czo6c3VicmVzb3VyY2VzQWxsb3dSZXVz ZShDYWNoZVBvbGljeSBjYWNoZVBvbGljeSkgY29uc3QKK2Jvb2wgU3R5bGVTaGVldENvbnRlbnRz OjpzdWJyZXNvdXJjZXNBbGxvd1JldXNlKENhY2hlUG9saWN5IGNhY2hlUG9saWN5LCBGcmFtZUxv YWRlciYgbG9hZGVyKSBjb25zdAogewotICAgIGJvb2wgaGFzRmFpbGVkT3JFeHBpcmVkUmVzb3Vy Y2VzID0gdHJhdmVyc2VTdWJyZXNvdXJjZXMoW2NhY2hlUG9saWN5XShjb25zdCBDYWNoZWRSZXNv dXJjZSYgcmVzb3VyY2UpIHsKKyAgICBib29sIGhhc0ZhaWxlZE9yRXhwaXJlZFJlc291cmNlcyA9 IHRyYXZlcnNlU3VicmVzb3VyY2VzKFtjYWNoZVBvbGljeSwgJmxvYWRlcl0oY29uc3QgQ2FjaGVk UmVzb3VyY2UmIHJlc291cmNlKSB7CiAgICAgICAgIGlmIChyZXNvdXJjZS5sb2FkRmFpbGVkT3JD YW5jZWxlZCgpKQogICAgICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgICAgIC8vIFdlIGNhbid0 IHJldmFsaWRhdGUgc3VicmVzb3VyY2VzIGluZGl2aWR1YWxseSBzbyBkb24ndCB1c2UgcmV1c2Ug dGhlIHBhcnNlZCBzaGVldCBpZiB0aGV5IG5lZWQgcmV2YWxpZGF0aW9uLgogICAgICAgICBpZiAo cmVzb3VyY2UubWFrZVJldmFsaWRhdGlvbkRlY2lzaW9uKGNhY2hlUG9saWN5KSAhPSBDYWNoZWRS ZXNvdXJjZTo6UmV2YWxpZGF0aW9uRGVjaXNpb246Ok5vKQogICAgICAgICAgICAgcmV0dXJuIHRy dWU7CisKKyNpZiBFTkFCTEUoQ09OVEVOVF9FWFRFTlNJT05TKQorICAgICAgICAvLyBJZiBhIGNh Y2hlZCBzdWJyZXNvdXJjZSBpcyBibG9ja2VkIG9yIG1hZGUgSFRUUFMgYnkgYSBjb250ZW50IGJs b2NrZXIsIHdlIGNhbm5vdCByZXVzZSB0aGUgY2FjaGVkIHN0eWxlc2hlZXQuCisgICAgICAgIGF1 dG8qIHBhZ2UgPSBsb2FkZXIuZnJhbWUoKS5wYWdlKCk7CisgICAgICAgIGF1dG8qIGRvY3VtZW50 TG9hZGVyID0gbG9hZGVyLmRvY3VtZW50TG9hZGVyKCk7CisgICAgICAgIGlmIChwYWdlICYmIGRv Y3VtZW50TG9hZGVyKSB7CisgICAgICAgICAgICBjb25zdCBhdXRvJiByZXF1ZXN0ID0gcmVzb3Vy Y2UucmVzb3VyY2VSZXF1ZXN0KCk7CisgICAgICAgICAgICBhdXRvIGJsb2NrZWRTdGF0dXMgPSBw YWdlLT51c2VyQ29udGVudFByb3ZpZGVyKCkucHJvY2Vzc0NvbnRlbnRFeHRlbnNpb25SdWxlc0Zv ckxvYWQocmVxdWVzdC51cmwoKSwgdG9SZXNvdXJjZVR5cGUocmVzb3VyY2UudHlwZSgpKSwgKmRv Y3VtZW50TG9hZGVyKTsKKyAgICAgICAgICAgIGlmIChibG9ja2VkU3RhdHVzLmJsb2NrZWRMb2Fk IHx8IGJsb2NrZWRTdGF0dXMubWFkZUhUVFBTKQorICAgICAgICAgICAgICAgIHJldHVybiB0cnVl OworICAgICAgICB9CisjZWxzZQorICAgICAgICBVTlVTRURfUEFSQU0obG9hZGVyKTsKKyNlbmRp ZgorCiAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICB9KTsKICAgICByZXR1cm4gIWhhc0ZhaWxl ZE9yRXhwaXJlZFJlc291cmNlczsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHls ZVNoZWV0Q29udGVudHMuaCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZVNoZWV0Q29udGVudHMu aAppbmRleCBkYTZmNjU5MWQxYjFkNDQwNmUyMmI2MTA5YWE1MjA4OWNmZDUwNDlmLi42MWFjZDA1 NGEzMTkzMjRiYWQ4M2M4NDgyYzhkYWYxNzAzMjk4Mjk5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9jc3MvU3R5bGVTaGVldENvbnRlbnRzLmgKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL1N0 eWxlU2hlZXRDb250ZW50cy5oCkBAIC0zNyw2ICszNyw3IEBAIGNsYXNzIENTU1N0eWxlU2hlZXQ7 CiBjbGFzcyBDYWNoZWRDU1NTdHlsZVNoZWV0OwogY2xhc3MgQ2FjaGVkUmVzb3VyY2U7CiBjbGFz cyBEb2N1bWVudDsKK2NsYXNzIEZyYW1lTG9hZGVyOwogY2xhc3MgTm9kZTsKIGNsYXNzIFNlY3Vy aXR5T3JpZ2luOwogY2xhc3MgU3R5bGVSdWxlQmFzZTsKQEAgLTcxLDcgKzcyLDcgQEAgcHVibGlj OgogICAgIGJvb2wgaXNDYWNoZWFibGUoKSBjb25zdDsKIAogICAgIGJvb2wgaXNMb2FkaW5nKCkg Y29uc3Q7Ci0gICAgYm9vbCBzdWJyZXNvdXJjZXNBbGxvd1JldXNlKENhY2hlUG9saWN5KSBjb25z dDsKKyAgICBib29sIHN1YnJlc291cmNlc0FsbG93UmV1c2UoQ2FjaGVQb2xpY3ksIEZyYW1lTG9h ZGVyJikgY29uc3Q7CiAgICAgV0VCQ09SRV9FWFBPUlQgYm9vbCBpc0xvYWRpbmdTdWJyZXNvdXJj ZXMoKSBjb25zdDsKIAogICAgIHZvaWQgY2hlY2tMb2FkZWQoKTsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2h0bWwvSFRNTExpbmtFbGVtZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwv SFRNTExpbmtFbGVtZW50LmNwcAppbmRleCAyMmU0YzkyOGMyOWZjMDI2NzFhODFhMmY0ZTUxNDE5 NzI3YmQ2ZjE5Li5mNzAyOTMxODU0Nzc4MDU4Y2E3OWQ3ODE1MzViMmE0MThlNDAwNzEyIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxMaW5rRWxlbWVudC5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvaHRtbC9IVE1MTGlua0VsZW1lbnQuY3BwCkBAIC0zOTUsNyArMzk1LDcgQEAg dm9pZCBIVE1MTGlua0VsZW1lbnQ6OnNldENTU1N0eWxlU2hlZXQoY29uc3QgU3RyaW5nJiBocmVm LCBjb25zdCBVUkwmIGJhc2VVUkwsIGMKICAgICBDU1NQYXJzZXJDb250ZXh0IHBhcnNlckNvbnRl eHQoZG9jdW1lbnQoKSwgYmFzZVVSTCwgY2hhcnNldCk7CiAgICAgYXV0byBjYWNoZVBvbGljeSA9 IGZyYW1lLT5sb2FkZXIoKS5zdWJyZXNvdXJjZUNhY2hlUG9saWN5KGJhc2VVUkwpOwogCi0gICAg aWYgKGF1dG8gcmVzdG9yZWRTaGVldCA9IGNvbnN0X2Nhc3Q8Q2FjaGVkQ1NTU3R5bGVTaGVldCo+ KGNhY2hlZFN0eWxlU2hlZXQpLT5yZXN0b3JlUGFyc2VkU3R5bGVTaGVldChwYXJzZXJDb250ZXh0 LCBjYWNoZVBvbGljeSkpIHsKKyAgICBpZiAoYXV0byByZXN0b3JlZFNoZWV0ID0gY29uc3RfY2Fz dDxDYWNoZWRDU1NTdHlsZVNoZWV0Kj4oY2FjaGVkU3R5bGVTaGVldCktPnJlc3RvcmVQYXJzZWRT dHlsZVNoZWV0KHBhcnNlckNvbnRleHQsIGNhY2hlUG9saWN5LCBmcmFtZS0+bG9hZGVyKCkpKSB7 CiAgICAgICAgIEFTU0VSVChyZXN0b3JlZFNoZWV0LT5pc0NhY2hlYWJsZSgpKTsKICAgICAgICAg QVNTRVJUKCFyZXN0b3JlZFNoZWV0LT5pc0xvYWRpbmcoKSk7CiAgICAgICAgIGluaXRpYWxpemVT dHlsZVNoZWV0KHJlc3RvcmVkU2hlZXQucmVsZWFzZU5vbk51bGwoKSwgKmNhY2hlZFN0eWxlU2hl ZXQpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZENTU1N0 eWxlU2hlZXQuY3BwIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZENTU1N0eWxl U2hlZXQuY3BwCmluZGV4IDA1OTM4NDRkM2M5YWQzYWRlMzhjM2UxYmUwZjNhZWJhMWZhN2ZjZjYu Ljg1NzFmMDlkYjQ5MzIzNzk2MzRkNDRmNDI5NWU1YTYxZDJiZGVjODYgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRDU1NTdHlsZVNoZWV0LmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkQ1NTU3R5bGVTaGVldC5jcHAKQEAgLTE3 NCwxMSArMTc0LDExIEBAIHZvaWQgQ2FjaGVkQ1NTU3R5bGVTaGVldDo6ZGVzdHJveURlY29kZWRE YXRhKCkKICAgICBzZXREZWNvZGVkU2l6ZSgwKTsKIH0KIAotUmVmUHRyPFN0eWxlU2hlZXRDb250 ZW50cz4gQ2FjaGVkQ1NTU3R5bGVTaGVldDo6cmVzdG9yZVBhcnNlZFN0eWxlU2hlZXQoY29uc3Qg Q1NTUGFyc2VyQ29udGV4dCYgY29udGV4dCwgQ2FjaGVQb2xpY3kgY2FjaGVQb2xpY3kpCitSZWZQ dHI8U3R5bGVTaGVldENvbnRlbnRzPiBDYWNoZWRDU1NTdHlsZVNoZWV0OjpyZXN0b3JlUGFyc2Vk U3R5bGVTaGVldChjb25zdCBDU1NQYXJzZXJDb250ZXh0JiBjb250ZXh0LCBDYWNoZVBvbGljeSBj YWNoZVBvbGljeSwgRnJhbWVMb2FkZXImIGxvYWRlcikKIHsKICAgICBpZiAoIW1fcGFyc2VkU3R5 bGVTaGVldENhY2hlKQogICAgICAgICByZXR1cm4gbnVsbHB0cjsKLSAgICBpZiAoIW1fcGFyc2Vk U3R5bGVTaGVldENhY2hlLT5zdWJyZXNvdXJjZXNBbGxvd1JldXNlKGNhY2hlUG9saWN5KSkgewor ICAgIGlmICghbV9wYXJzZWRTdHlsZVNoZWV0Q2FjaGUtPnN1YnJlc291cmNlc0FsbG93UmV1c2Uo Y2FjaGVQb2xpY3ksIGxvYWRlcikpIHsKICAgICAgICAgbV9wYXJzZWRTdHlsZVNoZWV0Q2FjaGUt PnJlbW92ZWRGcm9tTWVtb3J5Q2FjaGUoKTsKICAgICAgICAgbV9wYXJzZWRTdHlsZVNoZWV0Q2Fj aGUgPSBudWxscHRyOwogICAgICAgICByZXR1cm4gbnVsbHB0cjsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRDU1NTdHlsZVNoZWV0LmggYi9Tb3VyY2UvV2Vi Q29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkQ1NTU3R5bGVTaGVldC5oCmluZGV4IDAxMjcyOWMwYjE4 YTI1ZGJkYTAxYTRmNDNhZTgxYzA4MWEyYWEyZmMuLjUxZmNjZWJlNTgzNjk4YWY2NGQ5YjY5MWE4 NDNmNjBlMWQ5YTgxZWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9D YWNoZWRDU1NTdHlsZVNoZWV0LmgKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0Nh Y2hlZENTU1N0eWxlU2hlZXQuaApAQCAtMjYsNiArMjYsNyBAQAogCiBuYW1lc3BhY2UgV2ViQ29y ZSB7CiAKK2NsYXNzIEZyYW1lTG9hZGVyOwogY2xhc3MgU3R5bGVTaGVldENvbnRlbnRzOwogY2xh c3MgVGV4dFJlc291cmNlRGVjb2RlcjsKIApAQCAtMzksNyArNDAsNyBAQCBwdWJsaWM6CiAgICAg ZW51bSBjbGFzcyBNSU1FVHlwZUNoZWNrSGludCB7IFN0cmljdCwgTGF4IH07CiAgICAgY29uc3Qg U3RyaW5nIHNoZWV0VGV4dChNSU1FVHlwZUNoZWNrSGludCA9IE1JTUVUeXBlQ2hlY2tIaW50OjpT dHJpY3QsIGJvb2wqIGhhc1ZhbGlkTUlNRVR5cGUgPSBudWxscHRyKSBjb25zdDsKIAotICAgIFJl ZlB0cjxTdHlsZVNoZWV0Q29udGVudHM+IHJlc3RvcmVQYXJzZWRTdHlsZVNoZWV0KGNvbnN0IENT U1BhcnNlckNvbnRleHQmLCBDYWNoZVBvbGljeSk7CisgICAgUmVmUHRyPFN0eWxlU2hlZXRDb250 ZW50cz4gcmVzdG9yZVBhcnNlZFN0eWxlU2hlZXQoY29uc3QgQ1NTUGFyc2VyQ29udGV4dCYsIENh Y2hlUG9saWN5LCBGcmFtZUxvYWRlciYpOwogICAgIHZvaWQgc2F2ZVBhcnNlZFN0eWxlU2hlZXQo UmVmPFN0eWxlU2hlZXRDb250ZW50cz4mJik7CiAKICNpZiBFTkFCTEUoTk9TTklGRikK