208033 2020-02-20 15:20:42 -0800 [iOS] Fix media related sandbox issues in the GPU Process 2020-02-26 13:11:13 -0800 1 1 1 Unclassified WebKit WebKit Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 pvollan pvollan bfulgham commit-queue eric.carlson jer.noble peng.liu6 webkit-bug-importer oldest_to_newest 1621443 0 pvollan 2020-02-20 15:20:42 -0800 Fix observed sandbox violations related to media playback. 1621449 1 391343 pvollan 2020-02-20 15:33:15 -0800 Created attachment 391343 Patch 1621453 2 391346 pvollan 2020-02-20 15:36:38 -0800 Created attachment 391346 Patch 1621521 3 391368 pvollan 2020-02-20 18:21:24 -0800 Created attachment 391368 Patch 1621522 4 391368 eric.carlson 2020-02-20 18:26:52 -0800 Comment on attachment 391368 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=391368&action=review > Source/WebKit/UIProcess/GPU/GPUProcessProxy.cpp:289 > + if (!parameters.mediaCacheDirectory.isEmpty()) { > + String parentFolder = parameters.mediaCacheDirectory; > + if ((auto position = parentFolder.reverseFind("/")) != notFound) > + parentFolder = parentFolder.substring(0, position); > + SandboxExtension::createHandleWithoutResolvingPath(parentFolder, SandboxExtension::Type::ReadWrite, parameters.mediaCacheDirectorySandboxExtensionHandle); > + } Two things: - I think it would be better to do this in the WebProcess, this process should just use the path provided. - This shouldn't be necessary at all, please file a bug about the media framework behavior. 1621523 5 391369 pvollan 2020-02-20 18:34:38 -0800 Created attachment 391369 Patch 1621524 6 pvollan 2020-02-20 18:35:46 -0800 (In reply to Eric Carlson from comment #4) > Comment on attachment 391368 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=391368&action=review > > > Source/WebKit/UIProcess/GPU/GPUProcessProxy.cpp:289 > > + if (!parameters.mediaCacheDirectory.isEmpty()) { > > + String parentFolder = parameters.mediaCacheDirectory; > > + if ((auto position = parentFolder.reverseFind("/")) != notFound) > > + parentFolder = parentFolder.substring(0, position); > > + SandboxExtension::createHandleWithoutResolvingPath(parentFolder, SandboxExtension::Type::ReadWrite, parameters.mediaCacheDirectorySandboxExtensionHandle); > > + } > > Two things: > - I think it would be better to do this in the WebProcess, this process > should just use the path provided. > - This shouldn't be necessary at all, please file a bug about the media > framework behavior. Thanks for reviewing! I will file a bug about the media framework behavior. 1621656 7 391369 commit-queue 2020-02-21 08:27:58 -0800 Comment on attachment 391369 Patch Clearing flags on attachment: 391369 Committed r257135: <https://trac.webkit.org/changeset/257135> 1623127 8 webkit-bug-importer 2020-02-26 13:11:13 -0800 <rdar://problem/59818090> 391343 2020-02-20 15:33:15 -0800 2020-02-20 15:36:37 -0800 Patch bug-208033-20200220153315.patch text/plain 3221 pvollan SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNTcwOTcpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBACisyMDIwLTAyLTIwICBQZXIgQXJuZSBW b2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbaU9TXSBGaXggbWVkaWEgcmVs YXRlZCBzYW5kYm94IGlzc3VlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MjA4MDMzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgVGhlIG1hY2ggbG9va3VwIHNhbmRib3ggZXh0ZW5zaW9uIHRvICdjb20uYXBw bGUudGNjZCcgbmVlZHMgdG8gYmUgY3JlYXRlZCB3aXRoIHRoZSBtZXRob2QgU2FuZGJveEV4dGVu c2lvbjo6Y3JlYXRlSGFuZGxlRm9yTWFjaExvb2t1cC4KKyAgICAgICAgVGhlIGZpbGUgcmVhZC13 cml0ZSBzYW5kYm94IGV4dGVuc2lvbiB0byB0aGUgbWVkaWEgY2FjaGUgZGlyZWN0b3J5IG5lZWRz IHRvIGJlIGNyZWF0ZWQgd2l0aCB0aGUgcGFyZW50IGZvbGRlciBvZiB0aGUgYWN0dWFsIGNhY2hl IGZvbGRlciwKKyAgICAgICAgc2luY2UgdGhlIG1lZGlhIGZyYW1ld29ya3MgYWxzbyBzZWVtIHRv IGFjY2VzcyBmaWxlcyB0aGVyZS4KKworICAgICAgICBObyBuZXcgdGVzdHMsIGNvdmVyZWQgYnkg ZXhpc3RpbmcgdGVzdHMuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvR1BVL0dQVVByb2Nlc3NQcm94 eS5jcHA6CisgICAgICAgIChXZWJLaXQ6OkdQVVByb2Nlc3NQcm94eTo6c2luZ2xldG9uKToKKyAg ICAgICAgKFdlYktpdDo6Z3B1UHJvY2Vzc1Nlc3Npb25QYXJhbWV0ZXJzKToKKwogMjAyMC0wMi0y MCAgWXVzdWtlIFN1enVraSAgPHlzdXp1a2lAYXBwbGUuY29tPgogCiAgICAgICAgIE5ldHdvcmtD YWNoZSBzaG91bGQgdXNlIDRLQiB0aHJlc2hvbGQgZm9yIG1tYXAtZWQgZmlsZXMgaW5zdGVhZCBv ZiAxNktCCkluZGV4OiBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9HUFUvR1BVUHJvY2Vzc1Byb3h5 LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9HUFUvR1BVUHJvY2Vz c1Byb3h5LmNwcAkocmV2aXNpb24gMjU3MDYyKQorKysgU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv R1BVL0dQVVByb2Nlc3NQcm94eS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEwNiw4ICsxMDYsMTIg QEAgR1BVUHJvY2Vzc1Byb3h5JiBHUFVQcm9jZXNzUHJveHk6OnNpbmdsZQogICAgICAgICBpZiAo bmVlZHNNaWNyb3Bob25lU2FuZGJveEV4dGVuc2lvbikKICAgICAgICAgICAgIFNhbmRib3hFeHRl bnNpb246OmNyZWF0ZUhhbmRsZUZvckdlbmVyaWNFeHRlbnNpb24oImNvbS5hcHBsZS53ZWJraXQu bWljcm9waG9uZSIsIHBhcmFtZXRlcnMubWljcm9waG9uZVNhbmRib3hFeHRlbnNpb25IYW5kbGUp OwogI2lmIFBMQVRGT1JNKElPUykKLSAgICAgICAgaWYgKG5lZWRzQ2FtZXJhU2FuZGJveEV4dGVu c2lvbiB8fCBuZWVkc01pY3JvcGhvbmVTYW5kYm94RXh0ZW5zaW9uKQotICAgICAgICAgICAgU2Fu ZGJveEV4dGVuc2lvbjo6Y3JlYXRlSGFuZGxlRm9yR2VuZXJpY0V4dGVuc2lvbigiY29tLmFwcGxl LnRjY2QiLCBwYXJhbWV0ZXJzLnRjY1NhbmRib3hFeHRlbnNpb25IYW5kbGUpOworICAgICAgICBp ZiAobmVlZHNDYW1lcmFTYW5kYm94RXh0ZW5zaW9uIHx8IG5lZWRzTWljcm9waG9uZVNhbmRib3hF eHRlbnNpb24pIHsKKyAgICAgICAgICAgIE9wdGlvbmFsPGF1ZGl0X3Rva2VuX3Q+IGF1ZGl0VG9r ZW47CisgICAgICAgICAgICBpZiAoZ3B1UHJvY2Vzcy0+Y29ubmVjdGlvbigpKQorICAgICAgICAg ICAgICAgIGF1ZGl0VG9rZW4gPSBncHVQcm9jZXNzLT5jb25uZWN0aW9uKCktPmdldEF1ZGl0VG9r ZW4oKTsKKyAgICAgICAgICAgIFNhbmRib3hFeHRlbnNpb246OmNyZWF0ZUhhbmRsZUZvck1hY2hM b29rdXAoImNvbS5hcHBsZS50Y2NkIiwgYXVkaXRUb2tlbiwgcGFyYW1ldGVycy50Y2NTYW5kYm94 RXh0ZW5zaW9uSGFuZGxlKTsKKyAgICAgICAgfQogI2VuZGlmCiAjZW5kaWYKICAgICAgICAgLy8g SW5pdGlhbGl6ZSB0aGUgR1BVIHByb2Nlc3MuCkBAIC0yODEsOCArMjg1LDEyIEBAIHN0YXRpYyBp bmxpbmUgR1BVUHJvY2Vzc1Nlc3Npb25QYXJhbWV0ZXIKIAogICAgIHBhcmFtZXRlcnMubWVkaWFD YWNoZURpcmVjdG9yeSA9IHN0b3JlLnJlc29sdmVkTWVkaWFDYWNoZURpcmVjdG9yeSgpOwogICAg IFNhbmRib3hFeHRlbnNpb246OkhhbmRsZSBtZWRpYUNhY2hlRGlyZWN0b3J5RXh0ZW5zaW9uSGFu ZGxlOwotICAgIGlmICghcGFyYW1ldGVycy5tZWRpYUNhY2hlRGlyZWN0b3J5LmlzRW1wdHkoKSkK LSAgICAgICAgU2FuZGJveEV4dGVuc2lvbjo6Y3JlYXRlSGFuZGxlV2l0aG91dFJlc29sdmluZ1Bh dGgocGFyYW1ldGVycy5tZWRpYUNhY2hlRGlyZWN0b3J5LCBTYW5kYm94RXh0ZW5zaW9uOjpUeXBl OjpSZWFkV3JpdGUsIHBhcmFtZXRlcnMubWVkaWFDYWNoZURpcmVjdG9yeVNhbmRib3hFeHRlbnNp b25IYW5kbGUpOworICAgIGlmICghcGFyYW1ldGVycy5tZWRpYUNhY2hlRGlyZWN0b3J5LmlzRW1w dHkoKSkgeworICAgICAgICBTdHJpbmcgcGFyZW50Rm9sZGVyID0gcGFyYW1ldGVycy5tZWRpYUNh Y2hlRGlyZWN0b3J5OworICAgICAgICBpZiAoYXV0byBwb3NpdGlvbiA9IHBhcmVudEZvbGRlci5y ZXZlcnNlRmluZCgiLyIpKQorICAgICAgICAgICAgcGFyZW50Rm9sZGVyID0gcGFyZW50Rm9sZGVy LnN1YnN0cmluZygwLCBwb3NpdGlvbik7CisgICAgICAgIFNhbmRib3hFeHRlbnNpb246OmNyZWF0 ZUhhbmRsZVdpdGhvdXRSZXNvbHZpbmdQYXRoKHBhcmVudEZvbGRlciwgU2FuZGJveEV4dGVuc2lv bjo6VHlwZTo6UmVhZFdyaXRlLCBwYXJhbWV0ZXJzLm1lZGlhQ2FjaGVEaXJlY3RvcnlTYW5kYm94 RXh0ZW5zaW9uSGFuZGxlKTsKKyAgICB9CiAKICNpZiBFTkFCTEUoTEVHQUNZX0VOQ1JZUFRFRF9N RURJQSkKICAgICBwYXJhbWV0ZXJzLm1lZGlhS2V5c1N0b3JhZ2VEaXJlY3RvcnkgPSBzdG9yZS5y ZXNvbHZlZE1lZGlhS2V5c0RpcmVjdG9yeSgpOwo= 391346 2020-02-20 15:36:38 -0800 2020-02-20 18:21:21 -0800 Patch bug-208033-20200220153637.patch text/plain 2921 pvollan SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNTcwOTcpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBACisyMDIwLTAyLTIwICBQZXIgQXJuZSBW b2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbaU9TXSBGaXggbWVkaWEgcmVs YXRlZCBzYW5kYm94IGlzc3VlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MjA4MDMzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgVGhlIG1hY2ggbG9va3VwIHNhbmRib3ggZXh0ZW5zaW9uIHRvICdjb20uYXBw bGUudGNjZCcgbmVlZHMgdG8gYmUgY3JlYXRlZCB3aXRoIHRoZSBtZXRob2QgU2FuZGJveEV4dGVu c2lvbjo6Y3JlYXRlSGFuZGxlRm9yTWFjaExvb2t1cC4KKyAgICAgICAgVGhlIGZpbGUgcmVhZC13 cml0ZSBzYW5kYm94IGV4dGVuc2lvbiB0byB0aGUgbWVkaWEgY2FjaGUgZGlyZWN0b3J5IG5lZWRz IHRvIGJlIGNyZWF0ZWQgd2l0aCB0aGUgcGFyZW50IGZvbGRlciBvZiB0aGUgYWN0dWFsIGNhY2hl IGZvbGRlciwKKyAgICAgICAgc2luY2UgdGhlIG1lZGlhIGZyYW1ld29ya3MgYWxzbyBzZWVtIHRv IGFjY2VzcyBmaWxlcyB0aGVyZS4KKworICAgICAgICBObyBuZXcgdGVzdHMsIGNvdmVyZWQgYnkg ZXhpc3RpbmcgdGVzdHMuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvR1BVL0dQVVByb2Nlc3NQcm94 eS5jcHA6CisgICAgICAgIChXZWJLaXQ6OkdQVVByb2Nlc3NQcm94eTo6c2luZ2xldG9uKToKKyAg ICAgICAgKFdlYktpdDo6Z3B1UHJvY2Vzc1Nlc3Npb25QYXJhbWV0ZXJzKToKKwogMjAyMC0wMi0y MCAgWXVzdWtlIFN1enVraSAgPHlzdXp1a2lAYXBwbGUuY29tPgogCiAgICAgICAgIE5ldHdvcmtD YWNoZSBzaG91bGQgdXNlIDRLQiB0aHJlc2hvbGQgZm9yIG1tYXAtZWQgZmlsZXMgaW5zdGVhZCBv ZiAxNktCCkluZGV4OiBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9HUFUvR1BVUHJvY2Vzc1Byb3h5 LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9HUFUvR1BVUHJvY2Vz c1Byb3h5LmNwcAkocmV2aXNpb24gMjU3MDYyKQorKysgU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv R1BVL0dQVVByb2Nlc3NQcm94eS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEwNyw3ICsxMDcsNyBA QCBHUFVQcm9jZXNzUHJveHkmIEdQVVByb2Nlc3NQcm94eTo6c2luZ2xlCiAgICAgICAgICAgICBT YW5kYm94RXh0ZW5zaW9uOjpjcmVhdGVIYW5kbGVGb3JHZW5lcmljRXh0ZW5zaW9uKCJjb20uYXBw bGUud2Via2l0Lm1pY3JvcGhvbmUiLCBwYXJhbWV0ZXJzLm1pY3JvcGhvbmVTYW5kYm94RXh0ZW5z aW9uSGFuZGxlKTsKICNpZiBQTEFURk9STShJT1MpCiAgICAgICAgIGlmIChuZWVkc0NhbWVyYVNh bmRib3hFeHRlbnNpb24gfHwgbmVlZHNNaWNyb3Bob25lU2FuZGJveEV4dGVuc2lvbikKLSAgICAg ICAgICAgIFNhbmRib3hFeHRlbnNpb246OmNyZWF0ZUhhbmRsZUZvckdlbmVyaWNFeHRlbnNpb24o ImNvbS5hcHBsZS50Y2NkIiwgcGFyYW1ldGVycy50Y2NTYW5kYm94RXh0ZW5zaW9uSGFuZGxlKTsK KyAgICAgICAgICAgIFNhbmRib3hFeHRlbnNpb246OmNyZWF0ZUhhbmRsZUZvck1hY2hMb29rdXAo ImNvbS5hcHBsZS50Y2NkIiwgV1RGOjpudWxsb3B0LCBwYXJhbWV0ZXJzLnRjY1NhbmRib3hFeHRl bnNpb25IYW5kbGUpOwogI2VuZGlmCiAjZW5kaWYKICAgICAgICAgLy8gSW5pdGlhbGl6ZSB0aGUg R1BVIHByb2Nlc3MuCkBAIC0yODEsOCArMjgxLDEyIEBAIHN0YXRpYyBpbmxpbmUgR1BVUHJvY2Vz c1Nlc3Npb25QYXJhbWV0ZXIKIAogICAgIHBhcmFtZXRlcnMubWVkaWFDYWNoZURpcmVjdG9yeSA9 IHN0b3JlLnJlc29sdmVkTWVkaWFDYWNoZURpcmVjdG9yeSgpOwogICAgIFNhbmRib3hFeHRlbnNp b246OkhhbmRsZSBtZWRpYUNhY2hlRGlyZWN0b3J5RXh0ZW5zaW9uSGFuZGxlOwotICAgIGlmICgh cGFyYW1ldGVycy5tZWRpYUNhY2hlRGlyZWN0b3J5LmlzRW1wdHkoKSkKLSAgICAgICAgU2FuZGJv eEV4dGVuc2lvbjo6Y3JlYXRlSGFuZGxlV2l0aG91dFJlc29sdmluZ1BhdGgocGFyYW1ldGVycy5t ZWRpYUNhY2hlRGlyZWN0b3J5LCBTYW5kYm94RXh0ZW5zaW9uOjpUeXBlOjpSZWFkV3JpdGUsIHBh cmFtZXRlcnMubWVkaWFDYWNoZURpcmVjdG9yeVNhbmRib3hFeHRlbnNpb25IYW5kbGUpOworICAg IGlmICghcGFyYW1ldGVycy5tZWRpYUNhY2hlRGlyZWN0b3J5LmlzRW1wdHkoKSkgeworICAgICAg ICBTdHJpbmcgcGFyZW50Rm9sZGVyID0gcGFyYW1ldGVycy5tZWRpYUNhY2hlRGlyZWN0b3J5Owor ICAgICAgICBpZiAoYXV0byBwb3NpdGlvbiA9IHBhcmVudEZvbGRlci5yZXZlcnNlRmluZCgiLyIp KQorICAgICAgICAgICAgcGFyZW50Rm9sZGVyID0gcGFyZW50Rm9sZGVyLnN1YnN0cmluZygwLCBw b3NpdGlvbik7CisgICAgICAgIFNhbmRib3hFeHRlbnNpb246OmNyZWF0ZUhhbmRsZVdpdGhvdXRS ZXNvbHZpbmdQYXRoKHBhcmVudEZvbGRlciwgU2FuZGJveEV4dGVuc2lvbjo6VHlwZTo6UmVhZFdy aXRlLCBwYXJhbWV0ZXJzLm1lZGlhQ2FjaGVEaXJlY3RvcnlTYW5kYm94RXh0ZW5zaW9uSGFuZGxl KTsKKyAgICB9CiAKICNpZiBFTkFCTEUoTEVHQUNZX0VOQ1JZUFRFRF9NRURJQSkKICAgICBwYXJh bWV0ZXJzLm1lZGlhS2V5c1N0b3JhZ2VEaXJlY3RvcnkgPSBzdG9yZS5yZXNvbHZlZE1lZGlhS2V5 c0RpcmVjdG9yeSgpOwo= 391368 2020-02-20 18:21:24 -0800 2020-02-20 18:26:52 -0800 Patch bug-208033-20200220182122.patch text/plain 2919 pvollan SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNTcwNjIpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBACisyMDIwLTAyLTIwICBQZXIgQXJuZSBW b2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbaU9TXSBGaXggbWVkaWEgcmVs YXRlZCBzYW5kYm94IGlzc3VlcyBpbiB0aGUgR1BVIHByb2Nlc3MKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwODAzMworCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoZSBtYWNoIGxvb2t1cCBzYW5kYm94IGV4 dGVuc2lvbiB0byAnY29tLmFwcGxlLnRjY2QnIG5lZWRzIHRvIGJlIGNyZWF0ZWQgd2l0aCB0aGUg bWV0aG9kIFNhbmRib3hFeHRlbnNpb246OmNyZWF0ZUhhbmRsZUZvck1hY2hMb29rdXAuCisgICAg ICAgIFRoZSBmaWxlIHJlYWQtd3JpdGUgc2FuZGJveCBleHRlbnNpb24gdG8gdGhlIG1lZGlhIGNh Y2hlIGRpcmVjdG9yeSBuZWVkcyB0byBiZSBjcmVhdGVkIHdpdGggdGhlIHBhcmVudCBmb2xkZXIg b2YgdGhlIGFjdHVhbCBjYWNoZSBmb2xkZXIsCisgICAgICAgIHNpbmNlIHRoZSBtZWRpYSBmcmFt ZXdvcmtzIGFsc28gc2VlbSB0byBhY2Nlc3MgZmlsZXMgdGhlcmUuCisKKyAgICAgICAgTm8gbmV3 IHRlc3RzLCBjb3ZlcmVkIGJ5IGV4aXN0aW5nIHRlc3RzLgorCisgICAgICAgICogVUlQcm9jZXNz L0dQVS9HUFVQcm9jZXNzUHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpHUFVQcm9jZXNzUHJv eHk6OnNpbmdsZXRvbik6CisgICAgICAgIChXZWJLaXQ6OmdwdVByb2Nlc3NTZXNzaW9uUGFyYW1l dGVycyk6CisKIDIwMjAtMDItMjAgIEphc29uIExhd3JlbmNlICA8bGF3cmVuY2UuakBhcHBsZS5j b20+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcm9sbGluZyBvdXQgcjI1NzAyNS4KSW5kZXg6IFNv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL0dQVS9HUFVQcm9jZXNzUHJveHkuY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0dQVS9HUFVQcm9jZXNzUHJveHkuY3BwCShyZXZp c2lvbiAyNTcwNjIpCisrKyBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9HUFUvR1BVUHJvY2Vzc1By b3h5LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTA3LDcgKzEwNyw3IEBAIEdQVVByb2Nlc3NQcm94 eSYgR1BVUHJvY2Vzc1Byb3h5OjpzaW5nbGUKICAgICAgICAgICAgIFNhbmRib3hFeHRlbnNpb246 OmNyZWF0ZUhhbmRsZUZvckdlbmVyaWNFeHRlbnNpb24oImNvbS5hcHBsZS53ZWJraXQubWljcm9w aG9uZSIsIHBhcmFtZXRlcnMubWljcm9waG9uZVNhbmRib3hFeHRlbnNpb25IYW5kbGUpOwogI2lm IFBMQVRGT1JNKElPUykKICAgICAgICAgaWYgKG5lZWRzQ2FtZXJhU2FuZGJveEV4dGVuc2lvbiB8 fCBuZWVkc01pY3JvcGhvbmVTYW5kYm94RXh0ZW5zaW9uKQotICAgICAgICAgICAgU2FuZGJveEV4 dGVuc2lvbjo6Y3JlYXRlSGFuZGxlRm9yR2VuZXJpY0V4dGVuc2lvbigiY29tLmFwcGxlLnRjY2Qi LCBwYXJhbWV0ZXJzLnRjY1NhbmRib3hFeHRlbnNpb25IYW5kbGUpOworICAgICAgICAgICAgU2Fu ZGJveEV4dGVuc2lvbjo6Y3JlYXRlSGFuZGxlRm9yTWFjaExvb2t1cCgiY29tLmFwcGxlLnRjY2Qi LCBXVEY6Om51bGxvcHQsIHBhcmFtZXRlcnMudGNjU2FuZGJveEV4dGVuc2lvbkhhbmRsZSk7CiAj ZW5kaWYKICNlbmRpZgogICAgICAgICAvLyBJbml0aWFsaXplIHRoZSBHUFUgcHJvY2Vzcy4KQEAg LTI4MSw4ICsyODEsMTIgQEAgc3RhdGljIGlubGluZSBHUFVQcm9jZXNzU2Vzc2lvblBhcmFtZXRl cgogCiAgICAgcGFyYW1ldGVycy5tZWRpYUNhY2hlRGlyZWN0b3J5ID0gc3RvcmUucmVzb2x2ZWRN ZWRpYUNhY2hlRGlyZWN0b3J5KCk7CiAgICAgU2FuZGJveEV4dGVuc2lvbjo6SGFuZGxlIG1lZGlh Q2FjaGVEaXJlY3RvcnlFeHRlbnNpb25IYW5kbGU7Ci0gICAgaWYgKCFwYXJhbWV0ZXJzLm1lZGlh Q2FjaGVEaXJlY3RvcnkuaXNFbXB0eSgpKQotICAgICAgICBTYW5kYm94RXh0ZW5zaW9uOjpjcmVh dGVIYW5kbGVXaXRob3V0UmVzb2x2aW5nUGF0aChwYXJhbWV0ZXJzLm1lZGlhQ2FjaGVEaXJlY3Rv cnksIFNhbmRib3hFeHRlbnNpb246OlR5cGU6OlJlYWRXcml0ZSwgcGFyYW1ldGVycy5tZWRpYUNh Y2hlRGlyZWN0b3J5U2FuZGJveEV4dGVuc2lvbkhhbmRsZSk7CisgICAgaWYgKCFwYXJhbWV0ZXJz Lm1lZGlhQ2FjaGVEaXJlY3RvcnkuaXNFbXB0eSgpKSB7CisgICAgICAgIFN0cmluZyBwYXJlbnRG b2xkZXIgPSBwYXJhbWV0ZXJzLm1lZGlhQ2FjaGVEaXJlY3Rvcnk7CisgICAgICAgIGlmICgoYXV0 byBwb3NpdGlvbiA9IHBhcmVudEZvbGRlci5yZXZlcnNlRmluZCgiLyIpKSAhPSBub3RGb3VuZCkK KyAgICAgICAgICAgIHBhcmVudEZvbGRlciA9IHBhcmVudEZvbGRlci5zdWJzdHJpbmcoMCwgcG9z aXRpb24pOworICAgICAgICBTYW5kYm94RXh0ZW5zaW9uOjpjcmVhdGVIYW5kbGVXaXRob3V0UmVz b2x2aW5nUGF0aChwYXJlbnRGb2xkZXIsIFNhbmRib3hFeHRlbnNpb246OlR5cGU6OlJlYWRXcml0 ZSwgcGFyYW1ldGVycy5tZWRpYUNhY2hlRGlyZWN0b3J5U2FuZGJveEV4dGVuc2lvbkhhbmRsZSk7 CisgICAgfQogCiAjaWYgRU5BQkxFKExFR0FDWV9FTkNSWVBURURfTUVESUEpCiAgICAgcGFyYW1l dGVycy5tZWRpYUtleXNTdG9yYWdlRGlyZWN0b3J5ID0gc3RvcmUucmVzb2x2ZWRNZWRpYUtleXNE aXJlY3RvcnkoKTsK 391369 2020-02-20 18:34:38 -0800 2020-02-21 08:27:58 -0800 Patch bug-208033-20200220183437.patch text/plain 2934 pvollan SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNTcwNjIpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBACisyMDIwLTAyLTIwICBQZXIgQXJuZSBW b2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbaU9TXSBGaXggbWVkaWEgcmVs YXRlZCBzYW5kYm94IGlzc3VlcyBpbiB0aGUgR1BVIHByb2Nlc3MKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwODAzMworCisgICAgICAgIFJldmlld2Vk IGJ5IEVyaWMgQ2FybHNvbi4KKworICAgICAgICBUaGUgbWFjaCBsb29rdXAgc2FuZGJveCBleHRl bnNpb24gdG8gJ2NvbS5hcHBsZS50Y2NkJyBuZWVkcyB0byBiZSBjcmVhdGVkIHdpdGggdGhlIG1l dGhvZCBTYW5kYm94RXh0ZW5zaW9uOjpjcmVhdGVIYW5kbGVGb3JNYWNoTG9va3VwLgorICAgICAg ICBUaGUgZmlsZSByZWFkLXdyaXRlIHNhbmRib3ggZXh0ZW5zaW9uIHRvIHRoZSBtZWRpYSBjYWNo ZSBkaXJlY3RvcnkgbmVlZHMgdG8gYmUgY3JlYXRlZCB3aXRoIHRoZSBwYXJlbnQgZm9sZGVyIG9m IHRoZSBhY3R1YWwgY2FjaGUgZm9sZGVyLAorICAgICAgICBzaW5jZSB0aGUgbWVkaWEgZnJhbWV3 b3JrcyBhbHNvIHNlZW0gdG8gYWNjZXNzIGZpbGVzIHRoZXJlLgorCisgICAgICAgIE5vIG5ldyB0 ZXN0cywgY292ZXJlZCBieSBleGlzdGluZyB0ZXN0cy4KKworICAgICAgICAqIFVJUHJvY2Vzcy9H UFUvR1BVUHJvY2Vzc1Byb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6R1BVUHJvY2Vzc1Byb3h5 OjpzaW5nbGV0b24pOgorICAgICAgICAoV2ViS2l0OjpncHVQcm9jZXNzU2Vzc2lvblBhcmFtZXRl cnMpOgorCiAyMDIwLTAyLTIwICBKYXNvbiBMYXdyZW5jZSAgPGxhd3JlbmNlLmpAYXBwbGUuY29t PgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcgb3V0IHIyNTcwMjUuCkluZGV4OiBTb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9HUFUvR1BVUHJvY2Vzc1Byb3h5LmNwcAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9HUFUvR1BVUHJvY2Vzc1Byb3h5LmNwcAkocmV2aXNp b24gMjU3MDYyKQorKysgU291cmNlL1dlYktpdC9VSVByb2Nlc3MvR1BVL0dQVVByb2Nlc3NQcm94 eS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEwNyw3ICsxMDcsNyBAQCBHUFVQcm9jZXNzUHJveHkm IEdQVVByb2Nlc3NQcm94eTo6c2luZ2xlCiAgICAgICAgICAgICBTYW5kYm94RXh0ZW5zaW9uOjpj cmVhdGVIYW5kbGVGb3JHZW5lcmljRXh0ZW5zaW9uKCJjb20uYXBwbGUud2Via2l0Lm1pY3JvcGhv bmUiLCBwYXJhbWV0ZXJzLm1pY3JvcGhvbmVTYW5kYm94RXh0ZW5zaW9uSGFuZGxlKTsKICNpZiBQ TEFURk9STShJT1MpCiAgICAgICAgIGlmIChuZWVkc0NhbWVyYVNhbmRib3hFeHRlbnNpb24gfHwg bmVlZHNNaWNyb3Bob25lU2FuZGJveEV4dGVuc2lvbikKLSAgICAgICAgICAgIFNhbmRib3hFeHRl bnNpb246OmNyZWF0ZUhhbmRsZUZvckdlbmVyaWNFeHRlbnNpb24oImNvbS5hcHBsZS50Y2NkIiwg cGFyYW1ldGVycy50Y2NTYW5kYm94RXh0ZW5zaW9uSGFuZGxlKTsKKyAgICAgICAgICAgIFNhbmRi b3hFeHRlbnNpb246OmNyZWF0ZUhhbmRsZUZvck1hY2hMb29rdXAoImNvbS5hcHBsZS50Y2NkIiwg V1RGOjpudWxsb3B0LCBwYXJhbWV0ZXJzLnRjY1NhbmRib3hFeHRlbnNpb25IYW5kbGUpOwogI2Vu ZGlmCiAjZW5kaWYKICAgICAgICAgLy8gSW5pdGlhbGl6ZSB0aGUgR1BVIHByb2Nlc3MuCkBAIC0y ODEsOCArMjgxLDEzIEBAIHN0YXRpYyBpbmxpbmUgR1BVUHJvY2Vzc1Nlc3Npb25QYXJhbWV0ZXIK IAogICAgIHBhcmFtZXRlcnMubWVkaWFDYWNoZURpcmVjdG9yeSA9IHN0b3JlLnJlc29sdmVkTWVk aWFDYWNoZURpcmVjdG9yeSgpOwogICAgIFNhbmRib3hFeHRlbnNpb246OkhhbmRsZSBtZWRpYUNh Y2hlRGlyZWN0b3J5RXh0ZW5zaW9uSGFuZGxlOwotICAgIGlmICghcGFyYW1ldGVycy5tZWRpYUNh Y2hlRGlyZWN0b3J5LmlzRW1wdHkoKSkKLSAgICAgICAgU2FuZGJveEV4dGVuc2lvbjo6Y3JlYXRl SGFuZGxlV2l0aG91dFJlc29sdmluZ1BhdGgocGFyYW1ldGVycy5tZWRpYUNhY2hlRGlyZWN0b3J5 LCBTYW5kYm94RXh0ZW5zaW9uOjpUeXBlOjpSZWFkV3JpdGUsIHBhcmFtZXRlcnMubWVkaWFDYWNo ZURpcmVjdG9yeVNhbmRib3hFeHRlbnNpb25IYW5kbGUpOworICAgIGlmICghcGFyYW1ldGVycy5t ZWRpYUNhY2hlRGlyZWN0b3J5LmlzRW1wdHkoKSkgeworICAgICAgICBTdHJpbmcgcGFyZW50Rm9s ZGVyID0gcGFyYW1ldGVycy5tZWRpYUNhY2hlRGlyZWN0b3J5OworICAgICAgICBhdXRvIHBvc2l0 aW9uID0gcGFyZW50Rm9sZGVyLnJldmVyc2VGaW5kKCIvIik7CisgICAgICAgIGlmIChwb3NpdGlv biAhPSBub3RGb3VuZCkKKyAgICAgICAgICAgIHBhcmVudEZvbGRlciA9IHBhcmVudEZvbGRlci5z dWJzdHJpbmcoMCwgcG9zaXRpb24pOworICAgICAgICBTYW5kYm94RXh0ZW5zaW9uOjpjcmVhdGVI YW5kbGVXaXRob3V0UmVzb2x2aW5nUGF0aChwYXJlbnRGb2xkZXIsIFNhbmRib3hFeHRlbnNpb246 OlR5cGU6OlJlYWRXcml0ZSwgcGFyYW1ldGVycy5tZWRpYUNhY2hlRGlyZWN0b3J5U2FuZGJveEV4 dGVuc2lvbkhhbmRsZSk7CisgICAgfQogCiAjaWYgRU5BQkxFKExFR0FDWV9FTkNSWVBURURfTUVE SUEpCiAgICAgcGFyYW1ldGVycy5tZWRpYUtleXNTdG9yYWdlRGlyZWN0b3J5ID0gc3RvcmUucmVz b2x2ZWRNZWRpYUtleXNEaXJlY3RvcnkoKTsK