134000 2014-06-17 15:52:51 -0700 Expose the location of website data 2014-06-18 09:22:47 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 andersca andersca commit-queue mitz oldest_to_newest 1016283 0 andersca 2014-06-17 15:52:51 -0700 Expose the location of website data 1016285 1 233264 andersca 2014-06-17 15:54:45 -0700 Created attachment 233264 Patch 1016286 2 commit-queue 2014-06-17 15:56:29 -0700 Attachment 233264 did not pass style-queue: ERROR: Source/WebKit2/Shared/mac/SandboxUtilities.cpp:39: sandbox_container_path_for_pid is incorrectly named. Don't use underscores in your identifier names. [readability/naming/underscores] [4] Total errors found: 1 in 5 files If any of these errors are false positives, please file a bug against check-webkit-style. 1016292 3 233264 mitz 2014-06-17 16:08:05 -0700 Comment on attachment 233264 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=233264&action=review > Source/WebKit2/Shared/mac/SandboxUtilities.cpp:50 > +static bool processIsAppSandboxed(pid_t pid) Given what this does, I think the name is wrong. There is a difference between being in a container and being app-sandboxed (which implies the former), but this checks just for the container. So I think the name should be something like processHasContainer(). > Source/WebKit2/Shared/mac/SandboxUtilities.cpp:57 > + if (path[0] == '\0') !path[0] > Source/WebKit2/Shared/mac/SandboxUtilities.cpp:63 > +bool processIsAppSandboxed() Ditto. > Source/WebKit2/UIProcess/API/Cocoa/WKProcessPool.mm:108 > ++ (NSURL *)_websiteDataURLForContainerWithURL:(NSURL *)containerURL The fact that the containerURL parameter isn’t used is telling. This won’t work if called from a process that doesn’t have a container and wants to find the website data location for a process with the given container. 1016297 4 233267 andersca 2014-06-17 16:22:41 -0700 Created attachment 233267 Patch 1016298 5 commit-queue 2014-06-17 16:24:15 -0700 Attachment 233267 did not pass style-queue: ERROR: Source/WebKit2/Shared/mac/SandboxUtilities.cpp:39: sandbox_container_path_for_pid is incorrectly named. Don't use underscores in your identifier names. [readability/naming/underscores] [4] Total errors found: 1 in 5 files If any of these errors are false positives, please file a bug against check-webkit-style. 1016302 6 233267 mitz 2014-06-17 16:32:38 -0700 Comment on attachment 233267 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=233267&action=review > Source/WebKit2/Shared/mac/SandboxUtilities.cpp:57 > + if (path[0] == '\0') !path[0] 1016307 7 andersca 2014-06-17 16:37:11 -0700 Committed r170084: <http://trac.webkit.org/changeset/170084> 1016459 8 mitz 2014-06-18 09:22:47 -0700 <rdar://problem/17350498> 233264 2014-06-17 15:54:45 -0700 2014-06-17 16:22:39 -0700 Patch bug-134000-20140617155422.patch text/plain 5344 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTcwMDc1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggYWY0YWQ4N2EyODk2MWY2 NTA1OGQxY2JlOGIwZDEwZmQxNGQ4Yzc5YS4uZjg4MjZkNzcyMjJmZDJmNzdkNDIwNjgxNGYxMjI3 YTBiN2Y4NTJkNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDE0LTA2LTE3ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAgRXhwb3NlIHRoZSBs b2NhdGlvbiBvZiB3ZWJzaXRlIGRhdGEKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTEzNDAwMAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMTczNTA0OTg+ CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWxzbywg cmVtb3ZlIHRoZSBidW5kbGUgSUQgZnJvbSB0aGUgd2Vic2l0ZSBkYXRhIHBhdGggZm9yIGNvbnRh aW5lcml6ZWQgYXBwcy4KKworICAgICAgICAqIFNoYXJlZC9tYWMvU2FuZGJveFV0aWxpdGllcy5j cHA6CisgICAgICAgIChXZWJLaXQ6OnByb2Nlc3NJc0FwcFNhbmRib3hlZCk6CisgICAgICAgICog U2hhcmVkL21hYy9TYW5kYm94VXRpbGl0aWVzLmg6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9D b2NvYS9XS1Byb2Nlc3NQb29sLm1tOgorICAgICAgICAoK1tXS1Byb2Nlc3NQb29sIF93ZWJzaXRl RGF0YVVSTEZvckNvbnRhaW5lcldpdGhVUkw6XSk6CisgICAgICAgICh3ZWJzaXRlRGF0YURpcmVj dG9yeVVSTCk6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1Byb2Nlc3NQb29sUHJp dmF0ZS5oOgorCiAyMDE0LTA2LTE3ICBFcmljIENhcmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUu Y29tPgogCiAgICAgICAgIFtpT1NdIGVuYWJsZSBiYWNrZ3JvdW5kIGF1ZGlvIGluIFdLMgpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdDIvU2hhcmVkL21hYy9TYW5kYm94VXRpbGl0aWVzLmNwcCBi L1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9tYWMvU2FuZGJveFV0aWxpdGllcy5jcHAKaW5kZXggOTI3 NmU0MWJkYzBiMzA2N2I3ZGM0M2JlNmI5YmUxN2M2OTc3OWQwMi4uM2FjMTIzY2ZhM2IxM2I0NTkx ZDg3NjgzMmZmZTg1NjY3OWZhNDM2YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvU2hhcmVk L21hYy9TYW5kYm94VXRpbGl0aWVzLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvbWFj L1NhbmRib3hVdGlsaXRpZXMuY3BwCkBAIC0yNiwxNCArMjYsMTggQEAKICNpbmNsdWRlICJjb25m aWcuaCIKICNpbmNsdWRlICJTYW5kYm94VXRpbGl0aWVzLmgiCiAKKyNpbmNsdWRlIDxhcnJheT4K KwogI2lmIF9faGFzX2luY2x1ZGUoPHNhbmRib3gvcHJpdmF0ZS5oPikKICNpbXBvcnQgPHNhbmRi b3gvcHJpdmF0ZS5oPgogI2Vsc2UKIGVudW0gc2FuZGJveF9maWx0ZXJfdHlwZSB7CiAgICAgU0FO REJPWF9GSUxURVJfTk9ORSwKIH07Ci1leHRlcm4gIkMiCitleHRlcm4gIkMiIHsKIGludCBzYW5k Ym94X2NoZWNrKHBpZF90LCBjb25zdCBjaGFyICpvcGVyYXRpb24sIGVudW0gc2FuZGJveF9maWx0 ZXJfdHlwZSwgLi4uKTsKK2ludCBzYW5kYm94X2NvbnRhaW5lcl9wYXRoX2Zvcl9waWQocGlkX3Qs IGNoYXIgKmJ1ZmZlciwgc2l6ZV90IGJ1ZnNpemUpOworfQogI2VuZGlmCiAKIG5hbWVzcGFjZSBX ZWJLaXQgewpAQCAtNDMsNCArNDcsMjQgQEAgYm9vbCBwcm9jZXNzSXNTYW5kYm94ZWQocGlkX3Qg cGlkKQogICAgIHJldHVybiBzYW5kYm94X2NoZWNrKHBpZCwgbnVsbHB0ciwgU0FOREJPWF9GSUxU RVJfTk9ORSk7CiB9CiAKK3N0YXRpYyBib29sIHByb2Nlc3NJc0FwcFNhbmRib3hlZChwaWRfdCBw aWQpCit7CisgICAgc3RkOjphcnJheTxjaGFyLCBNQVhQQVRITEVOPiBwYXRoOworCisgICAgaWYg KHNhbmRib3hfY29udGFpbmVyX3BhdGhfZm9yX3BpZChwaWQsIHBhdGguZGF0YSgpLCBwYXRoLnNp emUoKSkpCisgICAgICAgIHJldHVybiBmYWxzZTsKKworICAgIGlmIChwYXRoWzBdID09ICdcMCcp CisgICAgICAgIHJldHVybiBmYWxzZTsKKworICAgIHJldHVybiB0cnVlOworfQorCitib29sIHBy b2Nlc3NJc0FwcFNhbmRib3hlZCgpCit7CisgICAgc3RhdGljIGJvb2wgaXNBcHBTYW5kYm94ZWQg PSBwcm9jZXNzSXNBcHBTYW5kYm94ZWQoZ2V0cGlkKCkpOworCisgICAgcmV0dXJuIGlzQXBwU2Fu ZGJveGVkOworfQorCiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvbWFjL1Nh bmRib3hVdGlsaXRpZXMuaCBiL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9tYWMvU2FuZGJveFV0aWxp dGllcy5oCmluZGV4IDdhOWUwZjJjODRhMWQ3Yzk2YTJlNDM3OGM2YmQyYWZhOGI4ZDFhOGYuLjJh YjVmZGU2NzUxODJmYWM1OTg0NjRiNTkyNGJhMTA0NmE3NWI3NjEgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQyL1NoYXJlZC9tYWMvU2FuZGJveFV0aWxpdGllcy5oCisrKyBiL1NvdXJjZS9XZWJL aXQyL1NoYXJlZC9tYWMvU2FuZGJveFV0aWxpdGllcy5oCkBAIC0zMSw2ICszMSw3IEBACiBuYW1l c3BhY2UgV2ViS2l0IHsKIAogYm9vbCBwcm9jZXNzSXNTYW5kYm94ZWQocGlkX3QpOworYm9vbCBw cm9jZXNzSXNBcHBTYW5kYm94ZWQoKTsKIAogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLUHJvY2Vzc1Bvb2wubW0gYi9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL0NvY29hL1dLUHJvY2Vzc1Bvb2wubW0KaW5kZXggZTc1NjUyYjU5NWNjYjEz MGVlZGExMDMxNzJiNWVjNjAwNGVmZDJlNy4uMzMwMDE0YjBhZTVkMGQzM2VkMGZjZTY3MDlmM2Jl NDM5N2RlYjg2YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2Nv YS9XS1Byb2Nlc3NQb29sLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29j b2EvV0tQcm9jZXNzUG9vbC5tbQpAQCAtMzIsNiArMzIsNyBAQAogI2ltcG9ydCAiRG93bmxvYWRD bGllbnQuaCIKICNpbXBvcnQgIkhpc3RvcnlDbGllbnQuaCIKICNpbXBvcnQgIlByb2Nlc3NNb2Rl bC5oIgorI2ltcG9ydCAiU2FuZGJveFV0aWxpdGllcy5oIgogI2ltcG9ydCAiV0tPYmplY3QuaCIK ICNpbXBvcnQgIldlYWtPYmpDUHRyLmgiCiAjaW1wb3J0ICJXZWJDZXJ0aWZpY2F0ZUluZm8uaCIK QEAgLTEwNCw2ICsxMDUsMTYgQEAgZW51bSA6IE5TVUludGVnZXIgewogCiBAaW1wbGVtZW50YXRp b24gV0tQcm9jZXNzUG9vbCAoV0tQcml2YXRlKQogCisrIChOU1VSTCAqKV93ZWJzaXRlRGF0YVVS TEZvckNvbnRhaW5lcldpdGhVUkw6KE5TVVJMICopY29udGFpbmVyVVJMCit7CisgICAgTlNVUkwg KnVybCA9IFtbTlNGaWxlTWFuYWdlciBkZWZhdWx0TWFuYWdlcl0gVVJMRm9yRGlyZWN0b3J5Ok5T TGlicmFyeURpcmVjdG9yeSBpbkRvbWFpbjpOU1VzZXJEb21haW5NYXNrIGFwcHJvcHJpYXRlRm9y VVJMOm51bGxwdHIgY3JlYXRlOk5PIGVycm9yOm51bGxwdHJdOworICAgIGlmICghdXJsKQorICAg ICAgICBSRUxFQVNFX0FTU0VSVF9OT1RfUkVBQ0hFRCgpOworCisgICAgdXJsID0gW3VybCBVUkxC eUFwcGVuZGluZ1BhdGhDb21wb25lbnQ6QCJXZWJLaXQiIGlzRGlyZWN0b3J5OllFU107CisgICAg cmV0dXJuIFt1cmwgVVJMQnlBcHBlbmRpbmdQYXRoQ29tcG9uZW50OkAiV2Vic2l0ZURhdGEiIGlz RGlyZWN0b3J5OllFU107Cit9CisKIHN0YXRpYyBOU1VSTCAqd2Vic2l0ZURhdGFEaXJlY3RvcnlV UkwoTlNTdHJpbmcgKmRpcmVjdG9yeU5hbWUpCiB7CiAgICAgc3RhdGljIGRpc3BhdGNoX29uY2Vf dCBvbmNlVG9rZW47CkBAIC0xMTYsMTEgKzEyNywxMiBAQCBzdGF0aWMgTlNVUkwgKndlYnNpdGVE YXRhRGlyZWN0b3J5VVJMKE5TU3RyaW5nICpkaXJlY3RvcnlOYW1lKQogCiAgICAgICAgIHVybCA9 IFt1cmwgVVJMQnlBcHBlbmRpbmdQYXRoQ29tcG9uZW50OkAiV2ViS2l0IiBpc0RpcmVjdG9yeTpZ RVNdOwogCi0gICAgICAgIE5TU3RyaW5nICpidW5kbGVJZGVudGlmaWVyID0gW05TQnVuZGxlIG1h aW5CdW5kbGVdLmJ1bmRsZUlkZW50aWZpZXI7Ci0gICAgICAgIGlmICghYnVuZGxlSWRlbnRpZmll cikKLSAgICAgICAgICAgIGJ1bmRsZUlkZW50aWZpZXIgPSBbTlNQcm9jZXNzSW5mbyBwcm9jZXNz SW5mb10ucHJvY2Vzc05hbWU7Ci0KLSAgICAgICAgdXJsID0gW3VybCBVUkxCeUFwcGVuZGluZ1Bh dGhDb21wb25lbnQ6YnVuZGxlSWRlbnRpZmllciBpc0RpcmVjdG9yeTpZRVNdOworICAgICAgICBp ZiAoIVdlYktpdDo6cHJvY2Vzc0lzQXBwU2FuZGJveGVkKCkpIHsKKyAgICAgICAgICAgIE5TU3Ry aW5nICpidW5kbGVJZGVudGlmaWVyID0gW05TQnVuZGxlIG1haW5CdW5kbGVdLmJ1bmRsZUlkZW50 aWZpZXI7CisgICAgICAgICAgICBpZiAoIWJ1bmRsZUlkZW50aWZpZXIpCisgICAgICAgICAgICAg ICAgYnVuZGxlSWRlbnRpZmllciA9IFtOU1Byb2Nlc3NJbmZvIHByb2Nlc3NJbmZvXS5wcm9jZXNz TmFtZTsKKyAgICAgICAgICAgIHVybCA9IFt1cmwgVVJMQnlBcHBlbmRpbmdQYXRoQ29tcG9uZW50 OmJ1bmRsZUlkZW50aWZpZXIgaXNEaXJlY3Rvcnk6WUVTXTsKKyAgICAgICAgfQogCiAgICAgICAg IHdlYnNpdGVEYXRhVVJMID0gW1t1cmwgVVJMQnlBcHBlbmRpbmdQYXRoQ29tcG9uZW50OkAiV2Vi c2l0ZURhdGEiIGlzRGlyZWN0b3J5OllFU10gcmV0YWluXTsKICAgICB9KTsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tQcm9jZXNzUG9vbFByaXZhdGUu aCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tQcm9jZXNzUG9vbFByaXZh dGUuaAppbmRleCA3YWUyZmFhNDQ2MGRkMmViMmEwNTRkMjAxNzQ4MTdlZDIxYmFmMzYwLi44ZWQz ZTAyN2FjNzJjMDViMjNhNzVhZWJkYmVkNjkwZGJjYjM3ZDY5IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLUHJvY2Vzc1Bvb2xQcml2YXRlLmgKKysrIGIv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1Byb2Nlc3NQb29sUHJpdmF0ZS5o CkBAIC00NCw2ICs0NCw4IEBACiAKIEBwcm9wZXJ0eSAobm9uYXRvbWljLCB3ZWFrLCBzZXR0ZXI9 X3NldERvd25sb2FkRGVsZWdhdGU6KSBpZCA8X1dLRG93bmxvYWREZWxlZ2F0ZT4gX2Rvd25sb2Fk RGVsZWdhdGU7CiAKKysgKE5TVVJMICopX3dlYnNpdGVEYXRhVVJMRm9yQ29udGFpbmVyV2l0aFVS TDooTlNVUkwgKiljb250YWluZXJVUkw7CisKIEBlbmQKIAogI2VuZGlmCg== 233267 2014-06-17 16:22:41 -0700 2014-06-17 16:32:37 -0700 Patch bug-134000-20140617162218.patch text/plain 5200 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTcwMDc1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggYWY0YWQ4N2EyODk2MWY2 NTA1OGQxY2JlOGIwZDEwZmQxNGQ4Yzc5YS4uZjg4MjZkNzcyMjJmZDJmNzdkNDIwNjgxNGYxMjI3 YTBiN2Y4NTJkNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDE0LTA2LTE3ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAgRXhwb3NlIHRoZSBs b2NhdGlvbiBvZiB3ZWJzaXRlIGRhdGEKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTEzNDAwMAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMTczNTA0OTg+ CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWxzbywg cmVtb3ZlIHRoZSBidW5kbGUgSUQgZnJvbSB0aGUgd2Vic2l0ZSBkYXRhIHBhdGggZm9yIGNvbnRh aW5lcml6ZWQgYXBwcy4KKworICAgICAgICAqIFNoYXJlZC9tYWMvU2FuZGJveFV0aWxpdGllcy5j cHA6CisgICAgICAgIChXZWJLaXQ6OnByb2Nlc3NJc0FwcFNhbmRib3hlZCk6CisgICAgICAgICog U2hhcmVkL21hYy9TYW5kYm94VXRpbGl0aWVzLmg6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9D b2NvYS9XS1Byb2Nlc3NQb29sLm1tOgorICAgICAgICAoK1tXS1Byb2Nlc3NQb29sIF93ZWJzaXRl RGF0YVVSTEZvckNvbnRhaW5lcldpdGhVUkw6XSk6CisgICAgICAgICh3ZWJzaXRlRGF0YURpcmVj dG9yeVVSTCk6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1Byb2Nlc3NQb29sUHJp dmF0ZS5oOgorCiAyMDE0LTA2LTE3ICBFcmljIENhcmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUu Y29tPgogCiAgICAgICAgIFtpT1NdIGVuYWJsZSBiYWNrZ3JvdW5kIGF1ZGlvIGluIFdLMgpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdDIvU2hhcmVkL21hYy9TYW5kYm94VXRpbGl0aWVzLmNwcCBi L1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9tYWMvU2FuZGJveFV0aWxpdGllcy5jcHAKaW5kZXggOTI3 NmU0MWJkYzBiMzA2N2I3ZGM0M2JlNmI5YmUxN2M2OTc3OWQwMi4uNmJhODM3Nzk3YjFlNTZhMjU1 MTE3NWU4NWMzNDE4NWIyZWRhOWY1OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvU2hhcmVk L21hYy9TYW5kYm94VXRpbGl0aWVzLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvbWFj L1NhbmRib3hVdGlsaXRpZXMuY3BwCkBAIC0yNiwxNCArMjYsMTggQEAKICNpbmNsdWRlICJjb25m aWcuaCIKICNpbmNsdWRlICJTYW5kYm94VXRpbGl0aWVzLmgiCiAKKyNpbmNsdWRlIDxhcnJheT4K KwogI2lmIF9faGFzX2luY2x1ZGUoPHNhbmRib3gvcHJpdmF0ZS5oPikKICNpbXBvcnQgPHNhbmRi b3gvcHJpdmF0ZS5oPgogI2Vsc2UKIGVudW0gc2FuZGJveF9maWx0ZXJfdHlwZSB7CiAgICAgU0FO REJPWF9GSUxURVJfTk9ORSwKIH07Ci1leHRlcm4gIkMiCitleHRlcm4gIkMiIHsKIGludCBzYW5k Ym94X2NoZWNrKHBpZF90LCBjb25zdCBjaGFyICpvcGVyYXRpb24sIGVudW0gc2FuZGJveF9maWx0 ZXJfdHlwZSwgLi4uKTsKK2ludCBzYW5kYm94X2NvbnRhaW5lcl9wYXRoX2Zvcl9waWQocGlkX3Qs IGNoYXIgKmJ1ZmZlciwgc2l6ZV90IGJ1ZnNpemUpOworfQogI2VuZGlmCiAKIG5hbWVzcGFjZSBX ZWJLaXQgewpAQCAtNDMsNCArNDcsMjQgQEAgYm9vbCBwcm9jZXNzSXNTYW5kYm94ZWQocGlkX3Qg cGlkKQogICAgIHJldHVybiBzYW5kYm94X2NoZWNrKHBpZCwgbnVsbHB0ciwgU0FOREJPWF9GSUxU RVJfTk9ORSk7CiB9CiAKK3N0YXRpYyBib29sIHByb2Nlc3NIYXNDb250YWluZXIocGlkX3QgcGlk KQoreworICAgIHN0ZDo6YXJyYXk8Y2hhciwgTUFYUEFUSExFTj4gcGF0aDsKKworICAgIGlmIChz YW5kYm94X2NvbnRhaW5lcl9wYXRoX2Zvcl9waWQocGlkLCBwYXRoLmRhdGEoKSwgcGF0aC5zaXpl KCkpKQorICAgICAgICByZXR1cm4gZmFsc2U7CisKKyAgICBpZiAocGF0aFswXSA9PSAnXDAnKQor ICAgICAgICByZXR1cm4gZmFsc2U7CisKKyAgICByZXR1cm4gdHJ1ZTsKK30KKworYm9vbCBwcm9j ZXNzSGFzQ29udGFpbmVyKCkKK3sKKyAgICBzdGF0aWMgYm9vbCBoYXNDb250YWluZXIgPSBwcm9j ZXNzSGFzQ29udGFpbmVyKGdldHBpZCgpKTsKKworICAgIHJldHVybiBoYXNDb250YWluZXI7Cit9 CisKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9tYWMvU2FuZGJveFV0aWxp dGllcy5oIGIvU291cmNlL1dlYktpdDIvU2hhcmVkL21hYy9TYW5kYm94VXRpbGl0aWVzLmgKaW5k ZXggN2E5ZTBmMmM4NGExZDdjOTZhMmU0Mzc4YzZiZDJhZmE4YjhkMWE4Zi4uOTAzYWUxYmE4Y2Fl MjQxNWVjOWJlMjNjOWRmNTNkNmI3NWJmNzI0MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIv U2hhcmVkL21hYy9TYW5kYm94VXRpbGl0aWVzLmgKKysrIGIvU291cmNlL1dlYktpdDIvU2hhcmVk L21hYy9TYW5kYm94VXRpbGl0aWVzLmgKQEAgLTMxLDYgKzMxLDcgQEAKIG5hbWVzcGFjZSBXZWJL aXQgewogCiBib29sIHByb2Nlc3NJc1NhbmRib3hlZChwaWRfdCk7Citib29sIHByb2Nlc3NIYXND b250YWluZXIoKTsKIAogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv QVBJL0NvY29hL1dLUHJvY2Vzc1Bvb2wubW0gYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJ L0NvY29hL1dLUHJvY2Vzc1Bvb2wubW0KaW5kZXggZTc1NjUyYjU5NWNjYjEzMGVlZGExMDMxNzJi NWVjNjAwNGVmZDJlNy4uY2U3YWJjMmI2ZjY3YTE5YzQ4NDI2YTMzNGNmMmM5M2RlYjI4MmYwZSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1Byb2Nlc3NQ b29sLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tQcm9jZXNz UG9vbC5tbQpAQCAtMzIsNiArMzIsNyBAQAogI2ltcG9ydCAiRG93bmxvYWRDbGllbnQuaCIKICNp bXBvcnQgIkhpc3RvcnlDbGllbnQuaCIKICNpbXBvcnQgIlByb2Nlc3NNb2RlbC5oIgorI2ltcG9y dCAiU2FuZGJveFV0aWxpdGllcy5oIgogI2ltcG9ydCAiV0tPYmplY3QuaCIKICNpbXBvcnQgIldl YWtPYmpDUHRyLmgiCiAjaW1wb3J0ICJXZWJDZXJ0aWZpY2F0ZUluZm8uaCIKQEAgLTEwNCw2ICsx MDUsMTMgQEAgZW51bSA6IE5TVUludGVnZXIgewogCiBAaW1wbGVtZW50YXRpb24gV0tQcm9jZXNz UG9vbCAoV0tQcml2YXRlKQogCisrIChOU1VSTCAqKV93ZWJzaXRlRGF0YVVSTEZvckNvbnRhaW5l cldpdGhVUkw6KE5TVVJMICopY29udGFpbmVyVVJMCit7CisgICAgTlNVUkwgKnVybCA9IFtjb250 YWluZXJVUkwgVVJMQnlBcHBlbmRpbmdQYXRoQ29tcG9uZW50OkAiTGlicmFyeSIgaXNEaXJlY3Rv cnk6WUVTXTsKKyAgICB1cmwgPSBbdXJsIFVSTEJ5QXBwZW5kaW5nUGF0aENvbXBvbmVudDpAIldl YktpdCIgaXNEaXJlY3Rvcnk6WUVTXTsKKyAgICByZXR1cm4gW3VybCBVUkxCeUFwcGVuZGluZ1Bh dGhDb21wb25lbnQ6QCJXZWJzaXRlRGF0YSIgaXNEaXJlY3Rvcnk6WUVTXTsKK30KKwogc3RhdGlj IE5TVVJMICp3ZWJzaXRlRGF0YURpcmVjdG9yeVVSTChOU1N0cmluZyAqZGlyZWN0b3J5TmFtZSkK IHsKICAgICBzdGF0aWMgZGlzcGF0Y2hfb25jZV90IG9uY2VUb2tlbjsKQEAgLTExNiwxMSArMTI0 LDEyIEBAIHN0YXRpYyBOU1VSTCAqd2Vic2l0ZURhdGFEaXJlY3RvcnlVUkwoTlNTdHJpbmcgKmRp cmVjdG9yeU5hbWUpCiAKICAgICAgICAgdXJsID0gW3VybCBVUkxCeUFwcGVuZGluZ1BhdGhDb21w b25lbnQ6QCJXZWJLaXQiIGlzRGlyZWN0b3J5OllFU107CiAKLSAgICAgICAgTlNTdHJpbmcgKmJ1 bmRsZUlkZW50aWZpZXIgPSBbTlNCdW5kbGUgbWFpbkJ1bmRsZV0uYnVuZGxlSWRlbnRpZmllcjsK LSAgICAgICAgaWYgKCFidW5kbGVJZGVudGlmaWVyKQotICAgICAgICAgICAgYnVuZGxlSWRlbnRp ZmllciA9IFtOU1Byb2Nlc3NJbmZvIHByb2Nlc3NJbmZvXS5wcm9jZXNzTmFtZTsKLQotICAgICAg ICB1cmwgPSBbdXJsIFVSTEJ5QXBwZW5kaW5nUGF0aENvbXBvbmVudDpidW5kbGVJZGVudGlmaWVy IGlzRGlyZWN0b3J5OllFU107CisgICAgICAgIGlmICghV2ViS2l0Ojpwcm9jZXNzSGFzQ29udGFp bmVyKCkpIHsKKyAgICAgICAgICAgIE5TU3RyaW5nICpidW5kbGVJZGVudGlmaWVyID0gW05TQnVu ZGxlIG1haW5CdW5kbGVdLmJ1bmRsZUlkZW50aWZpZXI7CisgICAgICAgICAgICBpZiAoIWJ1bmRs ZUlkZW50aWZpZXIpCisgICAgICAgICAgICAgICAgYnVuZGxlSWRlbnRpZmllciA9IFtOU1Byb2Nl c3NJbmZvIHByb2Nlc3NJbmZvXS5wcm9jZXNzTmFtZTsKKyAgICAgICAgICAgIHVybCA9IFt1cmwg VVJMQnlBcHBlbmRpbmdQYXRoQ29tcG9uZW50OmJ1bmRsZUlkZW50aWZpZXIgaXNEaXJlY3Rvcnk6 WUVTXTsKKyAgICAgICAgfQogCiAgICAgICAgIHdlYnNpdGVEYXRhVVJMID0gW1t1cmwgVVJMQnlB cHBlbmRpbmdQYXRoQ29tcG9uZW50OkAiV2Vic2l0ZURhdGEiIGlzRGlyZWN0b3J5OllFU10gcmV0 YWluXTsKICAgICB9KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkv Q29jb2EvV0tQcm9jZXNzUG9vbFByaXZhdGUuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9B UEkvQ29jb2EvV0tQcm9jZXNzUG9vbFByaXZhdGUuaAppbmRleCA3YWUyZmFhNDQ2MGRkMmViMmEw NTRkMjAxNzQ4MTdlZDIxYmFmMzYwLi44ZWQzZTAyN2FjNzJjMDViMjNhNzVhZWJkYmVkNjkwZGJj YjM3ZDY5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dL UHJvY2Vzc1Bvb2xQcml2YXRlLmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9D b2NvYS9XS1Byb2Nlc3NQb29sUHJpdmF0ZS5oCkBAIC00NCw2ICs0NCw4IEBACiAKIEBwcm9wZXJ0 eSAobm9uYXRvbWljLCB3ZWFrLCBzZXR0ZXI9X3NldERvd25sb2FkRGVsZWdhdGU6KSBpZCA8X1dL RG93bmxvYWREZWxlZ2F0ZT4gX2Rvd25sb2FkRGVsZWdhdGU7CiAKKysgKE5TVVJMICopX3dlYnNp dGVEYXRhVVJMRm9yQ29udGFpbmVyV2l0aFVSTDooTlNVUkwgKiljb250YWluZXJVUkw7CisKIEBl bmQKIAogI2VuZGlmCg==