173976 2017-06-29 10:53:51 -0700 Slight clean up of WebResourceLoadStatisticsStore 2017-06-29 12:51:10 -0700 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 cdumez cdumez bfulgham commit-queue ggaren sam wilander oldest_to_newest 1323989 0 cdumez 2017-06-29 10:53:51 -0700 Slight clean up of WebResourceLoadStatisticsStore. 1323998 1 314143 cdumez 2017-06-29 10:58:36 -0700 Created attachment 314143 Patch 1324006 2 314145 cdumez 2017-06-29 11:13:05 -0700 Created attachment 314145 Patch 1324020 3 314145 bfulgham 2017-06-29 11:48:50 -0700 Comment on attachment 314145 Patch r=me. I'm not sure why the WPE bot is red though. Doesn't seem like your changes should have affected it. 1324023 4 cdumez 2017-06-29 11:49:59 -0700 (In reply to Brent Fulgham from comment #3) > Comment on attachment 314145 [details] > Patch > > r=me. I'm not sure why the WPE bot is red though. Doesn't seem like your > changes should have affected it. ource/WebKit2/CMakeFiles/WebKit2.dir/UIProcess/WebResourceLoadStatisticsStore.cpp.o.d -o Source/WebKit2/CMakeFiles/WebKit2.dir/UIProcess/WebResourceLoadStatisticsStore.cpp.o -c /home/ews/igalia-wpe-ews/WebKit/Source/WebKit2/UIProcess/WebResourceLoadStatisticsStore.cpp /home/ews/igalia-wpe-ews/WebKit/Source/WebKit2/UIProcess/WebResourceLoadStatisticsStore.cpp: In function 'const WTF::OptionSet<WebKit::WebsiteDataType>& WebKit::dataTypesToRemove()': /home/ews/igalia-wpe-ews/WebKit/Source/WebKit2/UIProcess/WebResourceLoadStatisticsStore.cpp:62:103: error: variable 'WTF::NeverDestroyed<WTF::OptionSet<WebKit::WebsiteDataType> > dataTypes' has initializer but incomplete type Will fix before landing. 1324026 5 314148 cdumez 2017-06-29 11:52:58 -0700 Created attachment 314148 Patch 1324054 6 314148 commit-queue 2017-06-29 12:51:09 -0700 Comment on attachment 314148 Patch Clearing flags on attachment: 314148 Committed r218958: <http://trac.webkit.org/changeset/218958> 1324055 7 commit-queue 2017-06-29 12:51:10 -0700 All reviewed patches have been landed. Closing bug. 314143 2017-06-29 10:58:36 -0700 2017-06-29 11:13:04 -0700 Patch bug-173976-20170629105836.patch text/plain 10073 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjE4OTIzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggNDM5ZjU2NzgzNWM5OWMx YWM2MDk4YTk3OWNmMmUyYmZmYTc4NGI0Yi4uMGE1YWIwMDgxMzVmYTZkMDZjZDMyNjRhMzY2NTc1 YjFlODk3YzdhNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDE3LTA2LTI5ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgU2xpZ2h0IGNsZWFuIHVwIG9m IFdlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZQorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTczOTc2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUmVzb3VyY2VMb2FkU3RhdGlz dGljc1N0b3JlLmNwcDoKKyAgICAgICAgKFdlYktpdDo6ZGF0YVR5cGVzVG9SZW1vdmUpOgorICAg ICAgICAoV2ViS2l0OjpXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OmNsYXNzaWZ5UmVz b3VyY2UpOgorICAgICAgICAoV2ViS2l0OjpXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6 OnJlbW92ZURhdGFSZWNvcmRzKToKKyAgICAgICAgKFdlYktpdDo6V2ViUmVzb3VyY2VMb2FkU3Rh dGlzdGljc1N0b3JlOjpzZXRSZXNvdXJjZUxvYWRTdGF0aXN0aWNzRW5hYmxlZCk6CisgICAgICAg IChXZWJLaXQ6OldlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6cmVnaXN0ZXJTaGFyZWRS ZXNvdXJjZUxvYWRPYnNlcnZlcik6CisgICAgICAgIChXZWJLaXQ6OldlYlJlc291cmNlTG9hZFN0 YXRpc3RpY3NTdG9yZTo6Z3JhbmRmYXRoZXJFeGlzdGluZ1dlYnNpdGVEYXRhKToKKyAgICAgICAg KFdlYktpdDo6V2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjpzdG9wTW9uaXRvcmluZ1N0 YXRpc3RpY3NTdG9yYWdlKToKKyAgICAgICAgKFdlYktpdDo6aW5pdGlhbGl6ZURhdGFUeXBlc1Rv UmVtb3ZlKTogRGVsZXRlZC4KKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUmVzb3VyY2VMb2FkU3Rh dGlzdGljc1N0b3JlLmg6CisgICAgICAgIChXZWJLaXQ6OldlYlJlc291cmNlTG9hZFN0YXRpc3Rp Y3NTdG9yZTo6Y29yZVN0b3JlKTogRGVsZXRlZC4KKwogMjAxNy0wNi0yOSAgQ2FybG9zIEdhcmNp YSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZC4gRml4 IEdUSysgdW5pdCB0ZXN0cyBjcmFzaGluZyBhZnRlciByMjE4OTIyLgpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5jcHAg Yi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3Jl LmNwcAppbmRleCA2Zjk5MjM2MjYwYzg4MTY2YmVmMzIwZmM4NmNkNWQ1NWRkMzg3NWYxLi4zYzNl NzIxMTMzOWY1YmIxNDQwZTE5MmU1NTg1Nzc3ZTBhYjk5NDcwIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlLmNwcAorKysg Yi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3Jl LmNwcApAQCAtNTQsOSArNTQsMzIgQEAgdXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7CiAKIG5hbWVz cGFjZSBXZWJLaXQgewogCi1zdGF0aWMgT3B0aW9uU2V0PFdlYktpdDo6V2Vic2l0ZURhdGFUeXBl PiBkYXRhVHlwZXNUb1JlbW92ZTsKLXN0YXRpYyBhdXRvIG5vdGlmeVBhZ2VzV2hlbkRhdGFSZWNv cmRzV2VyZVNjYW5uZWQgPSBmYWxzZTsKLXN0YXRpYyBhdXRvIHNob3VsZENsYXNzaWZ5UmVzb3Vy Y2VzQmVmb3JlRGF0YVJlY29yZHNSZW1vdmFsID0gdHJ1ZTsKK3N0YXRpYyBib29sIG5vdGlmeVBh Z2VzV2hlbkRhdGFSZWNvcmRzV2VyZVNjYW5uZWQgPSBmYWxzZTsKK3N0YXRpYyBib29sIHNob3Vs ZENsYXNzaWZ5UmVzb3VyY2VzQmVmb3JlRGF0YVJlY29yZHNSZW1vdmFsID0gdHJ1ZTsKKworc3Rh dGljIE9wdGlvblNldDxXZWJLaXQ6OldlYnNpdGVEYXRhVHlwZT4mIGRhdGFUeXBlc1RvUmVtb3Zl KCkKK3sKKyAgICBzdGF0aWMgTmV2ZXJEZXN0cm95ZWQ8T3B0aW9uU2V0PFdlYnNpdGVEYXRhVHlw ZT4+IGRhdGFUeXBlcyhzdGQ6OmluaXRpYWxpemVyX2xpc3Q8V2Vic2l0ZURhdGFUeXBlPih7Cisg ICAgICAgIFdlYnNpdGVEYXRhVHlwZTo6Q29va2llcywKKyAgICAgICAgV2Vic2l0ZURhdGFUeXBl OjpJbmRleGVkREJEYXRhYmFzZXMsCisgICAgICAgIFdlYnNpdGVEYXRhVHlwZTo6TG9jYWxTdG9y YWdlLAorI2lmIEVOQUJMRShNRURJQV9TVFJFQU0pCisgICAgICAgIFdlYnNpdGVEYXRhVHlwZTo6 TWVkaWFEZXZpY2VJZGVudGlmaWVyLAorI2VuZGlmCisgICAgICAgIFdlYnNpdGVEYXRhVHlwZTo6 TWVkaWFLZXlzLAorICAgICAgICBXZWJzaXRlRGF0YVR5cGU6Ok9mZmxpbmVXZWJBcHBsaWNhdGlv bkNhY2hlLAorI2lmIEVOQUJMRShORVRTQ0FQRV9QTFVHSU5fQVBJKQorICAgICAgICBXZWJzaXRl RGF0YVR5cGU6OlBsdWdJbkRhdGEsCisjZW5kaWYKKyAgICAgICAgV2Vic2l0ZURhdGFUeXBlOjpT ZWFyY2hGaWVsZFJlY2VudFNlYXJjaGVzLAorICAgICAgICBXZWJzaXRlRGF0YVR5cGU6OlNlc3Np b25TdG9yYWdlLAorICAgICAgICBXZWJzaXRlRGF0YVR5cGU6OldlYlNRTERhdGFiYXNlcywKKyAg ICB9KSk7CisKKyAgICBBU1NFUlQoUnVuTG9vcDo6aXNNYWluKCkpOworCisgICAgcmV0dXJuIGRh dGFUeXBlczsKK30KIAogUmVmPFdlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZT4gV2ViUmVz b3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjpjcmVhdGUoY29uc3QgU3RyaW5nJiByZXNvdXJjZUxv YWRTdGF0aXN0aWNzRGlyZWN0b3J5KQogewpAQCAtOTAsMjggKzExMyw5IEBAIHZvaWQgV2ViUmVz b3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjpzZXRTaG91bGRDbGFzc2lmeVJlc291cmNlc0JlZm9y ZURhdGFSZWNvcmRzCiAKIHZvaWQgV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjpjbGFz c2lmeVJlc291cmNlKFJlc291cmNlTG9hZFN0YXRpc3RpY3MmIHJlc291cmNlU3RhdGlzdGljKQog ewotICAgIGlmICghcmVzb3VyY2VTdGF0aXN0aWMuaXNQcmV2YWxlbnRSZXNvdXJjZQotICAgICAg ICAmJiBtX3Jlc291cmNlTG9hZFN0YXRpc3RpY3NDbGFzc2lmaWVyLmhhc1ByZXZhbGVudFJlc291 cmNlQ2hhcmFjdGVyaXN0aWNzKHJlc291cmNlU3RhdGlzdGljKSkKKyAgICBpZiAoIXJlc291cmNl U3RhdGlzdGljLmlzUHJldmFsZW50UmVzb3VyY2UgJiYgbV9yZXNvdXJjZUxvYWRTdGF0aXN0aWNz Q2xhc3NpZmllci5oYXNQcmV2YWxlbnRSZXNvdXJjZUNoYXJhY3RlcmlzdGljcyhyZXNvdXJjZVN0 YXRpc3RpYykpCiAgICAgICAgIHJlc291cmNlU3RhdGlzdGljLmlzUHJldmFsZW50UmVzb3VyY2Ug PSB0cnVlOwogfQotCi1zdGF0aWMgaW5saW5lIHZvaWQgaW5pdGlhbGl6ZURhdGFUeXBlc1RvUmVt b3ZlKCkKLXsKLSAgICBkYXRhVHlwZXNUb1JlbW92ZSB8PSBXZWJzaXRlRGF0YVR5cGU6OkNvb2tp ZXM7Ci0gICAgZGF0YVR5cGVzVG9SZW1vdmUgfD0gV2Vic2l0ZURhdGFUeXBlOjpPZmZsaW5lV2Vi QXBwbGljYXRpb25DYWNoZTsKLSAgICBkYXRhVHlwZXNUb1JlbW92ZSB8PSBXZWJzaXRlRGF0YVR5 cGU6OlNlc3Npb25TdG9yYWdlOwotICAgIGRhdGFUeXBlc1RvUmVtb3ZlIHw9IFdlYnNpdGVEYXRh VHlwZTo6TG9jYWxTdG9yYWdlOwotICAgIGRhdGFUeXBlc1RvUmVtb3ZlIHw9IFdlYnNpdGVEYXRh VHlwZTo6V2ViU1FMRGF0YWJhc2VzOwotICAgIGRhdGFUeXBlc1RvUmVtb3ZlIHw9IFdlYnNpdGVE YXRhVHlwZTo6SW5kZXhlZERCRGF0YWJhc2VzOwotICAgIGRhdGFUeXBlc1RvUmVtb3ZlIHw9IFdl YnNpdGVEYXRhVHlwZTo6TWVkaWFLZXlzOwotICAgIGRhdGFUeXBlc1RvUmVtb3ZlIHw9IFdlYnNp dGVEYXRhVHlwZTo6U2VhcmNoRmllbGRSZWNlbnRTZWFyY2hlczsKLSNpZiBFTkFCTEUoTkVUU0NB UEVfUExVR0lOX0FQSSkKLSAgICBkYXRhVHlwZXNUb1JlbW92ZSB8PSBXZWJzaXRlRGF0YVR5cGU6 OlBsdWdJbkRhdGE7Ci0jZW5kaWYKLSNpZiBFTkFCTEUoTUVESUFfU1RSRUFNKQotICAgIGRhdGFU eXBlc1RvUmVtb3ZlIHw9IFdlYnNpdGVEYXRhVHlwZTo6TWVkaWFEZXZpY2VJZGVudGlmaWVyOwot I2VuZGlmCi19CiAgICAgCiB2b2lkIFdlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6cmVt b3ZlRGF0YVJlY29yZHMoKQogewpAQCAtMTIwLDE4ICsxMjQsMTUgQEAgdm9pZCBXZWJSZXNvdXJj ZUxvYWRTdGF0aXN0aWNzU3RvcmU6OnJlbW92ZURhdGFSZWNvcmRzKCkKICAgICBpZiAoIWNvcmVT dG9yZSgpLnNob3VsZFJlbW92ZURhdGFSZWNvcmRzKCkpCiAgICAgICAgIHJldHVybjsKIAotICAg IFZlY3RvcjxTdHJpbmc+IHByZXZhbGVudFJlc291cmNlRG9tYWlucyA9IGNvcmVTdG9yZSgpLnRv cFByaXZhdGVseUNvbnRyb2xsZWREb21haW5zVG9SZW1vdmVXZWJzaXRlRGF0YUZvcigpOwotICAg IGlmICghcHJldmFsZW50UmVzb3VyY2VEb21haW5zLnNpemUoKSkKKyAgICBhdXRvIHByZXZhbGVu dFJlc291cmNlRG9tYWlucyA9IGNvcmVTdG9yZSgpLnRvcFByaXZhdGVseUNvbnRyb2xsZWREb21h aW5zVG9SZW1vdmVXZWJzaXRlRGF0YUZvcigpOworICAgIGlmIChwcmV2YWxlbnRSZXNvdXJjZURv bWFpbnMuaXNFbXB0eSgpKQogICAgICAgICByZXR1cm47CiAgICAgCiAgICAgY29yZVN0b3JlKCku ZGF0YVJlY29yZHNCZWluZ1JlbW92ZWQoKTsKIAotICAgIGlmIChkYXRhVHlwZXNUb1JlbW92ZS5p c0VtcHR5KCkpCi0gICAgICAgIGluaXRpYWxpemVEYXRhVHlwZXNUb1JlbW92ZSgpOwotCiAgICAg Ly8gU3dpdGNoIHRvIHRoZSBtYWluIHRocmVhZCB0byBnZXQgdGhlIGRlZmF1bHQgd2Vic2l0ZSBk YXRhIHN0b3JlCiAgICAgUnVuTG9vcDo6bWFpbigpLmRpc3BhdGNoKFtwcmV2YWxlbnRSZXNvdXJj ZURvbWFpbnMgPSBDcm9zc1RocmVhZENvcGllcjxWZWN0b3I8U3RyaW5nPj46OmNvcHkocHJldmFs ZW50UmVzb3VyY2VEb21haW5zKSwgdGhpcywgcHJvdGVjdGVkVGhpcyA9IG1ha2VSZWYoKnRoaXMp XSAoKSBtdXRhYmxlIHsKLSAgICAgICAgV2ViUHJvY2Vzc1Byb3h5OjpkZWxldGVXZWJzaXRlRGF0 YUZvclRvcFByaXZhdGVseUNvbnRyb2xsZWREb21haW5zSW5BbGxQZXJzaXN0ZW50RGF0YVN0b3Jl cyhkYXRhVHlwZXNUb1JlbW92ZSwgV1RGTW92ZShwcmV2YWxlbnRSZXNvdXJjZURvbWFpbnMpLCBu b3RpZnlQYWdlc1doZW5EYXRhUmVjb3Jkc1dlcmVTY2FubmVkLCBbdGhpcywgcHJvdGVjdGVkVGhp cyA9IFdURk1vdmUocHJvdGVjdGVkVGhpcyldKGNvbnN0IEhhc2hTZXQ8U3RyaW5nPiYgZG9tYWlu c1dpdGhEZWxldGVkV2Vic2l0ZURhdGEpIG11dGFibGUgeworICAgICAgICBXZWJQcm9jZXNzUHJv eHk6OmRlbGV0ZVdlYnNpdGVEYXRhRm9yVG9wUHJpdmF0ZWx5Q29udHJvbGxlZERvbWFpbnNJbkFs bFBlcnNpc3RlbnREYXRhU3RvcmVzKGRhdGFUeXBlc1RvUmVtb3ZlKCksIFdURk1vdmUocHJldmFs ZW50UmVzb3VyY2VEb21haW5zKSwgbm90aWZ5UGFnZXNXaGVuRGF0YVJlY29yZHNXZXJlU2Nhbm5l ZCwgW3RoaXMsIHByb3RlY3RlZFRoaXMgPSBXVEZNb3ZlKHByb3RlY3RlZFRoaXMpXShjb25zdCBI YXNoU2V0PFN0cmluZz4mIGRvbWFpbnNXaXRoRGVsZXRlZFdlYnNpdGVEYXRhKSBtdXRhYmxlIHsK ICAgICAgICAgICAgIC8vIEJ1dCBhbHdheXMgdG91Y2ggdGhlIFJlc291cmNlTG9hZFN0YXRpc3Rp Y3Mgc3RvcmUgb24gdGhlIHdvcmtlciBxdWV1ZS4KICAgICAgICAgICAgIG1fc3RhdGlzdGljc1F1 ZXVlLT5kaXNwYXRjaChbcHJvdGVjdGVkVGhpcyA9IFdURk1vdmUocHJvdGVjdGVkVGhpcyksIHRv cERvbWFpbnMgPSBDcm9zc1RocmVhZENvcGllcjxIYXNoU2V0PFN0cmluZz4+Ojpjb3B5KGRvbWFp bnNXaXRoRGVsZXRlZFdlYnNpdGVEYXRhKV0gKCkgbXV0YWJsZSB7CiAgICAgICAgICAgICAgICAg cHJvdGVjdGVkVGhpcy0+Y29yZVN0b3JlKCkudXBkYXRlU3RhdGlzdGljc0ZvclJlbW92ZWREYXRh UmVjb3Jkcyh0b3BEb21haW5zKTsKQEAgLTE4Niw3ICsxODcsNyBAQCB2b2lkIFdlYlJlc291cmNl TG9hZFN0YXRpc3RpY3NTdG9yZTo6c2V0UmVzb3VyY2VMb2FkU3RhdGlzdGljc0VuYWJsZWQoYm9v bCBlbmFibAogCiAgICAgaWYgKG1fcmVzb3VyY2VMb2FkU3RhdGlzdGljc0VuYWJsZWQpIHsKICAg ICAgICAgcmVhZERhdGFGcm9tRGlza0lmTmVlZGVkKCk7Ci0gICAgICAgIG1fc3RhdGlzdGljc1F1 ZXVlLT5kaXNwYXRjaChbdGhpcywgcHJvdGVjdGVkVGhpcyA9IG1ha2VSZWYoKnRoaXMpXSAoKSB7 CisgICAgICAgIG1fc3RhdGlzdGljc1F1ZXVlLT5kaXNwYXRjaChbdGhpcywgcHJvdGVjdGVkVGhp cyA9IG1ha2VSZWYoKnRoaXMpXSB7CiAgICAgICAgICAgICBzdGFydE1vbml0b3JpbmdTdGF0aXN0 aWNzU3RvcmFnZSgpOwogICAgICAgICB9KTsKICAgICB9IGVsc2UKQEAgLTIxNCw3ICsyMTUsNyBA QCB2b2lkIFdlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6cmVnaXN0ZXJTaGFyZWRSZXNv dXJjZUxvYWRPYnNlcnZlcigpCiAgICAgICAgICAgICB3cml0ZVN0b3JlVG9EaXNrKCk7CiAgICAg ICAgIH0pOwogICAgIH0pOwotICAgIG1fcmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlLT5zZXRH cmFuZGZhdGhlckV4aXN0aW5nV2Vic2l0ZURhdGFDYWxsYmFjayhbdGhpcywgcHJvdGVjdGVkVGhp cyA9IG1ha2VSZWYoKnRoaXMpXSgpIHsKKyAgICBtX3Jlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9y ZS0+c2V0R3JhbmRmYXRoZXJFeGlzdGluZ1dlYnNpdGVEYXRhQ2FsbGJhY2soW3RoaXMsIHByb3Rl Y3RlZFRoaXMgPSBtYWtlUmVmKCp0aGlzKV0gewogICAgICAgICBncmFuZGZhdGhlckV4aXN0aW5n V2Vic2l0ZURhdGEoKTsKICAgICB9KTsKICAgICBtX3Jlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9y ZS0+c2V0RGVsZXRlUGVyc2lzdGVudFN0b3JlQ2FsbGJhY2soW3RoaXMsIHByb3RlY3RlZFRoaXMg PSBtYWtlUmVmKCp0aGlzKV0gewpAQCAtMjIyLDcgKzIyMyw3IEBAIHZvaWQgV2ViUmVzb3VyY2VM b2FkU3RhdGlzdGljc1N0b3JlOjpyZWdpc3RlclNoYXJlZFJlc291cmNlTG9hZE9ic2VydmVyKCkK ICAgICAgICAgICAgIGRlbGV0ZVN0b3JlRnJvbURpc2soKTsKICAgICAgICAgfSk7CiAgICAgfSk7 Ci0gICAgbV9yZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUtPnNldEZpcmVUZWxlbWV0cnlDYWxs YmFjayhbdGhpcywgcHJvdGVjdGVkVGhpcyA9IG1ha2VSZWYoKnRoaXMpXSgpIHsKKyAgICBtX3Jl c291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS0+c2V0RmlyZVRlbGVtZXRyeUNhbGxiYWNrKFt0aGlz LCBwcm90ZWN0ZWRUaGlzID0gbWFrZVJlZigqdGhpcyldIHsKICAgICAgICAgLy8gVGhpcyBjYW5j ZWxzIHRoZSBvbmUgc2hvdCB0aW1lciBhbmQgaXMgb25seSBpbnRlbmRlZCBmb3IgdGVzdGluZyBw dXJwb3Nlcy4KICAgICAgICAgbV90ZWxlbWV0cnlPbmVTaG90VGltZXIuc3RhcnRPbmVTaG90KDEw MF9tcyk7CiAgICAgfSk7CkBAIC0yNDMsMTIgKzI0NCw5IEBAIHZvaWQgV2ViUmVzb3VyY2VMb2Fk U3RhdGlzdGljc1N0b3JlOjpyZWdpc3RlclNoYXJlZFJlc291cmNlTG9hZE9ic2VydmVyKFdURjo6 RnVuCiAKIHZvaWQgV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjpncmFuZGZhdGhlckV4 aXN0aW5nV2Vic2l0ZURhdGEoKQogewotICAgIGlmIChkYXRhVHlwZXNUb1JlbW92ZS5pc0VtcHR5 KCkpCi0gICAgICAgIGluaXRpYWxpemVEYXRhVHlwZXNUb1JlbW92ZSgpOwotICAgIAogICAgIC8v IFN3aXRjaCB0byB0aGUgbWFpbiB0aHJlYWQgdG8gZ2V0IHRoZSBkZWZhdWx0IHdlYnNpdGUgZGF0 YSBzdG9yZQogICAgIFJ1bkxvb3A6Om1haW4oKS5kaXNwYXRjaChbdGhpcywgcHJvdGVjdGVkVGhp cyA9IG1ha2VSZWYoKnRoaXMpXSAoKSBtdXRhYmxlIHsKLSAgICAgICAgV2ViUHJvY2Vzc1Byb3h5 Ojp0b3BQcml2YXRlbHlDb250cm9sbGVkRG9tYWluc1dpdGhXZWJzaXRlRGF0YShkYXRhVHlwZXNU b1JlbW92ZSwgbm90aWZ5UGFnZXNXaGVuRGF0YVJlY29yZHNXZXJlU2Nhbm5lZCwgW3RoaXMsIHBy b3RlY3RlZFRoaXMgPSBXVEZNb3ZlKHByb3RlY3RlZFRoaXMpXSAoSGFzaFNldDxTdHJpbmc+JiYg dG9wUHJpdmF0ZWx5Q29udHJvbGxlZERvbWFpbnNXaXRoV2Vic2l0ZURhdGEpIG11dGFibGUgewor ICAgICAgICBXZWJQcm9jZXNzUHJveHk6OnRvcFByaXZhdGVseUNvbnRyb2xsZWREb21haW5zV2l0 aFdlYnNpdGVEYXRhKGRhdGFUeXBlc1RvUmVtb3ZlKCksIG5vdGlmeVBhZ2VzV2hlbkRhdGFSZWNv cmRzV2VyZVNjYW5uZWQsIFt0aGlzLCBwcm90ZWN0ZWRUaGlzID0gV1RGTW92ZShwcm90ZWN0ZWRU aGlzKV0gKEhhc2hTZXQ8U3RyaW5nPiYmIHRvcFByaXZhdGVseUNvbnRyb2xsZWREb21haW5zV2l0 aFdlYnNpdGVEYXRhKSBtdXRhYmxlIHsKICAgICAgICAgICAgIC8vIEJ1dCBhbHdheXMgdG91Y2gg dGhlIFJlc291cmNlTG9hZFN0YXRpc3RpY3Mgc3RvcmUgb24gdGhlIHdvcmtlciBxdWV1ZQogICAg ICAgICAgICAgbV9zdGF0aXN0aWNzUXVldWUtPmRpc3BhdGNoKFtwcm90ZWN0ZWRUaGlzID0gV1RG TW92ZShwcm90ZWN0ZWRUaGlzKSwgdG9wRG9tYWlucyA9IENyb3NzVGhyZWFkQ29waWVyPEhhc2hT ZXQ8U3RyaW5nPj46OmNvcHkodG9wUHJpdmF0ZWx5Q29udHJvbGxlZERvbWFpbnNXaXRoV2Vic2l0 ZURhdGEpXSAoKSBtdXRhYmxlIHsKICAgICAgICAgICAgICAgICBwcm90ZWN0ZWRUaGlzLT5jb3Jl U3RvcmUoKS5oYW5kbGVGcmVzaFN0YXJ0V2l0aEVtcHR5T3JOb1N0b3JlKFdURk1vdmUodG9wRG9t YWlucykpOwpAQCAtNDI5LDkgKzQyNyw2IEBAIHZvaWQgV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGlj c1N0b3JlOjpzdGFydE1vbml0b3JpbmdTdGF0aXN0aWNzU3RvcmFnZSgpCiB2b2lkIFdlYlJlc291 cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6c3RvcE1vbml0b3JpbmdTdGF0aXN0aWNzU3RvcmFnZSgp CiB7CiAgICAgQVNTRVJUKCFSdW5Mb29wOjppc01haW4oKSk7Ci0gICAgaWYgKCFtX3N0YXRpc3Rp Y3NTdG9yYWdlTW9uaXRvcikKLSAgICAgICAgcmV0dXJuOwotCiAgICAgbV9zdGF0aXN0aWNzU3Rv cmFnZU1vbml0b3IgPSBudWxscHRyOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlLmggYi9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlLmgKaW5kZXggYzM5MjI5 YmFjMDk0NWFjOTY3Mjg3ODMyNzE2Zjc4ZjIxNTcxNTc5Ny4uMDJiZjQyMjIyZDhmOWZlM2M1ZTlk MTE1MGZhNGZmYjE4NGM5YmNlMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L1dlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9XZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUuaApAQCAtNTIsMTAgKzUyLDkg QEAgc3RydWN0IFJlc291cmNlTG9hZFN0YXRpc3RpY3M7CiAKIG5hbWVzcGFjZSBXZWJLaXQgewog Ci1jbGFzcyBXZWJQcm9jZXNzUG9vbDsKIGNsYXNzIFdlYlByb2Nlc3NQcm94eTsKIAotY2xhc3Mg V2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlIDogcHVibGljIElQQzo6Q29ubmVjdGlvbjo6 V29ya1F1ZXVlTWVzc2FnZVJlY2VpdmVyIHsKK2NsYXNzIFdlYlJlc291cmNlTG9hZFN0YXRpc3Rp Y3NTdG9yZSBmaW5hbCA6IHB1YmxpYyBJUEM6OkNvbm5lY3Rpb246OldvcmtRdWV1ZU1lc3NhZ2VS ZWNlaXZlciB7CiBwdWJsaWM6CiAgICAgc3RhdGljIFJlZjxXZWJSZXNvdXJjZUxvYWRTdGF0aXN0 aWNzU3RvcmU+IGNyZWF0ZShjb25zdCBTdHJpbmcmKTsKICAgICBzdGF0aWMgdm9pZCBzZXROb3Rp ZnlQYWdlc1doZW5EYXRhUmVjb3Jkc1dlcmVTY2FubmVkKGJvb2wpOwo= 314145 2017-06-29 11:13:05 -0700 2017-06-29 11:52:57 -0700 Patch bug-173976-20170629111304.patch text/plain 10071 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjE4OTIzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggNDM5ZjU2NzgzNWM5OWMx YWM2MDk4YTk3OWNmMmUyYmZmYTc4NGI0Yi4uMGE1YWIwMDgxMzVmYTZkMDZjZDMyNjRhMzY2NTc1 YjFlODk3YzdhNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDE3LTA2LTI5ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgU2xpZ2h0IGNsZWFuIHVwIG9m IFdlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZQorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTczOTc2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUmVzb3VyY2VMb2FkU3RhdGlz dGljc1N0b3JlLmNwcDoKKyAgICAgICAgKFdlYktpdDo6ZGF0YVR5cGVzVG9SZW1vdmUpOgorICAg ICAgICAoV2ViS2l0OjpXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OmNsYXNzaWZ5UmVz b3VyY2UpOgorICAgICAgICAoV2ViS2l0OjpXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6 OnJlbW92ZURhdGFSZWNvcmRzKToKKyAgICAgICAgKFdlYktpdDo6V2ViUmVzb3VyY2VMb2FkU3Rh dGlzdGljc1N0b3JlOjpzZXRSZXNvdXJjZUxvYWRTdGF0aXN0aWNzRW5hYmxlZCk6CisgICAgICAg IChXZWJLaXQ6OldlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6cmVnaXN0ZXJTaGFyZWRS ZXNvdXJjZUxvYWRPYnNlcnZlcik6CisgICAgICAgIChXZWJLaXQ6OldlYlJlc291cmNlTG9hZFN0 YXRpc3RpY3NTdG9yZTo6Z3JhbmRmYXRoZXJFeGlzdGluZ1dlYnNpdGVEYXRhKToKKyAgICAgICAg KFdlYktpdDo6V2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjpzdG9wTW9uaXRvcmluZ1N0 YXRpc3RpY3NTdG9yYWdlKToKKyAgICAgICAgKFdlYktpdDo6aW5pdGlhbGl6ZURhdGFUeXBlc1Rv UmVtb3ZlKTogRGVsZXRlZC4KKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUmVzb3VyY2VMb2FkU3Rh dGlzdGljc1N0b3JlLmg6CisgICAgICAgIChXZWJLaXQ6OldlYlJlc291cmNlTG9hZFN0YXRpc3Rp Y3NTdG9yZTo6Y29yZVN0b3JlKTogRGVsZXRlZC4KKwogMjAxNy0wNi0yOSAgQ2FybG9zIEdhcmNp YSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZC4gRml4 IEdUSysgdW5pdCB0ZXN0cyBjcmFzaGluZyBhZnRlciByMjE4OTIyLgpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5jcHAg Yi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3Jl LmNwcAppbmRleCA2Zjk5MjM2MjYwYzg4MTY2YmVmMzIwZmM4NmNkNWQ1NWRkMzg3NWYxLi5iMzA4 MGQ5YTVmMjUxOTU3YjE2YzYzNDk2OTQwZTlkNmJjZDI5OGE2IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlLmNwcAorKysg Yi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3Jl LmNwcApAQCAtNTQsOSArNTQsMzIgQEAgdXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7CiAKIG5hbWVz cGFjZSBXZWJLaXQgewogCi1zdGF0aWMgT3B0aW9uU2V0PFdlYktpdDo6V2Vic2l0ZURhdGFUeXBl PiBkYXRhVHlwZXNUb1JlbW92ZTsKLXN0YXRpYyBhdXRvIG5vdGlmeVBhZ2VzV2hlbkRhdGFSZWNv cmRzV2VyZVNjYW5uZWQgPSBmYWxzZTsKLXN0YXRpYyBhdXRvIHNob3VsZENsYXNzaWZ5UmVzb3Vy Y2VzQmVmb3JlRGF0YVJlY29yZHNSZW1vdmFsID0gdHJ1ZTsKK3N0YXRpYyBib29sIG5vdGlmeVBh Z2VzV2hlbkRhdGFSZWNvcmRzV2VyZVNjYW5uZWQgPSBmYWxzZTsKK3N0YXRpYyBib29sIHNob3Vs ZENsYXNzaWZ5UmVzb3VyY2VzQmVmb3JlRGF0YVJlY29yZHNSZW1vdmFsID0gdHJ1ZTsKKworc3Rh dGljIGNvbnN0IE9wdGlvblNldDxXZWJzaXRlRGF0YVR5cGU+JiBkYXRhVHlwZXNUb1JlbW92ZSgp Cit7CisgICAgc3RhdGljIE5ldmVyRGVzdHJveWVkPE9wdGlvblNldDxXZWJzaXRlRGF0YVR5cGU+ PiBkYXRhVHlwZXMoc3RkOjppbml0aWFsaXplcl9saXN0PFdlYnNpdGVEYXRhVHlwZT4oeworICAg ICAgICBXZWJzaXRlRGF0YVR5cGU6OkNvb2tpZXMsCisgICAgICAgIFdlYnNpdGVEYXRhVHlwZTo6 SW5kZXhlZERCRGF0YWJhc2VzLAorICAgICAgICBXZWJzaXRlRGF0YVR5cGU6OkxvY2FsU3RvcmFn ZSwKKyNpZiBFTkFCTEUoTUVESUFfU1RSRUFNKQorICAgICAgICBXZWJzaXRlRGF0YVR5cGU6Ok1l ZGlhRGV2aWNlSWRlbnRpZmllciwKKyNlbmRpZgorICAgICAgICBXZWJzaXRlRGF0YVR5cGU6Ok1l ZGlhS2V5cywKKyAgICAgICAgV2Vic2l0ZURhdGFUeXBlOjpPZmZsaW5lV2ViQXBwbGljYXRpb25D YWNoZSwKKyNpZiBFTkFCTEUoTkVUU0NBUEVfUExVR0lOX0FQSSkKKyAgICAgICAgV2Vic2l0ZURh dGFUeXBlOjpQbHVnSW5EYXRhLAorI2VuZGlmCisgICAgICAgIFdlYnNpdGVEYXRhVHlwZTo6U2Vh cmNoRmllbGRSZWNlbnRTZWFyY2hlcywKKyAgICAgICAgV2Vic2l0ZURhdGFUeXBlOjpTZXNzaW9u U3RvcmFnZSwKKyAgICAgICAgV2Vic2l0ZURhdGFUeXBlOjpXZWJTUUxEYXRhYmFzZXMsCisgICAg fSkpOworCisgICAgQVNTRVJUKFJ1bkxvb3A6OmlzTWFpbigpKTsKKworICAgIHJldHVybiBkYXRh VHlwZXM7Cit9CiAKIFJlZjxXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU+IFdlYlJlc291 cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6Y3JlYXRlKGNvbnN0IFN0cmluZyYgcmVzb3VyY2VMb2Fk U3RhdGlzdGljc0RpcmVjdG9yeSkKIHsKQEAgLTkwLDI4ICsxMTMsOSBAQCB2b2lkIFdlYlJlc291 cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6c2V0U2hvdWxkQ2xhc3NpZnlSZXNvdXJjZXNCZWZvcmVE YXRhUmVjb3JkcwogCiB2b2lkIFdlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6Y2xhc3Np ZnlSZXNvdXJjZShSZXNvdXJjZUxvYWRTdGF0aXN0aWNzJiByZXNvdXJjZVN0YXRpc3RpYykKIHsK LSAgICBpZiAoIXJlc291cmNlU3RhdGlzdGljLmlzUHJldmFsZW50UmVzb3VyY2UKLSAgICAgICAg JiYgbV9yZXNvdXJjZUxvYWRTdGF0aXN0aWNzQ2xhc3NpZmllci5oYXNQcmV2YWxlbnRSZXNvdXJj ZUNoYXJhY3RlcmlzdGljcyhyZXNvdXJjZVN0YXRpc3RpYykpCisgICAgaWYgKCFyZXNvdXJjZVN0 YXRpc3RpYy5pc1ByZXZhbGVudFJlc291cmNlICYmIG1fcmVzb3VyY2VMb2FkU3RhdGlzdGljc0Ns YXNzaWZpZXIuaGFzUHJldmFsZW50UmVzb3VyY2VDaGFyYWN0ZXJpc3RpY3MocmVzb3VyY2VTdGF0 aXN0aWMpKQogICAgICAgICByZXNvdXJjZVN0YXRpc3RpYy5pc1ByZXZhbGVudFJlc291cmNlID0g dHJ1ZTsKIH0KLQotc3RhdGljIGlubGluZSB2b2lkIGluaXRpYWxpemVEYXRhVHlwZXNUb1JlbW92 ZSgpCi17Ci0gICAgZGF0YVR5cGVzVG9SZW1vdmUgfD0gV2Vic2l0ZURhdGFUeXBlOjpDb29raWVz OwotICAgIGRhdGFUeXBlc1RvUmVtb3ZlIHw9IFdlYnNpdGVEYXRhVHlwZTo6T2ZmbGluZVdlYkFw cGxpY2F0aW9uQ2FjaGU7Ci0gICAgZGF0YVR5cGVzVG9SZW1vdmUgfD0gV2Vic2l0ZURhdGFUeXBl OjpTZXNzaW9uU3RvcmFnZTsKLSAgICBkYXRhVHlwZXNUb1JlbW92ZSB8PSBXZWJzaXRlRGF0YVR5 cGU6OkxvY2FsU3RvcmFnZTsKLSAgICBkYXRhVHlwZXNUb1JlbW92ZSB8PSBXZWJzaXRlRGF0YVR5 cGU6OldlYlNRTERhdGFiYXNlczsKLSAgICBkYXRhVHlwZXNUb1JlbW92ZSB8PSBXZWJzaXRlRGF0 YVR5cGU6OkluZGV4ZWREQkRhdGFiYXNlczsKLSAgICBkYXRhVHlwZXNUb1JlbW92ZSB8PSBXZWJz aXRlRGF0YVR5cGU6Ok1lZGlhS2V5czsKLSAgICBkYXRhVHlwZXNUb1JlbW92ZSB8PSBXZWJzaXRl RGF0YVR5cGU6OlNlYXJjaEZpZWxkUmVjZW50U2VhcmNoZXM7Ci0jaWYgRU5BQkxFKE5FVFNDQVBF X1BMVUdJTl9BUEkpCi0gICAgZGF0YVR5cGVzVG9SZW1vdmUgfD0gV2Vic2l0ZURhdGFUeXBlOjpQ bHVnSW5EYXRhOwotI2VuZGlmCi0jaWYgRU5BQkxFKE1FRElBX1NUUkVBTSkKLSAgICBkYXRhVHlw ZXNUb1JlbW92ZSB8PSBXZWJzaXRlRGF0YVR5cGU6Ok1lZGlhRGV2aWNlSWRlbnRpZmllcjsKLSNl bmRpZgotfQogICAgIAogdm9pZCBXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OnJlbW92 ZURhdGFSZWNvcmRzKCkKIHsKQEAgLTEyMCwxOCArMTI0LDE1IEBAIHZvaWQgV2ViUmVzb3VyY2VM b2FkU3RhdGlzdGljc1N0b3JlOjpyZW1vdmVEYXRhUmVjb3JkcygpCiAgICAgaWYgKCFjb3JlU3Rv cmUoKS5zaG91bGRSZW1vdmVEYXRhUmVjb3JkcygpKQogICAgICAgICByZXR1cm47CiAKLSAgICBW ZWN0b3I8U3RyaW5nPiBwcmV2YWxlbnRSZXNvdXJjZURvbWFpbnMgPSBjb3JlU3RvcmUoKS50b3BQ cml2YXRlbHlDb250cm9sbGVkRG9tYWluc1RvUmVtb3ZlV2Vic2l0ZURhdGFGb3IoKTsKLSAgICBp ZiAoIXByZXZhbGVudFJlc291cmNlRG9tYWlucy5zaXplKCkpCisgICAgYXV0byBwcmV2YWxlbnRS ZXNvdXJjZURvbWFpbnMgPSBjb3JlU3RvcmUoKS50b3BQcml2YXRlbHlDb250cm9sbGVkRG9tYWlu c1RvUmVtb3ZlV2Vic2l0ZURhdGFGb3IoKTsKKyAgICBpZiAocHJldmFsZW50UmVzb3VyY2VEb21h aW5zLmlzRW1wdHkoKSkKICAgICAgICAgcmV0dXJuOwogICAgIAogICAgIGNvcmVTdG9yZSgpLmRh dGFSZWNvcmRzQmVpbmdSZW1vdmVkKCk7CiAKLSAgICBpZiAoZGF0YVR5cGVzVG9SZW1vdmUuaXNF bXB0eSgpKQotICAgICAgICBpbml0aWFsaXplRGF0YVR5cGVzVG9SZW1vdmUoKTsKLQogICAgIC8v IFN3aXRjaCB0byB0aGUgbWFpbiB0aHJlYWQgdG8gZ2V0IHRoZSBkZWZhdWx0IHdlYnNpdGUgZGF0 YSBzdG9yZQogICAgIFJ1bkxvb3A6Om1haW4oKS5kaXNwYXRjaChbcHJldmFsZW50UmVzb3VyY2VE b21haW5zID0gQ3Jvc3NUaHJlYWRDb3BpZXI8VmVjdG9yPFN0cmluZz4+Ojpjb3B5KHByZXZhbGVu dFJlc291cmNlRG9tYWlucyksIHRoaXMsIHByb3RlY3RlZFRoaXMgPSBtYWtlUmVmKCp0aGlzKV0g KCkgbXV0YWJsZSB7Ci0gICAgICAgIFdlYlByb2Nlc3NQcm94eTo6ZGVsZXRlV2Vic2l0ZURhdGFG b3JUb3BQcml2YXRlbHlDb250cm9sbGVkRG9tYWluc0luQWxsUGVyc2lzdGVudERhdGFTdG9yZXMo ZGF0YVR5cGVzVG9SZW1vdmUsIFdURk1vdmUocHJldmFsZW50UmVzb3VyY2VEb21haW5zKSwgbm90 aWZ5UGFnZXNXaGVuRGF0YVJlY29yZHNXZXJlU2Nhbm5lZCwgW3RoaXMsIHByb3RlY3RlZFRoaXMg PSBXVEZNb3ZlKHByb3RlY3RlZFRoaXMpXShjb25zdCBIYXNoU2V0PFN0cmluZz4mIGRvbWFpbnNX aXRoRGVsZXRlZFdlYnNpdGVEYXRhKSBtdXRhYmxlIHsKKyAgICAgICAgV2ViUHJvY2Vzc1Byb3h5 OjpkZWxldGVXZWJzaXRlRGF0YUZvclRvcFByaXZhdGVseUNvbnRyb2xsZWREb21haW5zSW5BbGxQ ZXJzaXN0ZW50RGF0YVN0b3JlcyhkYXRhVHlwZXNUb1JlbW92ZSgpLCBXVEZNb3ZlKHByZXZhbGVu dFJlc291cmNlRG9tYWlucyksIG5vdGlmeVBhZ2VzV2hlbkRhdGFSZWNvcmRzV2VyZVNjYW5uZWQs IFt0aGlzLCBwcm90ZWN0ZWRUaGlzID0gV1RGTW92ZShwcm90ZWN0ZWRUaGlzKV0oY29uc3QgSGFz aFNldDxTdHJpbmc+JiBkb21haW5zV2l0aERlbGV0ZWRXZWJzaXRlRGF0YSkgbXV0YWJsZSB7CiAg ICAgICAgICAgICAvLyBCdXQgYWx3YXlzIHRvdWNoIHRoZSBSZXNvdXJjZUxvYWRTdGF0aXN0aWNz IHN0b3JlIG9uIHRoZSB3b3JrZXIgcXVldWUuCiAgICAgICAgICAgICBtX3N0YXRpc3RpY3NRdWV1 ZS0+ZGlzcGF0Y2goW3Byb3RlY3RlZFRoaXMgPSBXVEZNb3ZlKHByb3RlY3RlZFRoaXMpLCB0b3BE b21haW5zID0gQ3Jvc3NUaHJlYWRDb3BpZXI8SGFzaFNldDxTdHJpbmc+Pjo6Y29weShkb21haW5z V2l0aERlbGV0ZWRXZWJzaXRlRGF0YSldICgpIG11dGFibGUgewogICAgICAgICAgICAgICAgIHBy b3RlY3RlZFRoaXMtPmNvcmVTdG9yZSgpLnVwZGF0ZVN0YXRpc3RpY3NGb3JSZW1vdmVkRGF0YVJl Y29yZHModG9wRG9tYWlucyk7CkBAIC0xODYsNyArMTg3LDcgQEAgdm9pZCBXZWJSZXNvdXJjZUxv YWRTdGF0aXN0aWNzU3RvcmU6OnNldFJlc291cmNlTG9hZFN0YXRpc3RpY3NFbmFibGVkKGJvb2wg ZW5hYmwKIAogICAgIGlmIChtX3Jlc291cmNlTG9hZFN0YXRpc3RpY3NFbmFibGVkKSB7CiAgICAg ICAgIHJlYWREYXRhRnJvbURpc2tJZk5lZWRlZCgpOwotICAgICAgICBtX3N0YXRpc3RpY3NRdWV1 ZS0+ZGlzcGF0Y2goW3RoaXMsIHByb3RlY3RlZFRoaXMgPSBtYWtlUmVmKCp0aGlzKV0gKCkgewor ICAgICAgICBtX3N0YXRpc3RpY3NRdWV1ZS0+ZGlzcGF0Y2goW3RoaXMsIHByb3RlY3RlZFRoaXMg PSBtYWtlUmVmKCp0aGlzKV0gewogICAgICAgICAgICAgc3RhcnRNb25pdG9yaW5nU3RhdGlzdGlj c1N0b3JhZ2UoKTsKICAgICAgICAgfSk7CiAgICAgfSBlbHNlCkBAIC0yMTQsNyArMjE1LDcgQEAg dm9pZCBXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OnJlZ2lzdGVyU2hhcmVkUmVzb3Vy Y2VMb2FkT2JzZXJ2ZXIoKQogICAgICAgICAgICAgd3JpdGVTdG9yZVRvRGlzaygpOwogICAgICAg ICB9KTsKICAgICB9KTsKLSAgICBtX3Jlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS0+c2V0R3Jh bmRmYXRoZXJFeGlzdGluZ1dlYnNpdGVEYXRhQ2FsbGJhY2soW3RoaXMsIHByb3RlY3RlZFRoaXMg PSBtYWtlUmVmKCp0aGlzKV0oKSB7CisgICAgbV9yZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUt PnNldEdyYW5kZmF0aGVyRXhpc3RpbmdXZWJzaXRlRGF0YUNhbGxiYWNrKFt0aGlzLCBwcm90ZWN0 ZWRUaGlzID0gbWFrZVJlZigqdGhpcyldIHsKICAgICAgICAgZ3JhbmRmYXRoZXJFeGlzdGluZ1dl YnNpdGVEYXRhKCk7CiAgICAgfSk7CiAgICAgbV9yZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUt PnNldERlbGV0ZVBlcnNpc3RlbnRTdG9yZUNhbGxiYWNrKFt0aGlzLCBwcm90ZWN0ZWRUaGlzID0g bWFrZVJlZigqdGhpcyldIHsKQEAgLTIyMiw3ICsyMjMsNyBAQCB2b2lkIFdlYlJlc291cmNlTG9h ZFN0YXRpc3RpY3NTdG9yZTo6cmVnaXN0ZXJTaGFyZWRSZXNvdXJjZUxvYWRPYnNlcnZlcigpCiAg ICAgICAgICAgICBkZWxldGVTdG9yZUZyb21EaXNrKCk7CiAgICAgICAgIH0pOwogICAgIH0pOwot ICAgIG1fcmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlLT5zZXRGaXJlVGVsZW1ldHJ5Q2FsbGJh Y2soW3RoaXMsIHByb3RlY3RlZFRoaXMgPSBtYWtlUmVmKCp0aGlzKV0oKSB7CisgICAgbV9yZXNv dXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUtPnNldEZpcmVUZWxlbWV0cnlDYWxsYmFjayhbdGhpcywg cHJvdGVjdGVkVGhpcyA9IG1ha2VSZWYoKnRoaXMpXSB7CiAgICAgICAgIC8vIFRoaXMgY2FuY2Vs cyB0aGUgb25lIHNob3QgdGltZXIgYW5kIGlzIG9ubHkgaW50ZW5kZWQgZm9yIHRlc3RpbmcgcHVy cG9zZXMuCiAgICAgICAgIG1fdGVsZW1ldHJ5T25lU2hvdFRpbWVyLnN0YXJ0T25lU2hvdCgxMDBf bXMpOwogICAgIH0pOwpAQCAtMjQzLDEyICsyNDQsOSBAQCB2b2lkIFdlYlJlc291cmNlTG9hZFN0 YXRpc3RpY3NTdG9yZTo6cmVnaXN0ZXJTaGFyZWRSZXNvdXJjZUxvYWRPYnNlcnZlcihXVEY6OkZ1 bgogCiB2b2lkIFdlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6Z3JhbmRmYXRoZXJFeGlz dGluZ1dlYnNpdGVEYXRhKCkKIHsKLSAgICBpZiAoZGF0YVR5cGVzVG9SZW1vdmUuaXNFbXB0eSgp KQotICAgICAgICBpbml0aWFsaXplRGF0YVR5cGVzVG9SZW1vdmUoKTsKLSAgICAKICAgICAvLyBT d2l0Y2ggdG8gdGhlIG1haW4gdGhyZWFkIHRvIGdldCB0aGUgZGVmYXVsdCB3ZWJzaXRlIGRhdGEg c3RvcmUKICAgICBSdW5Mb29wOjptYWluKCkuZGlzcGF0Y2goW3RoaXMsIHByb3RlY3RlZFRoaXMg PSBtYWtlUmVmKCp0aGlzKV0gKCkgbXV0YWJsZSB7Ci0gICAgICAgIFdlYlByb2Nlc3NQcm94eTo6 dG9wUHJpdmF0ZWx5Q29udHJvbGxlZERvbWFpbnNXaXRoV2Vic2l0ZURhdGEoZGF0YVR5cGVzVG9S ZW1vdmUsIG5vdGlmeVBhZ2VzV2hlbkRhdGFSZWNvcmRzV2VyZVNjYW5uZWQsIFt0aGlzLCBwcm90 ZWN0ZWRUaGlzID0gV1RGTW92ZShwcm90ZWN0ZWRUaGlzKV0gKEhhc2hTZXQ8U3RyaW5nPiYmIHRv cFByaXZhdGVseUNvbnRyb2xsZWREb21haW5zV2l0aFdlYnNpdGVEYXRhKSBtdXRhYmxlIHsKKyAg ICAgICAgV2ViUHJvY2Vzc1Byb3h5Ojp0b3BQcml2YXRlbHlDb250cm9sbGVkRG9tYWluc1dpdGhX ZWJzaXRlRGF0YShkYXRhVHlwZXNUb1JlbW92ZSgpLCBub3RpZnlQYWdlc1doZW5EYXRhUmVjb3Jk c1dlcmVTY2FubmVkLCBbdGhpcywgcHJvdGVjdGVkVGhpcyA9IFdURk1vdmUocHJvdGVjdGVkVGhp cyldIChIYXNoU2V0PFN0cmluZz4mJiB0b3BQcml2YXRlbHlDb250cm9sbGVkRG9tYWluc1dpdGhX ZWJzaXRlRGF0YSkgbXV0YWJsZSB7CiAgICAgICAgICAgICAvLyBCdXQgYWx3YXlzIHRvdWNoIHRo ZSBSZXNvdXJjZUxvYWRTdGF0aXN0aWNzIHN0b3JlIG9uIHRoZSB3b3JrZXIgcXVldWUKICAgICAg ICAgICAgIG1fc3RhdGlzdGljc1F1ZXVlLT5kaXNwYXRjaChbcHJvdGVjdGVkVGhpcyA9IFdURk1v dmUocHJvdGVjdGVkVGhpcyksIHRvcERvbWFpbnMgPSBDcm9zc1RocmVhZENvcGllcjxIYXNoU2V0 PFN0cmluZz4+Ojpjb3B5KHRvcFByaXZhdGVseUNvbnRyb2xsZWREb21haW5zV2l0aFdlYnNpdGVE YXRhKV0gKCkgbXV0YWJsZSB7CiAgICAgICAgICAgICAgICAgcHJvdGVjdGVkVGhpcy0+Y29yZVN0 b3JlKCkuaGFuZGxlRnJlc2hTdGFydFdpdGhFbXB0eU9yTm9TdG9yZShXVEZNb3ZlKHRvcERvbWFp bnMpKTsKQEAgLTQyOSw5ICs0MjcsNiBAQCB2b2lkIFdlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NT dG9yZTo6c3RhcnRNb25pdG9yaW5nU3RhdGlzdGljc1N0b3JhZ2UoKQogdm9pZCBXZWJSZXNvdXJj ZUxvYWRTdGF0aXN0aWNzU3RvcmU6OnN0b3BNb25pdG9yaW5nU3RhdGlzdGljc1N0b3JhZ2UoKQog ewogICAgIEFTU0VSVCghUnVuTG9vcDo6aXNNYWluKCkpOwotICAgIGlmICghbV9zdGF0aXN0aWNz U3RvcmFnZU1vbml0b3IpCi0gICAgICAgIHJldHVybjsKLQogICAgIG1fc3RhdGlzdGljc1N0b3Jh Z2VNb25pdG9yID0gbnVsbHB0cjsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL1dlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5oIGIvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL1dlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5oCmluZGV4IGMzOTIyOWJh YzA5NDVhYzk2NzI4NzgzMjcxNmY3OGYyMTU3MTU3OTcuLjAyYmY0MjIyMmQ4ZjlmZTNjNWU5ZDEx NTBmYTRmZmIxODRjOWJjZTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9X ZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlLmgKQEAgLTUyLDEwICs1Miw5IEBA IHN0cnVjdCBSZXNvdXJjZUxvYWRTdGF0aXN0aWNzOwogCiBuYW1lc3BhY2UgV2ViS2l0IHsKIAot Y2xhc3MgV2ViUHJvY2Vzc1Bvb2w7CiBjbGFzcyBXZWJQcm9jZXNzUHJveHk7CiAKLWNsYXNzIFdl YlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZSA6IHB1YmxpYyBJUEM6OkNvbm5lY3Rpb246Oldv cmtRdWV1ZU1lc3NhZ2VSZWNlaXZlciB7CitjbGFzcyBXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNz U3RvcmUgZmluYWwgOiBwdWJsaWMgSVBDOjpDb25uZWN0aW9uOjpXb3JrUXVldWVNZXNzYWdlUmVj ZWl2ZXIgewogcHVibGljOgogICAgIHN0YXRpYyBSZWY8V2ViUmVzb3VyY2VMb2FkU3RhdGlzdGlj c1N0b3JlPiBjcmVhdGUoY29uc3QgU3RyaW5nJik7CiAgICAgc3RhdGljIHZvaWQgc2V0Tm90aWZ5 UGFnZXNXaGVuRGF0YVJlY29yZHNXZXJlU2Nhbm5lZChib29sKTsK 314148 2017-06-29 11:52:58 -0700 2017-06-29 12:51:09 -0700 Patch bug-173976-20170629115258.patch text/plain 10342 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjE4OTQ5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggODhhYjIzMDdmYjk2ZTFm ZTdmNGRjYzk1MzE1ZWMwYmI1YjlhMmVjZC4uMjlhZTIzNzFjMzBjM2YzMmI4NTBmZWZjNWY0MmYy MzQ3ODAxZGVkOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDE3LTA2LTI5ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgU2xpZ2h0IGNsZWFuIHVwIG9m IFdlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZQorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTczOTc2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgQnJl bnQgRnVsZ2hhbS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9XZWJSZXNvdXJjZUxvYWRTdGF0aXN0 aWNzU3RvcmUuY3BwOgorICAgICAgICAoV2ViS2l0OjpkYXRhVHlwZXNUb1JlbW92ZSk6CisgICAg ICAgIChXZWJLaXQ6OldlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6Y2xhc3NpZnlSZXNv dXJjZSk6CisgICAgICAgIChXZWJLaXQ6OldlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6 cmVtb3ZlRGF0YVJlY29yZHMpOgorICAgICAgICAoV2ViS2l0OjpXZWJSZXNvdXJjZUxvYWRTdGF0 aXN0aWNzU3RvcmU6OnNldFJlc291cmNlTG9hZFN0YXRpc3RpY3NFbmFibGVkKToKKyAgICAgICAg KFdlYktpdDo6V2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjpyZWdpc3RlclNoYXJlZFJl c291cmNlTG9hZE9ic2VydmVyKToKKyAgICAgICAgKFdlYktpdDo6V2ViUmVzb3VyY2VMb2FkU3Rh dGlzdGljc1N0b3JlOjpncmFuZGZhdGhlckV4aXN0aW5nV2Vic2l0ZURhdGEpOgorICAgICAgICAo V2ViS2l0OjpXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OnN0b3BNb25pdG9yaW5nU3Rh dGlzdGljc1N0b3JhZ2UpOgorICAgICAgICAoV2ViS2l0Ojppbml0aWFsaXplRGF0YVR5cGVzVG9S ZW1vdmUpOiBEZWxldGVkLgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJSZXNvdXJjZUxvYWRTdGF0 aXN0aWNzU3RvcmUuaDoKKyAgICAgICAgKFdlYktpdDo6V2ViUmVzb3VyY2VMb2FkU3RhdGlzdGlj c1N0b3JlOjpjb3JlU3RvcmUpOiBEZWxldGVkLgorCiAyMDE3LTA2LTI5ICBXZW5zb24gSHNpZWgg IDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgogCiAgICAgICAgIFJlcGxhY2Ugc3RhZ2luZy1wcmVm aXhlZCBVSUtpdCBkcmFnIGFuZCBkcm9wIGRlbGVnYXRlIG1ldGhvZHMgd2l0aCB0aGVpciBwdWJs aWMgU0RLIHZlcnNpb25zCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2Vi UmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9XZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUuY3BwCmluZGV4IDZmOTkyMzYyNjBjODgx NjZiZWYzMjBmYzg2Y2Q1ZDU1ZGQzODc1ZjEuLmQyMTg3MGRhNDQ2ZjdiOGYxNzFhNWYzYWNlMzk1 MzkxNmI1YWYxMGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJSZXNv dXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9XZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUuY3BwCkBAIC00Miw2ICs0Miw3IEBACiAj aW5jbHVkZSA8d3RmL0Nyb3NzVGhyZWFkQ29waWVyLmg+CiAjaW5jbHVkZSA8d3RmL01haW5UaHJl YWQuaD4KICNpbmNsdWRlIDx3dGYvTWF0aEV4dHJhcy5oPgorI2luY2x1ZGUgPHd0Zi9OZXZlckRl c3Ryb3llZC5oPgogI2luY2x1ZGUgPHd0Zi9SdW5Mb29wLmg+CiAjaW5jbHVkZSA8d3RmL1NlY29u ZHMuaD4KICNpbmNsdWRlIDx3dGYvdGhyZWFkcy9CaW5hcnlTZW1hcGhvcmUuaD4KQEAgLTU0LDkg KzU1LDMyIEBAIHVzaW5nIG5hbWVzcGFjZSBXZWJDb3JlOwogCiBuYW1lc3BhY2UgV2ViS2l0IHsK IAotc3RhdGljIE9wdGlvblNldDxXZWJLaXQ6OldlYnNpdGVEYXRhVHlwZT4gZGF0YVR5cGVzVG9S ZW1vdmU7Ci1zdGF0aWMgYXV0byBub3RpZnlQYWdlc1doZW5EYXRhUmVjb3Jkc1dlcmVTY2FubmVk ID0gZmFsc2U7Ci1zdGF0aWMgYXV0byBzaG91bGRDbGFzc2lmeVJlc291cmNlc0JlZm9yZURhdGFS ZWNvcmRzUmVtb3ZhbCA9IHRydWU7CitzdGF0aWMgYm9vbCBub3RpZnlQYWdlc1doZW5EYXRhUmVj b3Jkc1dlcmVTY2FubmVkID0gZmFsc2U7CitzdGF0aWMgYm9vbCBzaG91bGRDbGFzc2lmeVJlc291 cmNlc0JlZm9yZURhdGFSZWNvcmRzUmVtb3ZhbCA9IHRydWU7CisKK3N0YXRpYyBjb25zdCBPcHRp b25TZXQ8V2Vic2l0ZURhdGFUeXBlPiYgZGF0YVR5cGVzVG9SZW1vdmUoKQoreworICAgIHN0YXRp YyBOZXZlckRlc3Ryb3llZDxPcHRpb25TZXQ8V2Vic2l0ZURhdGFUeXBlPj4gZGF0YVR5cGVzKHN0 ZDo6aW5pdGlhbGl6ZXJfbGlzdDxXZWJzaXRlRGF0YVR5cGU+KHsKKyAgICAgICAgV2Vic2l0ZURh dGFUeXBlOjpDb29raWVzLAorICAgICAgICBXZWJzaXRlRGF0YVR5cGU6OkluZGV4ZWREQkRhdGFi YXNlcywKKyAgICAgICAgV2Vic2l0ZURhdGFUeXBlOjpMb2NhbFN0b3JhZ2UsCisjaWYgRU5BQkxF KE1FRElBX1NUUkVBTSkKKyAgICAgICAgV2Vic2l0ZURhdGFUeXBlOjpNZWRpYURldmljZUlkZW50 aWZpZXIsCisjZW5kaWYKKyAgICAgICAgV2Vic2l0ZURhdGFUeXBlOjpNZWRpYUtleXMsCisgICAg ICAgIFdlYnNpdGVEYXRhVHlwZTo6T2ZmbGluZVdlYkFwcGxpY2F0aW9uQ2FjaGUsCisjaWYgRU5B QkxFKE5FVFNDQVBFX1BMVUdJTl9BUEkpCisgICAgICAgIFdlYnNpdGVEYXRhVHlwZTo6UGx1Z0lu RGF0YSwKKyNlbmRpZgorICAgICAgICBXZWJzaXRlRGF0YVR5cGU6OlNlYXJjaEZpZWxkUmVjZW50 U2VhcmNoZXMsCisgICAgICAgIFdlYnNpdGVEYXRhVHlwZTo6U2Vzc2lvblN0b3JhZ2UsCisgICAg ICAgIFdlYnNpdGVEYXRhVHlwZTo6V2ViU1FMRGF0YWJhc2VzLAorICAgIH0pKTsKKworICAgIEFT U0VSVChSdW5Mb29wOjppc01haW4oKSk7CisKKyAgICByZXR1cm4gZGF0YVR5cGVzOworfQogCiBS ZWY8V2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlPiBXZWJSZXNvdXJjZUxvYWRTdGF0aXN0 aWNzU3RvcmU6OmNyZWF0ZShjb25zdCBTdHJpbmcmIHJlc291cmNlTG9hZFN0YXRpc3RpY3NEaXJl Y3RvcnkpCiB7CkBAIC05MCwyOCArMTE0LDkgQEAgdm9pZCBXZWJSZXNvdXJjZUxvYWRTdGF0aXN0 aWNzU3RvcmU6OnNldFNob3VsZENsYXNzaWZ5UmVzb3VyY2VzQmVmb3JlRGF0YVJlY29yZHMKIAog dm9pZCBXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OmNsYXNzaWZ5UmVzb3VyY2UoUmVz b3VyY2VMb2FkU3RhdGlzdGljcyYgcmVzb3VyY2VTdGF0aXN0aWMpCiB7Ci0gICAgaWYgKCFyZXNv dXJjZVN0YXRpc3RpYy5pc1ByZXZhbGVudFJlc291cmNlCi0gICAgICAgICYmIG1fcmVzb3VyY2VM b2FkU3RhdGlzdGljc0NsYXNzaWZpZXIuaGFzUHJldmFsZW50UmVzb3VyY2VDaGFyYWN0ZXJpc3Rp Y3MocmVzb3VyY2VTdGF0aXN0aWMpKQorICAgIGlmICghcmVzb3VyY2VTdGF0aXN0aWMuaXNQcmV2 YWxlbnRSZXNvdXJjZSAmJiBtX3Jlc291cmNlTG9hZFN0YXRpc3RpY3NDbGFzc2lmaWVyLmhhc1By ZXZhbGVudFJlc291cmNlQ2hhcmFjdGVyaXN0aWNzKHJlc291cmNlU3RhdGlzdGljKSkKICAgICAg ICAgcmVzb3VyY2VTdGF0aXN0aWMuaXNQcmV2YWxlbnRSZXNvdXJjZSA9IHRydWU7CiB9Ci0KLXN0 YXRpYyBpbmxpbmUgdm9pZCBpbml0aWFsaXplRGF0YVR5cGVzVG9SZW1vdmUoKQotewotICAgIGRh dGFUeXBlc1RvUmVtb3ZlIHw9IFdlYnNpdGVEYXRhVHlwZTo6Q29va2llczsKLSAgICBkYXRhVHlw ZXNUb1JlbW92ZSB8PSBXZWJzaXRlRGF0YVR5cGU6Ok9mZmxpbmVXZWJBcHBsaWNhdGlvbkNhY2hl OwotICAgIGRhdGFUeXBlc1RvUmVtb3ZlIHw9IFdlYnNpdGVEYXRhVHlwZTo6U2Vzc2lvblN0b3Jh Z2U7Ci0gICAgZGF0YVR5cGVzVG9SZW1vdmUgfD0gV2Vic2l0ZURhdGFUeXBlOjpMb2NhbFN0b3Jh Z2U7Ci0gICAgZGF0YVR5cGVzVG9SZW1vdmUgfD0gV2Vic2l0ZURhdGFUeXBlOjpXZWJTUUxEYXRh YmFzZXM7Ci0gICAgZGF0YVR5cGVzVG9SZW1vdmUgfD0gV2Vic2l0ZURhdGFUeXBlOjpJbmRleGVk REJEYXRhYmFzZXM7Ci0gICAgZGF0YVR5cGVzVG9SZW1vdmUgfD0gV2Vic2l0ZURhdGFUeXBlOjpN ZWRpYUtleXM7Ci0gICAgZGF0YVR5cGVzVG9SZW1vdmUgfD0gV2Vic2l0ZURhdGFUeXBlOjpTZWFy Y2hGaWVsZFJlY2VudFNlYXJjaGVzOwotI2lmIEVOQUJMRShORVRTQ0FQRV9QTFVHSU5fQVBJKQot ICAgIGRhdGFUeXBlc1RvUmVtb3ZlIHw9IFdlYnNpdGVEYXRhVHlwZTo6UGx1Z0luRGF0YTsKLSNl bmRpZgotI2lmIEVOQUJMRShNRURJQV9TVFJFQU0pCi0gICAgZGF0YVR5cGVzVG9SZW1vdmUgfD0g V2Vic2l0ZURhdGFUeXBlOjpNZWRpYURldmljZUlkZW50aWZpZXI7Ci0jZW5kaWYKLX0KICAgICAK IHZvaWQgV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjpyZW1vdmVEYXRhUmVjb3Jkcygp CiB7CkBAIC0xMjAsMTggKzEyNSwxNSBAQCB2b2lkIFdlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NT dG9yZTo6cmVtb3ZlRGF0YVJlY29yZHMoKQogICAgIGlmICghY29yZVN0b3JlKCkuc2hvdWxkUmVt b3ZlRGF0YVJlY29yZHMoKSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgVmVjdG9yPFN0cmluZz4g cHJldmFsZW50UmVzb3VyY2VEb21haW5zID0gY29yZVN0b3JlKCkudG9wUHJpdmF0ZWx5Q29udHJv bGxlZERvbWFpbnNUb1JlbW92ZVdlYnNpdGVEYXRhRm9yKCk7Ci0gICAgaWYgKCFwcmV2YWxlbnRS ZXNvdXJjZURvbWFpbnMuc2l6ZSgpKQorICAgIGF1dG8gcHJldmFsZW50UmVzb3VyY2VEb21haW5z ID0gY29yZVN0b3JlKCkudG9wUHJpdmF0ZWx5Q29udHJvbGxlZERvbWFpbnNUb1JlbW92ZVdlYnNp dGVEYXRhRm9yKCk7CisgICAgaWYgKHByZXZhbGVudFJlc291cmNlRG9tYWlucy5pc0VtcHR5KCkp CiAgICAgICAgIHJldHVybjsKICAgICAKICAgICBjb3JlU3RvcmUoKS5kYXRhUmVjb3Jkc0JlaW5n UmVtb3ZlZCgpOwogCi0gICAgaWYgKGRhdGFUeXBlc1RvUmVtb3ZlLmlzRW1wdHkoKSkKLSAgICAg ICAgaW5pdGlhbGl6ZURhdGFUeXBlc1RvUmVtb3ZlKCk7Ci0KICAgICAvLyBTd2l0Y2ggdG8gdGhl IG1haW4gdGhyZWFkIHRvIGdldCB0aGUgZGVmYXVsdCB3ZWJzaXRlIGRhdGEgc3RvcmUKICAgICBS dW5Mb29wOjptYWluKCkuZGlzcGF0Y2goW3ByZXZhbGVudFJlc291cmNlRG9tYWlucyA9IENyb3Nz VGhyZWFkQ29waWVyPFZlY3RvcjxTdHJpbmc+Pjo6Y29weShwcmV2YWxlbnRSZXNvdXJjZURvbWFp bnMpLCB0aGlzLCBwcm90ZWN0ZWRUaGlzID0gbWFrZVJlZigqdGhpcyldICgpIG11dGFibGUgewot ICAgICAgICBXZWJQcm9jZXNzUHJveHk6OmRlbGV0ZVdlYnNpdGVEYXRhRm9yVG9wUHJpdmF0ZWx5 Q29udHJvbGxlZERvbWFpbnNJbkFsbFBlcnNpc3RlbnREYXRhU3RvcmVzKGRhdGFUeXBlc1RvUmVt b3ZlLCBXVEZNb3ZlKHByZXZhbGVudFJlc291cmNlRG9tYWlucyksIG5vdGlmeVBhZ2VzV2hlbkRh dGFSZWNvcmRzV2VyZVNjYW5uZWQsIFt0aGlzLCBwcm90ZWN0ZWRUaGlzID0gV1RGTW92ZShwcm90 ZWN0ZWRUaGlzKV0oY29uc3QgSGFzaFNldDxTdHJpbmc+JiBkb21haW5zV2l0aERlbGV0ZWRXZWJz aXRlRGF0YSkgbXV0YWJsZSB7CisgICAgICAgIFdlYlByb2Nlc3NQcm94eTo6ZGVsZXRlV2Vic2l0 ZURhdGFGb3JUb3BQcml2YXRlbHlDb250cm9sbGVkRG9tYWluc0luQWxsUGVyc2lzdGVudERhdGFT dG9yZXMoZGF0YVR5cGVzVG9SZW1vdmUoKSwgV1RGTW92ZShwcmV2YWxlbnRSZXNvdXJjZURvbWFp bnMpLCBub3RpZnlQYWdlc1doZW5EYXRhUmVjb3Jkc1dlcmVTY2FubmVkLCBbdGhpcywgcHJvdGVj dGVkVGhpcyA9IFdURk1vdmUocHJvdGVjdGVkVGhpcyldKGNvbnN0IEhhc2hTZXQ8U3RyaW5nPiYg ZG9tYWluc1dpdGhEZWxldGVkV2Vic2l0ZURhdGEpIG11dGFibGUgewogICAgICAgICAgICAgLy8g QnV0IGFsd2F5cyB0b3VjaCB0aGUgUmVzb3VyY2VMb2FkU3RhdGlzdGljcyBzdG9yZSBvbiB0aGUg d29ya2VyIHF1ZXVlLgogICAgICAgICAgICAgbV9zdGF0aXN0aWNzUXVldWUtPmRpc3BhdGNoKFtw cm90ZWN0ZWRUaGlzID0gV1RGTW92ZShwcm90ZWN0ZWRUaGlzKSwgdG9wRG9tYWlucyA9IENyb3Nz VGhyZWFkQ29waWVyPEhhc2hTZXQ8U3RyaW5nPj46OmNvcHkoZG9tYWluc1dpdGhEZWxldGVkV2Vi c2l0ZURhdGEpXSAoKSBtdXRhYmxlIHsKICAgICAgICAgICAgICAgICBwcm90ZWN0ZWRUaGlzLT5j b3JlU3RvcmUoKS51cGRhdGVTdGF0aXN0aWNzRm9yUmVtb3ZlZERhdGFSZWNvcmRzKHRvcERvbWFp bnMpOwpAQCAtMTg2LDcgKzE4OCw3IEBAIHZvaWQgV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0 b3JlOjpzZXRSZXNvdXJjZUxvYWRTdGF0aXN0aWNzRW5hYmxlZChib29sIGVuYWJsCiAKICAgICBp ZiAobV9yZXNvdXJjZUxvYWRTdGF0aXN0aWNzRW5hYmxlZCkgewogICAgICAgICByZWFkRGF0YUZy b21EaXNrSWZOZWVkZWQoKTsKLSAgICAgICAgbV9zdGF0aXN0aWNzUXVldWUtPmRpc3BhdGNoKFt0 aGlzLCBwcm90ZWN0ZWRUaGlzID0gbWFrZVJlZigqdGhpcyldICgpIHsKKyAgICAgICAgbV9zdGF0 aXN0aWNzUXVldWUtPmRpc3BhdGNoKFt0aGlzLCBwcm90ZWN0ZWRUaGlzID0gbWFrZVJlZigqdGhp cyldIHsKICAgICAgICAgICAgIHN0YXJ0TW9uaXRvcmluZ1N0YXRpc3RpY3NTdG9yYWdlKCk7CiAg ICAgICAgIH0pOwogICAgIH0gZWxzZQpAQCAtMjE0LDcgKzIxNiw3IEBAIHZvaWQgV2ViUmVzb3Vy Y2VMb2FkU3RhdGlzdGljc1N0b3JlOjpyZWdpc3RlclNoYXJlZFJlc291cmNlTG9hZE9ic2VydmVy KCkKICAgICAgICAgICAgIHdyaXRlU3RvcmVUb0Rpc2soKTsKICAgICAgICAgfSk7CiAgICAgfSk7 Ci0gICAgbV9yZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUtPnNldEdyYW5kZmF0aGVyRXhpc3Rp bmdXZWJzaXRlRGF0YUNhbGxiYWNrKFt0aGlzLCBwcm90ZWN0ZWRUaGlzID0gbWFrZVJlZigqdGhp cyldKCkgeworICAgIG1fcmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlLT5zZXRHcmFuZGZhdGhl ckV4aXN0aW5nV2Vic2l0ZURhdGFDYWxsYmFjayhbdGhpcywgcHJvdGVjdGVkVGhpcyA9IG1ha2VS ZWYoKnRoaXMpXSB7CiAgICAgICAgIGdyYW5kZmF0aGVyRXhpc3RpbmdXZWJzaXRlRGF0YSgpOwog ICAgIH0pOwogICAgIG1fcmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlLT5zZXREZWxldGVQZXJz aXN0ZW50U3RvcmVDYWxsYmFjayhbdGhpcywgcHJvdGVjdGVkVGhpcyA9IG1ha2VSZWYoKnRoaXMp XSB7CkBAIC0yMjIsNyArMjI0LDcgQEAgdm9pZCBXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3Rv cmU6OnJlZ2lzdGVyU2hhcmVkUmVzb3VyY2VMb2FkT2JzZXJ2ZXIoKQogICAgICAgICAgICAgZGVs ZXRlU3RvcmVGcm9tRGlzaygpOwogICAgICAgICB9KTsKICAgICB9KTsKLSAgICBtX3Jlc291cmNl TG9hZFN0YXRpc3RpY3NTdG9yZS0+c2V0RmlyZVRlbGVtZXRyeUNhbGxiYWNrKFt0aGlzLCBwcm90 ZWN0ZWRUaGlzID0gbWFrZVJlZigqdGhpcyldKCkgeworICAgIG1fcmVzb3VyY2VMb2FkU3RhdGlz dGljc1N0b3JlLT5zZXRGaXJlVGVsZW1ldHJ5Q2FsbGJhY2soW3RoaXMsIHByb3RlY3RlZFRoaXMg PSBtYWtlUmVmKCp0aGlzKV0gewogICAgICAgICAvLyBUaGlzIGNhbmNlbHMgdGhlIG9uZSBzaG90 IHRpbWVyIGFuZCBpcyBvbmx5IGludGVuZGVkIGZvciB0ZXN0aW5nIHB1cnBvc2VzLgogICAgICAg ICBtX3RlbGVtZXRyeU9uZVNob3RUaW1lci5zdGFydE9uZVNob3QoMTAwX21zKTsKICAgICB9KTsK QEAgLTI0MywxMiArMjQ1LDkgQEAgdm9pZCBXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6 OnJlZ2lzdGVyU2hhcmVkUmVzb3VyY2VMb2FkT2JzZXJ2ZXIoV1RGOjpGdW4KIAogdm9pZCBXZWJS ZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OmdyYW5kZmF0aGVyRXhpc3RpbmdXZWJzaXRlRGF0 YSgpCiB7Ci0gICAgaWYgKGRhdGFUeXBlc1RvUmVtb3ZlLmlzRW1wdHkoKSkKLSAgICAgICAgaW5p dGlhbGl6ZURhdGFUeXBlc1RvUmVtb3ZlKCk7Ci0gICAgCiAgICAgLy8gU3dpdGNoIHRvIHRoZSBt YWluIHRocmVhZCB0byBnZXQgdGhlIGRlZmF1bHQgd2Vic2l0ZSBkYXRhIHN0b3JlCiAgICAgUnVu TG9vcDo6bWFpbigpLmRpc3BhdGNoKFt0aGlzLCBwcm90ZWN0ZWRUaGlzID0gbWFrZVJlZigqdGhp cyldICgpIG11dGFibGUgewotICAgICAgICBXZWJQcm9jZXNzUHJveHk6OnRvcFByaXZhdGVseUNv bnRyb2xsZWREb21haW5zV2l0aFdlYnNpdGVEYXRhKGRhdGFUeXBlc1RvUmVtb3ZlLCBub3RpZnlQ YWdlc1doZW5EYXRhUmVjb3Jkc1dlcmVTY2FubmVkLCBbdGhpcywgcHJvdGVjdGVkVGhpcyA9IFdU Rk1vdmUocHJvdGVjdGVkVGhpcyldIChIYXNoU2V0PFN0cmluZz4mJiB0b3BQcml2YXRlbHlDb250 cm9sbGVkRG9tYWluc1dpdGhXZWJzaXRlRGF0YSkgbXV0YWJsZSB7CisgICAgICAgIFdlYlByb2Nl c3NQcm94eTo6dG9wUHJpdmF0ZWx5Q29udHJvbGxlZERvbWFpbnNXaXRoV2Vic2l0ZURhdGEoZGF0 YVR5cGVzVG9SZW1vdmUoKSwgbm90aWZ5UGFnZXNXaGVuRGF0YVJlY29yZHNXZXJlU2Nhbm5lZCwg W3RoaXMsIHByb3RlY3RlZFRoaXMgPSBXVEZNb3ZlKHByb3RlY3RlZFRoaXMpXSAoSGFzaFNldDxT dHJpbmc+JiYgdG9wUHJpdmF0ZWx5Q29udHJvbGxlZERvbWFpbnNXaXRoV2Vic2l0ZURhdGEpIG11 dGFibGUgewogICAgICAgICAgICAgLy8gQnV0IGFsd2F5cyB0b3VjaCB0aGUgUmVzb3VyY2VMb2Fk U3RhdGlzdGljcyBzdG9yZSBvbiB0aGUgd29ya2VyIHF1ZXVlCiAgICAgICAgICAgICBtX3N0YXRp c3RpY3NRdWV1ZS0+ZGlzcGF0Y2goW3Byb3RlY3RlZFRoaXMgPSBXVEZNb3ZlKHByb3RlY3RlZFRo aXMpLCB0b3BEb21haW5zID0gQ3Jvc3NUaHJlYWRDb3BpZXI8SGFzaFNldDxTdHJpbmc+Pjo6Y29w eSh0b3BQcml2YXRlbHlDb250cm9sbGVkRG9tYWluc1dpdGhXZWJzaXRlRGF0YSldICgpIG11dGFi bGUgewogICAgICAgICAgICAgICAgIHByb3RlY3RlZFRoaXMtPmNvcmVTdG9yZSgpLmhhbmRsZUZy ZXNoU3RhcnRXaXRoRW1wdHlPck5vU3RvcmUoV1RGTW92ZSh0b3BEb21haW5zKSk7CkBAIC00Mjks OSArNDI4LDYgQEAgdm9pZCBXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OnN0YXJ0TW9u aXRvcmluZ1N0YXRpc3RpY3NTdG9yYWdlKCkKIHZvaWQgV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGlj c1N0b3JlOjpzdG9wTW9uaXRvcmluZ1N0YXRpc3RpY3NTdG9yYWdlKCkKIHsKICAgICBBU1NFUlQo IVJ1bkxvb3A6OmlzTWFpbigpKTsKLSAgICBpZiAoIW1fc3RhdGlzdGljc1N0b3JhZ2VNb25pdG9y KQotICAgICAgICByZXR1cm47Ci0KICAgICBtX3N0YXRpc3RpY3NTdG9yYWdlTW9uaXRvciA9IG51 bGxwdHI7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJSZXNv dXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJS ZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUuaAppbmRleCBjMzkyMjliYWMwOTQ1YWM5NjcyODc4 MzI3MTZmNzhmMjE1NzE1Nzk3Li4wMmJmNDIyMjJkOGY5ZmUzYzVlOWQxMTUwZmE0ZmZiMTg0Yzli Y2UyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUmVzb3VyY2VMb2Fk U3RhdGlzdGljc1N0b3JlLmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlJlc291 cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5oCkBAIC01MiwxMCArNTIsOSBAQCBzdHJ1Y3QgUmVzb3Vy Y2VMb2FkU3RhdGlzdGljczsKIAogbmFtZXNwYWNlIFdlYktpdCB7CiAKLWNsYXNzIFdlYlByb2Nl c3NQb29sOwogY2xhc3MgV2ViUHJvY2Vzc1Byb3h5OwogCi1jbGFzcyBXZWJSZXNvdXJjZUxvYWRT dGF0aXN0aWNzU3RvcmUgOiBwdWJsaWMgSVBDOjpDb25uZWN0aW9uOjpXb3JrUXVldWVNZXNzYWdl UmVjZWl2ZXIgeworY2xhc3MgV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlIGZpbmFsIDog cHVibGljIElQQzo6Q29ubmVjdGlvbjo6V29ya1F1ZXVlTWVzc2FnZVJlY2VpdmVyIHsKIHB1Ymxp YzoKICAgICBzdGF0aWMgUmVmPFdlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZT4gY3JlYXRl KGNvbnN0IFN0cmluZyYpOwogICAgIHN0YXRpYyB2b2lkIHNldE5vdGlmeVBhZ2VzV2hlbkRhdGFS ZWNvcmRzV2VyZVNjYW5uZWQoYm9vbCk7Cg==