202034 2019-09-19 23:12:23 -0700 Sanitize suggested filenames used for saving PDFs 2019-09-20 14:49:47 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 thorton thorton achristensen bdakin cdumez commit-queue ggaren webkit-bug-importer oldest_to_newest 1572662 0 thorton 2019-09-19 23:12:23 -0700 Percent-encode suggested filenames used for saving PDFs 1572663 1 379212 thorton 2019-09-19 23:13:11 -0700 Created attachment 379212 Patch 1572664 2 thorton 2019-09-19 23:13:13 -0700 <rdar://problem/53183075> 1572689 3 379212 achristensen 2019-09-20 01:10:42 -0700 Comment on attachment 379212 Patch No unit test? 1572798 4 379254 thorton 2019-09-20 12:02:43 -0700 Created attachment 379254 Patch 1572799 5 379254 cdumez 2019-09-20 12:03:56 -0700 Comment on attachment 379254 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=379254&action=review > Source/WebKit/ChangeLog:3 > + Percent-encode suggested filenames used for saving PDFs Title is not accurate anymore. Maybe simply Sanitize instead of Percent-encode? > Source/WebKit/ChangeLog:19 > + Percent-encode suggested filenames to ensure that they comprise only one path component ditto. 1572801 6 thorton 2019-09-20 12:08:23 -0700 (In reply to Alex Christensen from comment #3) > Comment on attachment 379212 [details] > Patch > > No unit test? No, it's not possible to get in this situation normally (since the filename comes *from* an already-encoded source). Only in the case of a compromised web content process. One could imagine adding a path to allow arbitrary text there for testing, but the added complexity seems not worth it (and possibly problematic). 1572802 7 thorton 2019-09-20 12:08:32 -0700 Good point about the title 1572803 8 379255 thorton 2019-09-20 12:09:18 -0700 Created attachment 379255 Patch 1572806 9 379255 cdumez 2019-09-20 12:12:34 -0700 Comment on attachment 379255 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=379255&action=review r=me with nits. > Source/WebKit/ChangeLog:19 > + Percent-encode suggested filenames to ensure that they comprise only one path component You failed to fix this one. > Source/WebKit/UIProcess/WebPageProxy.cpp:7830 > + String encodedFilename = ResourceResponseBase::sanitizeSuggestedFilename(suggestedFilename); s/encodedFilename/sanitizedFilename > Source/WebKit/UIProcess/mac/WebPageProxyMac.mm:501 > + auto encodedFileName = ResourceResponseBase::sanitizeSuggestedFilename(suggestedFilename); s/encodedFilename/sanitizedFilename Seems like this could be after the data.isEmpty() check. > Source/WebKit/UIProcess/mac/WebPageProxyMac.mm:513 > + if (!data.size()) { data.isEmpty() 1572808 10 379255 thorton 2019-09-20 12:13:40 -0700 Comment on attachment 379255 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=379255&action=review >> Source/WebKit/ChangeLog:19 >> + Percent-encode suggested filenames to ensure that they comprise only one path component > > You failed to fix this one. :| >> Source/WebKit/UIProcess/WebPageProxy.cpp:7830 >> + String encodedFilename = ResourceResponseBase::sanitizeSuggestedFilename(suggestedFilename); > > s/encodedFilename/sanitizedFilename That's fair >> Source/WebKit/UIProcess/mac/WebPageProxyMac.mm:513 >> + if (!data.size()) { > > data.isEmpty() What no I think we just delete this one. 1572809 11 379256 thorton 2019-09-20 12:15:45 -0700 Created attachment 379256 Patch 1572810 12 379255 cdumez 2019-09-20 12:15:56 -0700 Comment on attachment 379255 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=379255&action=review >>> Source/WebKit/UIProcess/mac/WebPageProxyMac.mm:513 >>> + if (!data.size()) { >> >> data.isEmpty() > > What no I think we just delete this one. ahah lol, indeed. 1572902 13 379256 commit-queue 2019-09-20 14:40:42 -0700 Comment on attachment 379256 Patch Rejecting attachment 379256 from commit-queue. Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.webkit.org', '--bot-id=webkit-cq-01', 'land-attachment', '--force-clean', '--non-interactive', '--parent-command=commit-queue', 379256, '--port=mac']" exit_code: 2 cwd: /Volumes/Data/EWS/WebKit Logging in as commit-queue@webkit.org... Fetching: https://bugs.webkit.org/attachment.cgi?id=379256&action=edit Fetching: https://bugs.webkit.org/show_bug.cgi?id=202034&ctype=xml&excludefield=attachmentdata Processing 1 patch from 1 bug. Updating working directory Processing patch 379256 from bug 202034. Fetching: https://bugs.webkit.org/attachment.cgi?id=379256 Failed to run "['git', 'svn', 'dcommit', '--rmdir']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit Committing to http://svn.webkit.org/repository/webkit/trunk ... M Source/WebKit/ChangeLog ERROR from SVN: Item is out of date: File '/trunk/Source/WebKit/ChangeLog' is out of date W: 78ed1d0eefeeb178590e2b514f7a9dd117935b7a and refs/remotes/origin/master differ, using rebase: :040000 040000 2c2c2cbcff4e8c8680f7a340f845ff88910e520f c981944f73a779f13da2347399f3e6ff5843f5b3 M Source Current branch master is up to date. ERROR: Not all changes have been committed into SVN, however the committed ones (if any) seem to be successfully integrated into the working tree. Please see the above messages for details. Failed to run "['git', 'svn', 'dcommit', '--rmdir']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit Committing to http://svn.webkit.org/repository/webkit/trunk ... M Source/WebKit/ChangeLog ERROR from SVN: Item is out of date: File '/trunk/Source/WebKit/ChangeLog' is out of date W: 78ed1d0eefeeb178590e2b514f7a9dd117935b7a and refs/remotes/origin/master differ, using rebase: :040000 040000 2c2c2cbcff4e8c8680f7a340f845ff88910e520f c981944f73a779f13da2347399f3e6ff5843f5b3 M Source Current branch master is up to date. ERROR: Not all changes have been committed into SVN, however the committed ones (if any) seem to be successfully integrated into the working tree. Please see the above messages for details. Failed to run "['git', 'svn', 'dcommit', '--rmdir']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit Updating OpenSource From https://git.webkit.org/git/WebKit c4dbc56aa50..0f4343f851f master -> origin/master Partial-rebuilding .git/svn/refs/remotes/origin/master/.rev_map.268f45cc-cd09-0410-ab3c-d52691b4dbfc ... Currently at 250152 = c4dbc56aa502491b5b16d392212ab51999377119 r250153 = 7ca844508b2445d6e534cc031b3a6aa2a460766c r250154 = 0f4343f851fe27cbdd5a7afafe9a0cfe935fadb3 Done rebuilding .git/svn/refs/remotes/origin/master/.rev_map.268f45cc-cd09-0410-ab3c-d52691b4dbfc First, rewinding head to replay your work on top of it... Fast-forwarded master to refs/remotes/origin/master. Full output: https://webkit-queues.webkit.org/results/13054668 1572905 14 thorton 2019-09-20 14:45:08 -0700 What 1572906 15 cdumez 2019-09-20 14:45:49 -0700 (In reply to Tim Horton from comment #14) > What Try again :) 1572909 16 thorton 2019-09-20 14:48:54 -0700 Just gonna commit it manually 1572910 17 thorton 2019-09-20 14:49:47 -0700 https://trac.webkit.org/changeset/250157/webkit 379212 2019-09-19 23:13:11 -0700 2019-09-20 12:02:42 -0700 Patch bug-202034-20190919231310.patch text/plain 8674 thorton U3VidmVyc2lvbiBSZXZpc2lvbjogMjUwMDk3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDFjZWIxZDM1ZGNkMzNlZjEw OWY4Y2YyZDgyM2YxYWQ5OTYxMDg1MzEuLmY3MDg4ODNmYzg1NzY5ZmJlYmMxYjdjMzJiY2Y5ODk0 MWY5N2I2NjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjQgQEAKKzIwMTktMDktMTkgIFRpbSBIb3J0 b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CisKKyAgICAgICAgUGVyY2VudC1lbmNvZGUg c3VnZ2VzdGVkIGZpbGVuYW1lcyB1c2VkIGZvciBzYXZpbmcgUERGcworICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjAyMDM0CisgICAgICAgIDxyZGFyOi8v cHJvYmxlbS81MzE4MzA3NT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0 OjpXZWJQYWdlUHJveHk6OmRpZEZpbmlzaExvYWRpbmdEYXRhRm9yQ3VzdG9tQ29udGVudFByb3Zp ZGVyKToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpzYXZlRGF0YVRvRmlsZUluRG93 bmxvYWRzRm9sZGVyKToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpzYXZlUERGVG9G aWxlSW5Eb3dubG9hZHNGb2xkZXIpOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHku aDoKKyAgICAgICAgKiBVSVByb2Nlc3MvaW9zL1dlYlBhZ2VQcm94eUlPUy5tbToKKyAgICAgICAg KFdlYktpdDo6V2ViUGFnZVByb3h5OjpzYXZlUERGVG9UZW1wb3JhcnlGb2xkZXJBbmRPcGVuV2l0 aE5hdGl2ZUFwcGxpY2F0aW9uUmF3KTogRGVsZXRlZC4KKyAgICAgICAgKiBVSVByb2Nlc3MvbWFj L1dlYlBhZ2VQcm94eU1hYy5tbToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpzYXZl UERGVG9UZW1wb3JhcnlGb2xkZXJBbmRPcGVuV2l0aE5hdGl2ZUFwcGxpY2F0aW9uKToKKyAgICAg ICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpzYXZlUERGVG9UZW1wb3JhcnlGb2xkZXJBbmRPcGVu V2l0aE5hdGl2ZUFwcGxpY2F0aW9uUmF3KTogRGVsZXRlZC4KKyAgICAgICAgUGVyY2VudC1lbmNv ZGUgc3VnZ2VzdGVkIGZpbGVuYW1lcyB0byBlbnN1cmUgdGhhdCB0aGV5IGNvbXByaXNlIG9ubHkg b25lIHBhdGggY29tcG9uZW50CisgICAgICAgIHdoZW4gY29uY2F0ZW5hdGVkIHdpdGggdGhlaXIg ZGVzdGluYXRpb24gZGlyZWN0b3J5LgorCiAyMDE5LTA5LTE5ICBCcmVudCBGdWxnaGFtICA8YmZ1 bGdoYW1AYXBwbGUuY29tPgogCiAgICAgICAgIENyZWF0ZSBJbmplY3RlZEJ1bmRsZSBTUEkgdG8g YmV0dGVyIHN1cHBvcnQgTlNTZWN1cmVDb2RpbmcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQ YWdlUHJveHkuY3BwCmluZGV4IDlkY2E4Zjc3ZjljYTdkNjVhNjU0OGYzMmRjM2FhYWExYTE4OGFj ZjQuLmMwODc0NjQxZjc4MmRjZjZmM2M4ZDA2NjBhZjJkMDRhMTczYzNlZTUgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKKysrIGIvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcApAQCAtNzY4Nyw3ICs3Njg3LDcgQEAgdm9p ZCBXZWJQYWdlUHJveHk6OnVwZGF0ZVdlYnNpdGVQb2xpY2llcyhXZWJzaXRlUG9saWNpZXNEYXRh JiYgd2Vic2l0ZVBvbGljaWVzKQogCiB2b2lkIFdlYlBhZ2VQcm94eTo6ZGlkRmluaXNoTG9hZGlu Z0RhdGFGb3JDdXN0b21Db250ZW50UHJvdmlkZXIoY29uc3QgU3RyaW5nJiBzdWdnZXN0ZWRGaWxl bmFtZSwgY29uc3QgSVBDOjpEYXRhUmVmZXJlbmNlJiBkYXRhUmVmZXJlbmNlKQogewotICAgIHBh Z2VDbGllbnQoKS5kaWRGaW5pc2hMb2FkaW5nRGF0YUZvckN1c3RvbUNvbnRlbnRQcm92aWRlcihz dWdnZXN0ZWRGaWxlbmFtZSwgZGF0YVJlZmVyZW5jZSk7CisgICAgcGFnZUNsaWVudCgpLmRpZEZp bmlzaExvYWRpbmdEYXRhRm9yQ3VzdG9tQ29udGVudFByb3ZpZGVyKEZpbGVTeXN0ZW06OmVuY29k ZUZvckZpbGVOYW1lKHN1Z2dlc3RlZEZpbGVuYW1lKSwgZGF0YVJlZmVyZW5jZSk7CiB9CiAKIHZv aWQgV2ViUGFnZVByb3h5OjpiYWNrRm9yd2FyZFJlbW92ZWRJdGVtKGNvbnN0IEJhY2tGb3J3YXJk SXRlbUlkZW50aWZpZXImIGl0ZW1JRCkKQEAgLTc4MjIsMTUgKzc4MjIsMTYgQEAgdm9pZCBXZWJQ YWdlUHJveHk6OnVwZGF0ZUJhY2tpbmdTdG9yZURpc2NhcmRhYmxlU3RhdGUoKQogCiB2b2lkIFdl YlBhZ2VQcm94eTo6c2F2ZURhdGFUb0ZpbGVJbkRvd25sb2Fkc0ZvbGRlcihTdHJpbmcmJiBzdWdn ZXN0ZWRGaWxlbmFtZSwgU3RyaW5nJiYgbWltZVR5cGUsIFVSTCYmIG9yaWdpbmF0aW5nVVJMU3Ry aW5nLCBBUEk6OkRhdGEmIGRhdGEpCiB7Ci0gICAgbV91aUNsaWVudC0+c2F2ZURhdGFUb0ZpbGVJ bkRvd25sb2Fkc0ZvbGRlcih0aGlzLCBzdWdnZXN0ZWRGaWxlbmFtZSwgbWltZVR5cGUsIG9yaWdp bmF0aW5nVVJMU3RyaW5nLCBkYXRhKTsKKyAgICBtX3VpQ2xpZW50LT5zYXZlRGF0YVRvRmlsZUlu RG93bmxvYWRzRm9sZGVyKHRoaXMsIEZpbGVTeXN0ZW06OmVuY29kZUZvckZpbGVOYW1lKHN1Z2dl c3RlZEZpbGVuYW1lKSwgbWltZVR5cGUsIG9yaWdpbmF0aW5nVVJMU3RyaW5nLCBkYXRhKTsKIH0K IAogdm9pZCBXZWJQYWdlUHJveHk6OnNhdmVQREZUb0ZpbGVJbkRvd25sb2Fkc0ZvbGRlcihTdHJp bmcmJiBzdWdnZXN0ZWRGaWxlbmFtZSwgVVJMJiYgb3JpZ2luYXRpbmdVUkwsIGNvbnN0IElQQzo6 RGF0YVJlZmVyZW5jZSYgZGF0YVJlZmVyZW5jZSkKIHsKLSAgICBpZiAoIXN1Z2dlc3RlZEZpbGVu YW1lLmVuZHNXaXRoSWdub3JpbmdBU0NJSUNhc2UoIi5wZGYiKSkKKyAgICBTdHJpbmcgZW5jb2Rl ZEZpbGVuYW1lID0gRmlsZVN5c3RlbTo6ZW5jb2RlRm9yRmlsZU5hbWUoc3VnZ2VzdGVkRmlsZW5h bWUpOworICAgIGlmICghZW5jb2RlZEZpbGVuYW1lLmVuZHNXaXRoSWdub3JpbmdBU0NJSUNhc2Uo Ii5wZGYiKSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgc2F2ZURhdGFUb0ZpbGVJbkRvd25sb2Fk c0ZvbGRlcihXVEZNb3ZlKHN1Z2dlc3RlZEZpbGVuYW1lKSwgImFwcGxpY2F0aW9uL3BkZiJfcywg V1RGTW92ZShvcmlnaW5hdGluZ1VSTCksCisgICAgc2F2ZURhdGFUb0ZpbGVJbkRvd25sb2Fkc0Zv bGRlcihXVEZNb3ZlKGVuY29kZWRGaWxlbmFtZSksICJhcHBsaWNhdGlvbi9wZGYiX3MsIFdURk1v dmUob3JpZ2luYXRpbmdVUkwpLAogICAgICAgICBBUEk6OkRhdGE6OmNyZWF0ZShkYXRhUmVmZXJl bmNlLmRhdGEoKSwgZGF0YVJlZmVyZW5jZS5zaXplKCkpLmdldCgpKTsKIH0KIApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmggYi9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAppbmRleCA3MWQwYTFjZWI3ZTUzYjdjYzYwZjliNjJm MjdiMzFmOWJhYWRjMzdhLi5iYzZiOWYyODNiYmU1OWJiYjk5OGUxYjBiNGE5OGFkZTllZTAyNDk1 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAorKysg Yi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaApAQCAtMTE5Myw3ICsxMTkz LDYgQEAgcHVibGljOgogICAgIHZvaWQgc2F2ZURhdGFUb0ZpbGVJbkRvd25sb2Fkc0ZvbGRlcihT dHJpbmcmJiBzdWdnZXN0ZWRGaWxlbmFtZSwgU3RyaW5nJiYgbWltZVR5cGUsIFVSTCYmIG9yaWdp bmF0aW5nVVJMLCBBUEk6OkRhdGEmKTsKICAgICB2b2lkIHNhdmVQREZUb0ZpbGVJbkRvd25sb2Fk c0ZvbGRlcihTdHJpbmcmJiBzdWdnZXN0ZWRGaWxlbmFtZSwgVVJMJiYgb3JpZ2luYXRpbmdVUkws IGNvbnN0IElQQzo6RGF0YVJlZmVyZW5jZSYpOwogI2lmIFBMQVRGT1JNKENPQ09BKQotICAgIHZv aWQgc2F2ZVBERlRvVGVtcG9yYXJ5Rm9sZGVyQW5kT3BlbldpdGhOYXRpdmVBcHBsaWNhdGlvblJh dyhjb25zdCBTdHJpbmcmIHN1Z2dlc3RlZEZpbGVuYW1lLCBjb25zdCBTdHJpbmcmIG9yaWdpbmF0 aW5nVVJMU3RyaW5nLCBjb25zdCB1aW50OF90KiBkYXRhLCB1bnNpZ25lZCBsb25nIHNpemUsIGNv bnN0IFN0cmluZyYgcGRmVVVJRCk7CiAgICAgdm9pZCBzYXZlUERGVG9UZW1wb3JhcnlGb2xkZXJB bmRPcGVuV2l0aE5hdGl2ZUFwcGxpY2F0aW9uKGNvbnN0IFN0cmluZyYgc3VnZ2VzdGVkRmlsZW5h bWUsIGNvbnN0IFN0cmluZyYgb3JpZ2luYXRpbmdVUkxTdHJpbmcsIGNvbnN0IElQQzo6RGF0YVJl ZmVyZW5jZSYsIGNvbnN0IFN0cmluZyYgcGRmVVVJRCk7CiAgICAgdm9pZCBvcGVuUERGRnJvbVRl bXBvcmFyeUZvbGRlcldpdGhOYXRpdmVBcHBsaWNhdGlvbihjb25zdCBTdHJpbmcmIHBkZlVVSUQp OwogI2VuZGlmCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV2ViUGFn ZVByb3h5SU9TLm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dlYlBhZ2VQcm94eUlP Uy5tbQppbmRleCA0MDdkOTZhNjY3MmRmYmY4YTMyYmYxODNmMTdiYzVlMzU1NjE5MjBjLi5lYWZi ZGY4MGY4NjZkZDA4MmY1M2U0MmMyY2RlMjMyYzM0OTI5NGRiIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9pb3MvV2ViUGFnZVByb3h5SU9TLm1tCisrKyBiL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL2lvcy9XZWJQYWdlUHJveHlJT1MubW0KQEAgLTEwMzksMTEgKzEwMzksNiBA QCB2b2lkIFdlYlBhZ2VQcm94eTo6c2F2ZVBERlRvVGVtcG9yYXJ5Rm9sZGVyQW5kT3BlbldpdGhO YXRpdmVBcHBsaWNhdGlvbihjb25zdCBTdAogICAgIG5vdEltcGxlbWVudGVkKCk7CiB9CiAKLXZv aWQgV2ViUGFnZVByb3h5OjpzYXZlUERGVG9UZW1wb3JhcnlGb2xkZXJBbmRPcGVuV2l0aE5hdGl2 ZUFwcGxpY2F0aW9uUmF3KGNvbnN0IFN0cmluZyYsIGNvbnN0IFN0cmluZyYsIGNvbnN0IHVpbnQ4 X3QqLCB1bnNpZ25lZCBsb25nLCBjb25zdCBTdHJpbmcmKQotewotICAgIG5vdEltcGxlbWVudGVk KCk7Ci19Ci0KIHZvaWQgV2ViUGFnZVByb3h5OjpvcGVuUERGRnJvbVRlbXBvcmFyeUZvbGRlcldp dGhOYXRpdmVBcHBsaWNhdGlvbihjb25zdCBTdHJpbmcmKQogewogICAgIG5vdEltcGxlbWVudGVk KCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9tYWMvV2ViUGFnZVByb3h5 TWFjLm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvbWFjL1dlYlBhZ2VQcm94eU1hYy5tbQpp bmRleCA3ZDQxMWU4MDg4YmRjMzZjZWM1NWVmM2FjZmU2MDA4MjMyMTczZGZmLi4wNjUxNDc2YmQ5 ZWQ1OTg5N2U1MWE3MDRlYWYyZDE1MzMyYTMzNTY5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9tYWMvV2ViUGFnZVByb3h5TWFjLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL21hYy9XZWJQYWdlUHJveHlNYWMubW0KQEAgLTQ5MywzMiArNDkzLDM5IEBAIHN0YXRp YyBOU1N0cmluZyAqcGF0aFRvUERGT25EaXNrKGNvbnN0IFN0cmluZyYgc3VnZ2VzdGVkRmlsZW5h bWUpCiAgICAgcmV0dXJuIHBhdGg7CiB9CiAKLXZvaWQgV2ViUGFnZVByb3h5OjpzYXZlUERGVG9U ZW1wb3JhcnlGb2xkZXJBbmRPcGVuV2l0aE5hdGl2ZUFwcGxpY2F0aW9uUmF3KGNvbnN0IFN0cmlu ZyYgc3VnZ2VzdGVkRmlsZW5hbWUsIGNvbnN0IFN0cmluZyYgb3JpZ2luYXRpbmdVUkxTdHJpbmcs IGNvbnN0IHVpbnQ4X3QqIGRhdGEsIHVuc2lnbmVkIGxvbmcgc2l6ZSwgY29uc3QgU3RyaW5nJiBw ZGZVVUlEKQordm9pZCBXZWJQYWdlUHJveHk6OnNhdmVQREZUb1RlbXBvcmFyeUZvbGRlckFuZE9w ZW5XaXRoTmF0aXZlQXBwbGljYXRpb24oY29uc3QgU3RyaW5nJiBzdWdnZXN0ZWRGaWxlbmFtZSwg Y29uc3QgU3RyaW5nJiBvcmlnaW5hdGluZ1VSTFN0cmluZywgY29uc3QgSVBDOjpEYXRhUmVmZXJl bmNlJiBkYXRhLCBjb25zdCBTdHJpbmcmIHBkZlVVSUQpCiB7CiAgICAgLy8gRklYTUU6IFdyaXRl IG9yaWdpbmF0aW5nVVJMU3RyaW5nIHRvIHRoZSBmaWxlJ3Mgb3JpZ2luYXRpbmcgVVJMIG1ldGFk YXRhIChwZXJoYXBzIEZpbGVTeXN0ZW06OnNldE1ldGFkYXRhVVJMKCk/KS4KICAgICBVTlVTRURf UEFSQU0ob3JpZ2luYXRpbmdVUkxTdHJpbmcpOwogCi0gICAgaWYgKCFzdWdnZXN0ZWRGaWxlbmFt ZS5lbmRzV2l0aElnbm9yaW5nQVNDSUlDYXNlKCIucGRmIikpIHsKKyAgICBhdXRvIGVuY29kZWRG aWxlTmFtZSA9IEZpbGVTeXN0ZW06OmVuY29kZUZvckZpbGVOYW1lKHN1Z2dlc3RlZEZpbGVuYW1l KTsKKworICAgIGlmIChkYXRhLmlzRW1wdHkoKSkgeworICAgICAgICBXVEZMb2dBbHdheXMoIkNh bm5vdCBzYXZlIGVtcHR5IFBERiBmaWxlIHRvIHRoZSB0ZW1wb3JhcnkgZGlyZWN0b3J5LiIpOwor ICAgICAgICByZXR1cm47CisgICAgfQorCisgICAgaWYgKCFlbmNvZGVkRmlsZU5hbWUuZW5kc1dp dGhJZ25vcmluZ0FTQ0lJQ2FzZSgiLnBkZiIpKSB7CiAgICAgICAgIFdURkxvZ0Fsd2F5cygiQ2Fu bm90IHNhdmUgZmlsZSB3aXRob3V0IC5wZGYgZXh0ZW5zaW9uIHRvIHRoZSB0ZW1wb3JhcnkgZGly ZWN0b3J5LiIpOwogICAgICAgICByZXR1cm47CiAgICAgfQogCi0gICAgaWYgKCFzaXplKSB7Cisg ICAgaWYgKCFkYXRhLnNpemUoKSkgewogICAgICAgICBXVEZMb2dBbHdheXMoIkNhbm5vdCBzYXZl IGVtcHR5IFBERiBmaWxlIHRvIHRoZSB0ZW1wb3JhcnkgZGlyZWN0b3J5LiIpOwogICAgICAgICBy ZXR1cm47CiAgICAgfQogCi0gICAgTlNTdHJpbmcgKm5zUGF0aCA9IHBhdGhUb1BERk9uRGlzayhz dWdnZXN0ZWRGaWxlbmFtZSk7CisgICAgTlNTdHJpbmcgKm5zUGF0aCA9IHBhdGhUb1BERk9uRGlz ayhlbmNvZGVkRmlsZU5hbWUpOwogCiAgICAgaWYgKCFuc1BhdGgpCiAgICAgICAgIHJldHVybjsK IAogICAgIFJldGFpblB0cjxOU051bWJlcj4gcGVybWlzc2lvbnMgPSBhZG9wdE5TKFtbTlNOdW1i ZXIgYWxsb2NdIGluaXRXaXRoSW50OlNfSVJVU1JdKTsKICAgICBSZXRhaW5QdHI8TlNEaWN0aW9u YXJ5PiBmaWxlQXR0cmlidXRlcyA9IGFkb3B0TlMoW1tOU0RpY3Rpb25hcnkgYWxsb2NdIGluaXRX aXRoT2JqZWN0c0FuZEtleXM6cGVybWlzc2lvbnMuZ2V0KCksIE5TRmlsZVBvc2l4UGVybWlzc2lv bnMsIG5pbF0pOwotICAgIFJldGFpblB0cjxOU0RhdGE+IG5zRGF0YSA9IGFkb3B0TlMoW1tOU0Rh dGEgYWxsb2NdIGluaXRXaXRoQnl0ZXNOb0NvcHk6KHZvaWQqKWRhdGEgbGVuZ3RoOnNpemUgZnJl ZVdoZW5Eb25lOk5PXSk7CisgICAgUmV0YWluUHRyPE5TRGF0YT4gbnNEYXRhID0gYWRvcHROUyhb W05TRGF0YSBhbGxvY10gaW5pdFdpdGhCeXRlc05vQ29weToodm9pZCopZGF0YS5kYXRhKCkgbGVu Z3RoOmRhdGEuc2l6ZSgpIGZyZWVXaGVuRG9uZTpOT10pOwogCiAgICAgaWYgKCFbW05TRmlsZU1h bmFnZXIgZGVmYXVsdE1hbmFnZXJdIGNyZWF0ZUZpbGVBdFBhdGg6bnNQYXRoIGNvbnRlbnRzOm5z RGF0YS5nZXQoKSBhdHRyaWJ1dGVzOmZpbGVBdHRyaWJ1dGVzLmdldCgpXSkgewotICAgICAgICBX VEZMb2dBbHdheXMoIkNhbm5vdCBjcmVhdGUgUERGIGZpbGUgaW4gdGhlIHRlbXBvcmFyeSBkaXJl Y3RvcnkgKCVzKS4iLCBzdWdnZXN0ZWRGaWxlbmFtZS51dGY4KCkuZGF0YSgpKTsKKyAgICAgICAg V1RGTG9nQWx3YXlzKCJDYW5ub3QgY3JlYXRlIFBERiBmaWxlIGluIHRoZSB0ZW1wb3JhcnkgZGly ZWN0b3J5ICglcykuIiwgZW5jb2RlZEZpbGVOYW1lLnV0ZjgoKS5kYXRhKCkpOwogICAgICAgICBy ZXR1cm47CiAgICAgfQogCkBAIC01MjcsMTYgKzUzNCw2IEBAIHZvaWQgV2ViUGFnZVByb3h5Ojpz YXZlUERGVG9UZW1wb3JhcnlGb2xkZXJBbmRPcGVuV2l0aE5hdGl2ZUFwcGxpY2F0aW9uUmF3KGNv bnN0CiAgICAgW1tOU1dvcmtzcGFjZSBzaGFyZWRXb3Jrc3BhY2VdIG9wZW5GaWxlOm5zUGF0aF07 CiB9CiAKLXZvaWQgV2ViUGFnZVByb3h5OjpzYXZlUERGVG9UZW1wb3JhcnlGb2xkZXJBbmRPcGVu V2l0aE5hdGl2ZUFwcGxpY2F0aW9uKGNvbnN0IFN0cmluZyYgc3VnZ2VzdGVkRmlsZW5hbWUsIGNv bnN0IFN0cmluZyYgb3JpZ2luYXRpbmdVUkxTdHJpbmcsIGNvbnN0IElQQzo6RGF0YVJlZmVyZW5j ZSYgZGF0YSwgY29uc3QgU3RyaW5nJiBwZGZVVUlEKQotewotICAgIGlmIChkYXRhLmlzRW1wdHko KSkgewotICAgICAgICBXVEZMb2dBbHdheXMoIkNhbm5vdCBzYXZlIGVtcHR5IFBERiBmaWxlIHRv IHRoZSB0ZW1wb3JhcnkgZGlyZWN0b3J5LiIpOwotICAgICAgICByZXR1cm47Ci0gICAgfQotCi0g ICAgc2F2ZVBERlRvVGVtcG9yYXJ5Rm9sZGVyQW5kT3BlbldpdGhOYXRpdmVBcHBsaWNhdGlvblJh dyhzdWdnZXN0ZWRGaWxlbmFtZSwgb3JpZ2luYXRpbmdVUkxTdHJpbmcsIGRhdGEuZGF0YSgpLCBk YXRhLnNpemUoKSwgcGRmVVVJRCk7Ci19Ci0KIHZvaWQgV2ViUGFnZVByb3h5OjpvcGVuUERGRnJv bVRlbXBvcmFyeUZvbGRlcldpdGhOYXRpdmVBcHBsaWNhdGlvbihjb25zdCBTdHJpbmcmIHBkZlVV SUQpCiB7CiAgICAgU3RyaW5nIHBkZkZpbGVuYW1lID0gbV90ZW1wb3JhcnlQREZGaWxlcy5nZXQo cGRmVVVJRCk7Cg== 379254 2019-09-20 12:02:43 -0700 2019-09-20 12:09:17 -0700 Patch bug-202034-20190920120242.patch text/plain 8746 thorton U3VidmVyc2lvbiBSZXZpc2lvbjogMjUwMDk3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDFjZWIxZDM1ZGNkMzNlZjEw OWY4Y2YyZDgyM2YxYWQ5OTYxMDg1MzEuLmY3MDg4ODNmYzg1NzY5ZmJlYmMxYjdjMzJiY2Y5ODk0 MWY5N2I2NjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjQgQEAKKzIwMTktMDktMTkgIFRpbSBIb3J0 b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CisKKyAgICAgICAgUGVyY2VudC1lbmNvZGUg c3VnZ2VzdGVkIGZpbGVuYW1lcyB1c2VkIGZvciBzYXZpbmcgUERGcworICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjAyMDM0CisgICAgICAgIDxyZGFyOi8v cHJvYmxlbS81MzE4MzA3NT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0 OjpXZWJQYWdlUHJveHk6OmRpZEZpbmlzaExvYWRpbmdEYXRhRm9yQ3VzdG9tQ29udGVudFByb3Zp ZGVyKToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpzYXZlRGF0YVRvRmlsZUluRG93 bmxvYWRzRm9sZGVyKToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpzYXZlUERGVG9G aWxlSW5Eb3dubG9hZHNGb2xkZXIpOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHku aDoKKyAgICAgICAgKiBVSVByb2Nlc3MvaW9zL1dlYlBhZ2VQcm94eUlPUy5tbToKKyAgICAgICAg KFdlYktpdDo6V2ViUGFnZVByb3h5OjpzYXZlUERGVG9UZW1wb3JhcnlGb2xkZXJBbmRPcGVuV2l0 aE5hdGl2ZUFwcGxpY2F0aW9uUmF3KTogRGVsZXRlZC4KKyAgICAgICAgKiBVSVByb2Nlc3MvbWFj L1dlYlBhZ2VQcm94eU1hYy5tbToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpzYXZl UERGVG9UZW1wb3JhcnlGb2xkZXJBbmRPcGVuV2l0aE5hdGl2ZUFwcGxpY2F0aW9uKToKKyAgICAg ICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpzYXZlUERGVG9UZW1wb3JhcnlGb2xkZXJBbmRPcGVu V2l0aE5hdGl2ZUFwcGxpY2F0aW9uUmF3KTogRGVsZXRlZC4KKyAgICAgICAgUGVyY2VudC1lbmNv ZGUgc3VnZ2VzdGVkIGZpbGVuYW1lcyB0byBlbnN1cmUgdGhhdCB0aGV5IGNvbXByaXNlIG9ubHkg b25lIHBhdGggY29tcG9uZW50CisgICAgICAgIHdoZW4gY29uY2F0ZW5hdGVkIHdpdGggdGhlaXIg ZGVzdGluYXRpb24gZGlyZWN0b3J5LgorCiAyMDE5LTA5LTE5ICBCcmVudCBGdWxnaGFtICA8YmZ1 bGdoYW1AYXBwbGUuY29tPgogCiAgICAgICAgIENyZWF0ZSBJbmplY3RlZEJ1bmRsZSBTUEkgdG8g YmV0dGVyIHN1cHBvcnQgTlNTZWN1cmVDb2RpbmcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQ YWdlUHJveHkuY3BwCmluZGV4IDlkY2E4Zjc3ZjljYTdkNjVhNjU0OGYzMmRjM2FhYWExYTE4OGFj ZjQuLjVlMTYzYjNlYjI0NzVhZGM4MzdlNjRmZjExYzlmMDg4Nzc0YmQwZjkgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKKysrIGIvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcApAQCAtNzY4Nyw3ICs3Njg3LDcgQEAgdm9p ZCBXZWJQYWdlUHJveHk6OnVwZGF0ZVdlYnNpdGVQb2xpY2llcyhXZWJzaXRlUG9saWNpZXNEYXRh JiYgd2Vic2l0ZVBvbGljaWVzKQogCiB2b2lkIFdlYlBhZ2VQcm94eTo6ZGlkRmluaXNoTG9hZGlu Z0RhdGFGb3JDdXN0b21Db250ZW50UHJvdmlkZXIoY29uc3QgU3RyaW5nJiBzdWdnZXN0ZWRGaWxl bmFtZSwgY29uc3QgSVBDOjpEYXRhUmVmZXJlbmNlJiBkYXRhUmVmZXJlbmNlKQogewotICAgIHBh Z2VDbGllbnQoKS5kaWRGaW5pc2hMb2FkaW5nRGF0YUZvckN1c3RvbUNvbnRlbnRQcm92aWRlcihz dWdnZXN0ZWRGaWxlbmFtZSwgZGF0YVJlZmVyZW5jZSk7CisgICAgcGFnZUNsaWVudCgpLmRpZEZp bmlzaExvYWRpbmdEYXRhRm9yQ3VzdG9tQ29udGVudFByb3ZpZGVyKFJlc291cmNlUmVzcG9uc2VC YXNlOjpzYW5pdGl6ZVN1Z2dlc3RlZEZpbGVuYW1lKHN1Z2dlc3RlZEZpbGVuYW1lKSwgZGF0YVJl ZmVyZW5jZSk7CiB9CiAKIHZvaWQgV2ViUGFnZVByb3h5OjpiYWNrRm9yd2FyZFJlbW92ZWRJdGVt KGNvbnN0IEJhY2tGb3J3YXJkSXRlbUlkZW50aWZpZXImIGl0ZW1JRCkKQEAgLTc4MjIsMTUgKzc4 MjIsMTYgQEAgdm9pZCBXZWJQYWdlUHJveHk6OnVwZGF0ZUJhY2tpbmdTdG9yZURpc2NhcmRhYmxl U3RhdGUoKQogCiB2b2lkIFdlYlBhZ2VQcm94eTo6c2F2ZURhdGFUb0ZpbGVJbkRvd25sb2Fkc0Zv bGRlcihTdHJpbmcmJiBzdWdnZXN0ZWRGaWxlbmFtZSwgU3RyaW5nJiYgbWltZVR5cGUsIFVSTCYm IG9yaWdpbmF0aW5nVVJMU3RyaW5nLCBBUEk6OkRhdGEmIGRhdGEpCiB7Ci0gICAgbV91aUNsaWVu dC0+c2F2ZURhdGFUb0ZpbGVJbkRvd25sb2Fkc0ZvbGRlcih0aGlzLCBzdWdnZXN0ZWRGaWxlbmFt ZSwgbWltZVR5cGUsIG9yaWdpbmF0aW5nVVJMU3RyaW5nLCBkYXRhKTsKKyAgICBtX3VpQ2xpZW50 LT5zYXZlRGF0YVRvRmlsZUluRG93bmxvYWRzRm9sZGVyKHRoaXMsIFJlc291cmNlUmVzcG9uc2VC YXNlOjpzYW5pdGl6ZVN1Z2dlc3RlZEZpbGVuYW1lKHN1Z2dlc3RlZEZpbGVuYW1lKSwgbWltZVR5 cGUsIG9yaWdpbmF0aW5nVVJMU3RyaW5nLCBkYXRhKTsKIH0KIAogdm9pZCBXZWJQYWdlUHJveHk6 OnNhdmVQREZUb0ZpbGVJbkRvd25sb2Fkc0ZvbGRlcihTdHJpbmcmJiBzdWdnZXN0ZWRGaWxlbmFt ZSwgVVJMJiYgb3JpZ2luYXRpbmdVUkwsIGNvbnN0IElQQzo6RGF0YVJlZmVyZW5jZSYgZGF0YVJl ZmVyZW5jZSkKIHsKLSAgICBpZiAoIXN1Z2dlc3RlZEZpbGVuYW1lLmVuZHNXaXRoSWdub3JpbmdB U0NJSUNhc2UoIi5wZGYiKSkKKyAgICBTdHJpbmcgZW5jb2RlZEZpbGVuYW1lID0gUmVzb3VyY2VS ZXNwb25zZUJhc2U6OnNhbml0aXplU3VnZ2VzdGVkRmlsZW5hbWUoc3VnZ2VzdGVkRmlsZW5hbWUp OworICAgIGlmICghZW5jb2RlZEZpbGVuYW1lLmVuZHNXaXRoSWdub3JpbmdBU0NJSUNhc2UoIi5w ZGYiKSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgc2F2ZURhdGFUb0ZpbGVJbkRvd25sb2Fkc0Zv bGRlcihXVEZNb3ZlKHN1Z2dlc3RlZEZpbGVuYW1lKSwgImFwcGxpY2F0aW9uL3BkZiJfcywgV1RG TW92ZShvcmlnaW5hdGluZ1VSTCksCisgICAgc2F2ZURhdGFUb0ZpbGVJbkRvd25sb2Fkc0ZvbGRl cihXVEZNb3ZlKGVuY29kZWRGaWxlbmFtZSksICJhcHBsaWNhdGlvbi9wZGYiX3MsIFdURk1vdmUo b3JpZ2luYXRpbmdVUkwpLAogICAgICAgICBBUEk6OkRhdGE6OmNyZWF0ZShkYXRhUmVmZXJlbmNl LmRhdGEoKSwgZGF0YVJlZmVyZW5jZS5zaXplKCkpLmdldCgpKTsKIH0KIApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmggYi9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9XZWJQYWdlUHJveHkuaAppbmRleCA3MWQwYTFjZWI3ZTUzYjdjYzYwZjliNjJmMjdi MzFmOWJhYWRjMzdhLi5iYzZiOWYyODNiYmU1OWJiYjk5OGUxYjBiNGE5OGFkZTllZTAyNDk1IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAorKysgYi9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaApAQCAtMTE5Myw3ICsxMTkzLDYg QEAgcHVibGljOgogICAgIHZvaWQgc2F2ZURhdGFUb0ZpbGVJbkRvd25sb2Fkc0ZvbGRlcihTdHJp bmcmJiBzdWdnZXN0ZWRGaWxlbmFtZSwgU3RyaW5nJiYgbWltZVR5cGUsIFVSTCYmIG9yaWdpbmF0 aW5nVVJMLCBBUEk6OkRhdGEmKTsKICAgICB2b2lkIHNhdmVQREZUb0ZpbGVJbkRvd25sb2Fkc0Zv bGRlcihTdHJpbmcmJiBzdWdnZXN0ZWRGaWxlbmFtZSwgVVJMJiYgb3JpZ2luYXRpbmdVUkwsIGNv bnN0IElQQzo6RGF0YVJlZmVyZW5jZSYpOwogI2lmIFBMQVRGT1JNKENPQ09BKQotICAgIHZvaWQg c2F2ZVBERlRvVGVtcG9yYXJ5Rm9sZGVyQW5kT3BlbldpdGhOYXRpdmVBcHBsaWNhdGlvblJhdyhj b25zdCBTdHJpbmcmIHN1Z2dlc3RlZEZpbGVuYW1lLCBjb25zdCBTdHJpbmcmIG9yaWdpbmF0aW5n VVJMU3RyaW5nLCBjb25zdCB1aW50OF90KiBkYXRhLCB1bnNpZ25lZCBsb25nIHNpemUsIGNvbnN0 IFN0cmluZyYgcGRmVVVJRCk7CiAgICAgdm9pZCBzYXZlUERGVG9UZW1wb3JhcnlGb2xkZXJBbmRP cGVuV2l0aE5hdGl2ZUFwcGxpY2F0aW9uKGNvbnN0IFN0cmluZyYgc3VnZ2VzdGVkRmlsZW5hbWUs IGNvbnN0IFN0cmluZyYgb3JpZ2luYXRpbmdVUkxTdHJpbmcsIGNvbnN0IElQQzo6RGF0YVJlZmVy ZW5jZSYsIGNvbnN0IFN0cmluZyYgcGRmVVVJRCk7CiAgICAgdm9pZCBvcGVuUERGRnJvbVRlbXBv cmFyeUZvbGRlcldpdGhOYXRpdmVBcHBsaWNhdGlvbihjb25zdCBTdHJpbmcmIHBkZlVVSUQpOwog I2VuZGlmCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV2ViUGFnZVBy b3h5SU9TLm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dlYlBhZ2VQcm94eUlPUy5t bQppbmRleCA0MDdkOTZhNjY3MmRmYmY4YTMyYmYxODNmMTdiYzVlMzU1NjE5MjBjLi5lYWZiZGY4 MGY4NjZkZDA4MmY1M2U0MmMyY2RlMjMyYzM0OTI5NGRiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9pb3MvV2ViUGFnZVByb3h5SU9TLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL2lvcy9XZWJQYWdlUHJveHlJT1MubW0KQEAgLTEwMzksMTEgKzEwMzksNiBAQCB2 b2lkIFdlYlBhZ2VQcm94eTo6c2F2ZVBERlRvVGVtcG9yYXJ5Rm9sZGVyQW5kT3BlbldpdGhOYXRp dmVBcHBsaWNhdGlvbihjb25zdCBTdAogICAgIG5vdEltcGxlbWVudGVkKCk7CiB9CiAKLXZvaWQg V2ViUGFnZVByb3h5OjpzYXZlUERGVG9UZW1wb3JhcnlGb2xkZXJBbmRPcGVuV2l0aE5hdGl2ZUFw cGxpY2F0aW9uUmF3KGNvbnN0IFN0cmluZyYsIGNvbnN0IFN0cmluZyYsIGNvbnN0IHVpbnQ4X3Qq LCB1bnNpZ25lZCBsb25nLCBjb25zdCBTdHJpbmcmKQotewotICAgIG5vdEltcGxlbWVudGVkKCk7 Ci19Ci0KIHZvaWQgV2ViUGFnZVByb3h5OjpvcGVuUERGRnJvbVRlbXBvcmFyeUZvbGRlcldpdGhO YXRpdmVBcHBsaWNhdGlvbihjb25zdCBTdHJpbmcmKQogewogICAgIG5vdEltcGxlbWVudGVkKCk7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9tYWMvV2ViUGFnZVByb3h5TWFj Lm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvbWFjL1dlYlBhZ2VQcm94eU1hYy5tbQppbmRl eCA3ZDQxMWU4MDg4YmRjMzZjZWM1NWVmM2FjZmU2MDA4MjMyMTczZGZmLi40NzE3MzVhMjJhNmM3 ZjgwMjU3MjNmNTIyNWQwZTY1YjY1NjQ2ZjEzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9tYWMvV2ViUGFnZVByb3h5TWFjLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL21hYy9XZWJQYWdlUHJveHlNYWMubW0KQEAgLTQ5MywzMiArNDkzLDM5IEBAIHN0YXRpYyBO U1N0cmluZyAqcGF0aFRvUERGT25EaXNrKGNvbnN0IFN0cmluZyYgc3VnZ2VzdGVkRmlsZW5hbWUp CiAgICAgcmV0dXJuIHBhdGg7CiB9CiAKLXZvaWQgV2ViUGFnZVByb3h5OjpzYXZlUERGVG9UZW1w b3JhcnlGb2xkZXJBbmRPcGVuV2l0aE5hdGl2ZUFwcGxpY2F0aW9uUmF3KGNvbnN0IFN0cmluZyYg c3VnZ2VzdGVkRmlsZW5hbWUsIGNvbnN0IFN0cmluZyYgb3JpZ2luYXRpbmdVUkxTdHJpbmcsIGNv bnN0IHVpbnQ4X3QqIGRhdGEsIHVuc2lnbmVkIGxvbmcgc2l6ZSwgY29uc3QgU3RyaW5nJiBwZGZV VUlEKQordm9pZCBXZWJQYWdlUHJveHk6OnNhdmVQREZUb1RlbXBvcmFyeUZvbGRlckFuZE9wZW5X aXRoTmF0aXZlQXBwbGljYXRpb24oY29uc3QgU3RyaW5nJiBzdWdnZXN0ZWRGaWxlbmFtZSwgY29u c3QgU3RyaW5nJiBvcmlnaW5hdGluZ1VSTFN0cmluZywgY29uc3QgSVBDOjpEYXRhUmVmZXJlbmNl JiBkYXRhLCBjb25zdCBTdHJpbmcmIHBkZlVVSUQpCiB7CiAgICAgLy8gRklYTUU6IFdyaXRlIG9y aWdpbmF0aW5nVVJMU3RyaW5nIHRvIHRoZSBmaWxlJ3Mgb3JpZ2luYXRpbmcgVVJMIG1ldGFkYXRh IChwZXJoYXBzIEZpbGVTeXN0ZW06OnNldE1ldGFkYXRhVVJMKCk/KS4KICAgICBVTlVTRURfUEFS QU0ob3JpZ2luYXRpbmdVUkxTdHJpbmcpOwogCi0gICAgaWYgKCFzdWdnZXN0ZWRGaWxlbmFtZS5l bmRzV2l0aElnbm9yaW5nQVNDSUlDYXNlKCIucGRmIikpIHsKKyAgICBhdXRvIGVuY29kZWRGaWxl TmFtZSA9IFJlc291cmNlUmVzcG9uc2VCYXNlOjpzYW5pdGl6ZVN1Z2dlc3RlZEZpbGVuYW1lKHN1 Z2dlc3RlZEZpbGVuYW1lKTsKKworICAgIGlmIChkYXRhLmlzRW1wdHkoKSkgeworICAgICAgICBX VEZMb2dBbHdheXMoIkNhbm5vdCBzYXZlIGVtcHR5IFBERiBmaWxlIHRvIHRoZSB0ZW1wb3Jhcnkg ZGlyZWN0b3J5LiIpOworICAgICAgICByZXR1cm47CisgICAgfQorCisgICAgaWYgKCFlbmNvZGVk RmlsZU5hbWUuZW5kc1dpdGhJZ25vcmluZ0FTQ0lJQ2FzZSgiLnBkZiIpKSB7CiAgICAgICAgIFdU RkxvZ0Fsd2F5cygiQ2Fubm90IHNhdmUgZmlsZSB3aXRob3V0IC5wZGYgZXh0ZW5zaW9uIHRvIHRo ZSB0ZW1wb3JhcnkgZGlyZWN0b3J5LiIpOwogICAgICAgICByZXR1cm47CiAgICAgfQogCi0gICAg aWYgKCFzaXplKSB7CisgICAgaWYgKCFkYXRhLnNpemUoKSkgewogICAgICAgICBXVEZMb2dBbHdh eXMoIkNhbm5vdCBzYXZlIGVtcHR5IFBERiBmaWxlIHRvIHRoZSB0ZW1wb3JhcnkgZGlyZWN0b3J5 LiIpOwogICAgICAgICByZXR1cm47CiAgICAgfQogCi0gICAgTlNTdHJpbmcgKm5zUGF0aCA9IHBh dGhUb1BERk9uRGlzayhzdWdnZXN0ZWRGaWxlbmFtZSk7CisgICAgTlNTdHJpbmcgKm5zUGF0aCA9 IHBhdGhUb1BERk9uRGlzayhlbmNvZGVkRmlsZU5hbWUpOwogCiAgICAgaWYgKCFuc1BhdGgpCiAg ICAgICAgIHJldHVybjsKIAogICAgIFJldGFpblB0cjxOU051bWJlcj4gcGVybWlzc2lvbnMgPSBh ZG9wdE5TKFtbTlNOdW1iZXIgYWxsb2NdIGluaXRXaXRoSW50OlNfSVJVU1JdKTsKICAgICBSZXRh aW5QdHI8TlNEaWN0aW9uYXJ5PiBmaWxlQXR0cmlidXRlcyA9IGFkb3B0TlMoW1tOU0RpY3Rpb25h cnkgYWxsb2NdIGluaXRXaXRoT2JqZWN0c0FuZEtleXM6cGVybWlzc2lvbnMuZ2V0KCksIE5TRmls ZVBvc2l4UGVybWlzc2lvbnMsIG5pbF0pOwotICAgIFJldGFpblB0cjxOU0RhdGE+IG5zRGF0YSA9 IGFkb3B0TlMoW1tOU0RhdGEgYWxsb2NdIGluaXRXaXRoQnl0ZXNOb0NvcHk6KHZvaWQqKWRhdGEg bGVuZ3RoOnNpemUgZnJlZVdoZW5Eb25lOk5PXSk7CisgICAgUmV0YWluUHRyPE5TRGF0YT4gbnNE YXRhID0gYWRvcHROUyhbW05TRGF0YSBhbGxvY10gaW5pdFdpdGhCeXRlc05vQ29weToodm9pZCop ZGF0YS5kYXRhKCkgbGVuZ3RoOmRhdGEuc2l6ZSgpIGZyZWVXaGVuRG9uZTpOT10pOwogCiAgICAg aWYgKCFbW05TRmlsZU1hbmFnZXIgZGVmYXVsdE1hbmFnZXJdIGNyZWF0ZUZpbGVBdFBhdGg6bnNQ YXRoIGNvbnRlbnRzOm5zRGF0YS5nZXQoKSBhdHRyaWJ1dGVzOmZpbGVBdHRyaWJ1dGVzLmdldCgp XSkgewotICAgICAgICBXVEZMb2dBbHdheXMoIkNhbm5vdCBjcmVhdGUgUERGIGZpbGUgaW4gdGhl IHRlbXBvcmFyeSBkaXJlY3RvcnkgKCVzKS4iLCBzdWdnZXN0ZWRGaWxlbmFtZS51dGY4KCkuZGF0 YSgpKTsKKyAgICAgICAgV1RGTG9nQWx3YXlzKCJDYW5ub3QgY3JlYXRlIFBERiBmaWxlIGluIHRo ZSB0ZW1wb3JhcnkgZGlyZWN0b3J5ICglcykuIiwgZW5jb2RlZEZpbGVOYW1lLnV0ZjgoKS5kYXRh KCkpOwogICAgICAgICByZXR1cm47CiAgICAgfQogCkBAIC01MjcsMTYgKzUzNCw2IEBAIHZvaWQg V2ViUGFnZVByb3h5OjpzYXZlUERGVG9UZW1wb3JhcnlGb2xkZXJBbmRPcGVuV2l0aE5hdGl2ZUFw cGxpY2F0aW9uUmF3KGNvbnN0CiAgICAgW1tOU1dvcmtzcGFjZSBzaGFyZWRXb3Jrc3BhY2VdIG9w ZW5GaWxlOm5zUGF0aF07CiB9CiAKLXZvaWQgV2ViUGFnZVByb3h5OjpzYXZlUERGVG9UZW1wb3Jh cnlGb2xkZXJBbmRPcGVuV2l0aE5hdGl2ZUFwcGxpY2F0aW9uKGNvbnN0IFN0cmluZyYgc3VnZ2Vz dGVkRmlsZW5hbWUsIGNvbnN0IFN0cmluZyYgb3JpZ2luYXRpbmdVUkxTdHJpbmcsIGNvbnN0IElQ Qzo6RGF0YVJlZmVyZW5jZSYgZGF0YSwgY29uc3QgU3RyaW5nJiBwZGZVVUlEKQotewotICAgIGlm IChkYXRhLmlzRW1wdHkoKSkgewotICAgICAgICBXVEZMb2dBbHdheXMoIkNhbm5vdCBzYXZlIGVt cHR5IFBERiBmaWxlIHRvIHRoZSB0ZW1wb3JhcnkgZGlyZWN0b3J5LiIpOwotICAgICAgICByZXR1 cm47Ci0gICAgfQotCi0gICAgc2F2ZVBERlRvVGVtcG9yYXJ5Rm9sZGVyQW5kT3BlbldpdGhOYXRp dmVBcHBsaWNhdGlvblJhdyhzdWdnZXN0ZWRGaWxlbmFtZSwgb3JpZ2luYXRpbmdVUkxTdHJpbmcs IGRhdGEuZGF0YSgpLCBkYXRhLnNpemUoKSwgcGRmVVVJRCk7Ci19Ci0KIHZvaWQgV2ViUGFnZVBy b3h5OjpvcGVuUERGRnJvbVRlbXBvcmFyeUZvbGRlcldpdGhOYXRpdmVBcHBsaWNhdGlvbihjb25z dCBTdHJpbmcmIHBkZlVVSUQpCiB7CiAgICAgU3RyaW5nIHBkZkZpbGVuYW1lID0gbV90ZW1wb3Jh cnlQREZGaWxlcy5nZXQocGRmVVVJRCk7Cg== 379255 2019-09-20 12:09:18 -0700 2019-09-20 12:16:04 -0700 Patch bug-202034-20190920120917.patch text/plain 8740 thorton U3VidmVyc2lvbiBSZXZpc2lvbjogMjUwMDk3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDFjZWIxZDM1ZGNkMzNlZjEw OWY4Y2YyZDgyM2YxYWQ5OTYxMDg1MzEuLmY0OTVmYjYxYWNjMzIzNjMwMWFhODQyZWVlNDczNDE1 ZmIxY2Q0MjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjQgQEAKKzIwMTktMDktMTkgIFRpbSBIb3J0 b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CisKKyAgICAgICAgU2FuaXRpemUgc3VnZ2Vz dGVkIGZpbGVuYW1lcyB1c2VkIGZvciBzYXZpbmcgUERGcworICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjAyMDM0CisgICAgICAgIDxyZGFyOi8vcHJvYmxl bS81MzE4MzA3NT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQ YWdlUHJveHk6OmRpZEZpbmlzaExvYWRpbmdEYXRhRm9yQ3VzdG9tQ29udGVudFByb3ZpZGVyKToK KyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpzYXZlRGF0YVRvRmlsZUluRG93bmxvYWRz Rm9sZGVyKToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpzYXZlUERGVG9GaWxlSW5E b3dubG9hZHNGb2xkZXIpOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaDoKKyAg ICAgICAgKiBVSVByb2Nlc3MvaW9zL1dlYlBhZ2VQcm94eUlPUy5tbToKKyAgICAgICAgKFdlYktp dDo6V2ViUGFnZVByb3h5OjpzYXZlUERGVG9UZW1wb3JhcnlGb2xkZXJBbmRPcGVuV2l0aE5hdGl2 ZUFwcGxpY2F0aW9uUmF3KTogRGVsZXRlZC4KKyAgICAgICAgKiBVSVByb2Nlc3MvbWFjL1dlYlBh Z2VQcm94eU1hYy5tbToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpzYXZlUERGVG9U ZW1wb3JhcnlGb2xkZXJBbmRPcGVuV2l0aE5hdGl2ZUFwcGxpY2F0aW9uKToKKyAgICAgICAgKFdl YktpdDo6V2ViUGFnZVByb3h5OjpzYXZlUERGVG9UZW1wb3JhcnlGb2xkZXJBbmRPcGVuV2l0aE5h dGl2ZUFwcGxpY2F0aW9uUmF3KTogRGVsZXRlZC4KKyAgICAgICAgUGVyY2VudC1lbmNvZGUgc3Vn Z2VzdGVkIGZpbGVuYW1lcyB0byBlbnN1cmUgdGhhdCB0aGV5IGNvbXByaXNlIG9ubHkgb25lIHBh dGggY29tcG9uZW50CisgICAgICAgIHdoZW4gY29uY2F0ZW5hdGVkIHdpdGggdGhlaXIgZGVzdGlu YXRpb24gZGlyZWN0b3J5LgorCiAyMDE5LTA5LTE5ICBCcmVudCBGdWxnaGFtICA8YmZ1bGdoYW1A YXBwbGUuY29tPgogCiAgICAgICAgIENyZWF0ZSBJbmplY3RlZEJ1bmRsZSBTUEkgdG8gYmV0dGVy IHN1cHBvcnQgTlNTZWN1cmVDb2RpbmcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL1dlYlBhZ2VQcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJv eHkuY3BwCmluZGV4IDlkY2E4Zjc3ZjljYTdkNjVhNjU0OGYzMmRjM2FhYWExYTE4OGFjZjQuLjVl MTYzYjNlYjI0NzVhZGM4MzdlNjRmZjExYzlmMDg4Nzc0YmQwZjkgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcApAQCAtNzY4Nyw3ICs3Njg3LDcgQEAgdm9pZCBXZWJQ YWdlUHJveHk6OnVwZGF0ZVdlYnNpdGVQb2xpY2llcyhXZWJzaXRlUG9saWNpZXNEYXRhJiYgd2Vi c2l0ZVBvbGljaWVzKQogCiB2b2lkIFdlYlBhZ2VQcm94eTo6ZGlkRmluaXNoTG9hZGluZ0RhdGFG b3JDdXN0b21Db250ZW50UHJvdmlkZXIoY29uc3QgU3RyaW5nJiBzdWdnZXN0ZWRGaWxlbmFtZSwg Y29uc3QgSVBDOjpEYXRhUmVmZXJlbmNlJiBkYXRhUmVmZXJlbmNlKQogewotICAgIHBhZ2VDbGll bnQoKS5kaWRGaW5pc2hMb2FkaW5nRGF0YUZvckN1c3RvbUNvbnRlbnRQcm92aWRlcihzdWdnZXN0 ZWRGaWxlbmFtZSwgZGF0YVJlZmVyZW5jZSk7CisgICAgcGFnZUNsaWVudCgpLmRpZEZpbmlzaExv YWRpbmdEYXRhRm9yQ3VzdG9tQ29udGVudFByb3ZpZGVyKFJlc291cmNlUmVzcG9uc2VCYXNlOjpz YW5pdGl6ZVN1Z2dlc3RlZEZpbGVuYW1lKHN1Z2dlc3RlZEZpbGVuYW1lKSwgZGF0YVJlZmVyZW5j ZSk7CiB9CiAKIHZvaWQgV2ViUGFnZVByb3h5OjpiYWNrRm9yd2FyZFJlbW92ZWRJdGVtKGNvbnN0 IEJhY2tGb3J3YXJkSXRlbUlkZW50aWZpZXImIGl0ZW1JRCkKQEAgLTc4MjIsMTUgKzc4MjIsMTYg QEAgdm9pZCBXZWJQYWdlUHJveHk6OnVwZGF0ZUJhY2tpbmdTdG9yZURpc2NhcmRhYmxlU3RhdGUo KQogCiB2b2lkIFdlYlBhZ2VQcm94eTo6c2F2ZURhdGFUb0ZpbGVJbkRvd25sb2Fkc0ZvbGRlcihT dHJpbmcmJiBzdWdnZXN0ZWRGaWxlbmFtZSwgU3RyaW5nJiYgbWltZVR5cGUsIFVSTCYmIG9yaWdp bmF0aW5nVVJMU3RyaW5nLCBBUEk6OkRhdGEmIGRhdGEpCiB7Ci0gICAgbV91aUNsaWVudC0+c2F2 ZURhdGFUb0ZpbGVJbkRvd25sb2Fkc0ZvbGRlcih0aGlzLCBzdWdnZXN0ZWRGaWxlbmFtZSwgbWlt ZVR5cGUsIG9yaWdpbmF0aW5nVVJMU3RyaW5nLCBkYXRhKTsKKyAgICBtX3VpQ2xpZW50LT5zYXZl RGF0YVRvRmlsZUluRG93bmxvYWRzRm9sZGVyKHRoaXMsIFJlc291cmNlUmVzcG9uc2VCYXNlOjpz YW5pdGl6ZVN1Z2dlc3RlZEZpbGVuYW1lKHN1Z2dlc3RlZEZpbGVuYW1lKSwgbWltZVR5cGUsIG9y aWdpbmF0aW5nVVJMU3RyaW5nLCBkYXRhKTsKIH0KIAogdm9pZCBXZWJQYWdlUHJveHk6OnNhdmVQ REZUb0ZpbGVJbkRvd25sb2Fkc0ZvbGRlcihTdHJpbmcmJiBzdWdnZXN0ZWRGaWxlbmFtZSwgVVJM JiYgb3JpZ2luYXRpbmdVUkwsIGNvbnN0IElQQzo6RGF0YVJlZmVyZW5jZSYgZGF0YVJlZmVyZW5j ZSkKIHsKLSAgICBpZiAoIXN1Z2dlc3RlZEZpbGVuYW1lLmVuZHNXaXRoSWdub3JpbmdBU0NJSUNh c2UoIi5wZGYiKSkKKyAgICBTdHJpbmcgZW5jb2RlZEZpbGVuYW1lID0gUmVzb3VyY2VSZXNwb25z ZUJhc2U6OnNhbml0aXplU3VnZ2VzdGVkRmlsZW5hbWUoc3VnZ2VzdGVkRmlsZW5hbWUpOworICAg IGlmICghZW5jb2RlZEZpbGVuYW1lLmVuZHNXaXRoSWdub3JpbmdBU0NJSUNhc2UoIi5wZGYiKSkK ICAgICAgICAgcmV0dXJuOwogCi0gICAgc2F2ZURhdGFUb0ZpbGVJbkRvd25sb2Fkc0ZvbGRlcihX VEZNb3ZlKHN1Z2dlc3RlZEZpbGVuYW1lKSwgImFwcGxpY2F0aW9uL3BkZiJfcywgV1RGTW92ZShv cmlnaW5hdGluZ1VSTCksCisgICAgc2F2ZURhdGFUb0ZpbGVJbkRvd25sb2Fkc0ZvbGRlcihXVEZN b3ZlKGVuY29kZWRGaWxlbmFtZSksICJhcHBsaWNhdGlvbi9wZGYiX3MsIFdURk1vdmUob3JpZ2lu YXRpbmdVUkwpLAogICAgICAgICBBUEk6OkRhdGE6OmNyZWF0ZShkYXRhUmVmZXJlbmNlLmRhdGEo KSwgZGF0YVJlZmVyZW5jZS5zaXplKCkpLmdldCgpKTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9XZWJQYWdlUHJveHkuaAppbmRleCA3MWQwYTFjZWI3ZTUzYjdjYzYwZjliNjJmMjdiMzFmOWJh YWRjMzdhLi5iYzZiOWYyODNiYmU1OWJiYjk5OGUxYjBiNGE5OGFkZTllZTAyNDk1IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAorKysgYi9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaApAQCAtMTE5Myw3ICsxMTkzLDYgQEAgcHVi bGljOgogICAgIHZvaWQgc2F2ZURhdGFUb0ZpbGVJbkRvd25sb2Fkc0ZvbGRlcihTdHJpbmcmJiBz dWdnZXN0ZWRGaWxlbmFtZSwgU3RyaW5nJiYgbWltZVR5cGUsIFVSTCYmIG9yaWdpbmF0aW5nVVJM LCBBUEk6OkRhdGEmKTsKICAgICB2b2lkIHNhdmVQREZUb0ZpbGVJbkRvd25sb2Fkc0ZvbGRlcihT dHJpbmcmJiBzdWdnZXN0ZWRGaWxlbmFtZSwgVVJMJiYgb3JpZ2luYXRpbmdVUkwsIGNvbnN0IElQ Qzo6RGF0YVJlZmVyZW5jZSYpOwogI2lmIFBMQVRGT1JNKENPQ09BKQotICAgIHZvaWQgc2F2ZVBE RlRvVGVtcG9yYXJ5Rm9sZGVyQW5kT3BlbldpdGhOYXRpdmVBcHBsaWNhdGlvblJhdyhjb25zdCBT dHJpbmcmIHN1Z2dlc3RlZEZpbGVuYW1lLCBjb25zdCBTdHJpbmcmIG9yaWdpbmF0aW5nVVJMU3Ry aW5nLCBjb25zdCB1aW50OF90KiBkYXRhLCB1bnNpZ25lZCBsb25nIHNpemUsIGNvbnN0IFN0cmlu ZyYgcGRmVVVJRCk7CiAgICAgdm9pZCBzYXZlUERGVG9UZW1wb3JhcnlGb2xkZXJBbmRPcGVuV2l0 aE5hdGl2ZUFwcGxpY2F0aW9uKGNvbnN0IFN0cmluZyYgc3VnZ2VzdGVkRmlsZW5hbWUsIGNvbnN0 IFN0cmluZyYgb3JpZ2luYXRpbmdVUkxTdHJpbmcsIGNvbnN0IElQQzo6RGF0YVJlZmVyZW5jZSYs IGNvbnN0IFN0cmluZyYgcGRmVVVJRCk7CiAgICAgdm9pZCBvcGVuUERGRnJvbVRlbXBvcmFyeUZv bGRlcldpdGhOYXRpdmVBcHBsaWNhdGlvbihjb25zdCBTdHJpbmcmIHBkZlVVSUQpOwogI2VuZGlm CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV2ViUGFnZVByb3h5SU9T Lm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dlYlBhZ2VQcm94eUlPUy5tbQppbmRl eCA0MDdkOTZhNjY3MmRmYmY4YTMyYmYxODNmMTdiYzVlMzU1NjE5MjBjLi5lYWZiZGY4MGY4NjZk ZDA4MmY1M2U0MmMyY2RlMjMyYzM0OTI5NGRiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9pb3MvV2ViUGFnZVByb3h5SU9TLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL2lvcy9XZWJQYWdlUHJveHlJT1MubW0KQEAgLTEwMzksMTEgKzEwMzksNiBAQCB2b2lkIFdl YlBhZ2VQcm94eTo6c2F2ZVBERlRvVGVtcG9yYXJ5Rm9sZGVyQW5kT3BlbldpdGhOYXRpdmVBcHBs aWNhdGlvbihjb25zdCBTdAogICAgIG5vdEltcGxlbWVudGVkKCk7CiB9CiAKLXZvaWQgV2ViUGFn ZVByb3h5OjpzYXZlUERGVG9UZW1wb3JhcnlGb2xkZXJBbmRPcGVuV2l0aE5hdGl2ZUFwcGxpY2F0 aW9uUmF3KGNvbnN0IFN0cmluZyYsIGNvbnN0IFN0cmluZyYsIGNvbnN0IHVpbnQ4X3QqLCB1bnNp Z25lZCBsb25nLCBjb25zdCBTdHJpbmcmKQotewotICAgIG5vdEltcGxlbWVudGVkKCk7Ci19Ci0K IHZvaWQgV2ViUGFnZVByb3h5OjpvcGVuUERGRnJvbVRlbXBvcmFyeUZvbGRlcldpdGhOYXRpdmVB cHBsaWNhdGlvbihjb25zdCBTdHJpbmcmKQogewogICAgIG5vdEltcGxlbWVudGVkKCk7CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9tYWMvV2ViUGFnZVByb3h5TWFjLm1tIGIv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvbWFjL1dlYlBhZ2VQcm94eU1hYy5tbQppbmRleCA3ZDQx MWU4MDg4YmRjMzZjZWM1NWVmM2FjZmU2MDA4MjMyMTczZGZmLi40NzE3MzVhMjJhNmM3ZjgwMjU3 MjNmNTIyNWQwZTY1YjY1NjQ2ZjEzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9tYWMvV2ViUGFnZVByb3h5TWFjLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL21h Yy9XZWJQYWdlUHJveHlNYWMubW0KQEAgLTQ5MywzMiArNDkzLDM5IEBAIHN0YXRpYyBOU1N0cmlu ZyAqcGF0aFRvUERGT25EaXNrKGNvbnN0IFN0cmluZyYgc3VnZ2VzdGVkRmlsZW5hbWUpCiAgICAg cmV0dXJuIHBhdGg7CiB9CiAKLXZvaWQgV2ViUGFnZVByb3h5OjpzYXZlUERGVG9UZW1wb3JhcnlG b2xkZXJBbmRPcGVuV2l0aE5hdGl2ZUFwcGxpY2F0aW9uUmF3KGNvbnN0IFN0cmluZyYgc3VnZ2Vz dGVkRmlsZW5hbWUsIGNvbnN0IFN0cmluZyYgb3JpZ2luYXRpbmdVUkxTdHJpbmcsIGNvbnN0IHVp bnQ4X3QqIGRhdGEsIHVuc2lnbmVkIGxvbmcgc2l6ZSwgY29uc3QgU3RyaW5nJiBwZGZVVUlEKQor dm9pZCBXZWJQYWdlUHJveHk6OnNhdmVQREZUb1RlbXBvcmFyeUZvbGRlckFuZE9wZW5XaXRoTmF0 aXZlQXBwbGljYXRpb24oY29uc3QgU3RyaW5nJiBzdWdnZXN0ZWRGaWxlbmFtZSwgY29uc3QgU3Ry aW5nJiBvcmlnaW5hdGluZ1VSTFN0cmluZywgY29uc3QgSVBDOjpEYXRhUmVmZXJlbmNlJiBkYXRh LCBjb25zdCBTdHJpbmcmIHBkZlVVSUQpCiB7CiAgICAgLy8gRklYTUU6IFdyaXRlIG9yaWdpbmF0 aW5nVVJMU3RyaW5nIHRvIHRoZSBmaWxlJ3Mgb3JpZ2luYXRpbmcgVVJMIG1ldGFkYXRhIChwZXJo YXBzIEZpbGVTeXN0ZW06OnNldE1ldGFkYXRhVVJMKCk/KS4KICAgICBVTlVTRURfUEFSQU0ob3Jp Z2luYXRpbmdVUkxTdHJpbmcpOwogCi0gICAgaWYgKCFzdWdnZXN0ZWRGaWxlbmFtZS5lbmRzV2l0 aElnbm9yaW5nQVNDSUlDYXNlKCIucGRmIikpIHsKKyAgICBhdXRvIGVuY29kZWRGaWxlTmFtZSA9 IFJlc291cmNlUmVzcG9uc2VCYXNlOjpzYW5pdGl6ZVN1Z2dlc3RlZEZpbGVuYW1lKHN1Z2dlc3Rl ZEZpbGVuYW1lKTsKKworICAgIGlmIChkYXRhLmlzRW1wdHkoKSkgeworICAgICAgICBXVEZMb2dB bHdheXMoIkNhbm5vdCBzYXZlIGVtcHR5IFBERiBmaWxlIHRvIHRoZSB0ZW1wb3JhcnkgZGlyZWN0 b3J5LiIpOworICAgICAgICByZXR1cm47CisgICAgfQorCisgICAgaWYgKCFlbmNvZGVkRmlsZU5h bWUuZW5kc1dpdGhJZ25vcmluZ0FTQ0lJQ2FzZSgiLnBkZiIpKSB7CiAgICAgICAgIFdURkxvZ0Fs d2F5cygiQ2Fubm90IHNhdmUgZmlsZSB3aXRob3V0IC5wZGYgZXh0ZW5zaW9uIHRvIHRoZSB0ZW1w b3JhcnkgZGlyZWN0b3J5LiIpOwogICAgICAgICByZXR1cm47CiAgICAgfQogCi0gICAgaWYgKCFz aXplKSB7CisgICAgaWYgKCFkYXRhLnNpemUoKSkgewogICAgICAgICBXVEZMb2dBbHdheXMoIkNh bm5vdCBzYXZlIGVtcHR5IFBERiBmaWxlIHRvIHRoZSB0ZW1wb3JhcnkgZGlyZWN0b3J5LiIpOwog ICAgICAgICByZXR1cm47CiAgICAgfQogCi0gICAgTlNTdHJpbmcgKm5zUGF0aCA9IHBhdGhUb1BE Rk9uRGlzayhzdWdnZXN0ZWRGaWxlbmFtZSk7CisgICAgTlNTdHJpbmcgKm5zUGF0aCA9IHBhdGhU b1BERk9uRGlzayhlbmNvZGVkRmlsZU5hbWUpOwogCiAgICAgaWYgKCFuc1BhdGgpCiAgICAgICAg IHJldHVybjsKIAogICAgIFJldGFpblB0cjxOU051bWJlcj4gcGVybWlzc2lvbnMgPSBhZG9wdE5T KFtbTlNOdW1iZXIgYWxsb2NdIGluaXRXaXRoSW50OlNfSVJVU1JdKTsKICAgICBSZXRhaW5QdHI8 TlNEaWN0aW9uYXJ5PiBmaWxlQXR0cmlidXRlcyA9IGFkb3B0TlMoW1tOU0RpY3Rpb25hcnkgYWxs b2NdIGluaXRXaXRoT2JqZWN0c0FuZEtleXM6cGVybWlzc2lvbnMuZ2V0KCksIE5TRmlsZVBvc2l4 UGVybWlzc2lvbnMsIG5pbF0pOwotICAgIFJldGFpblB0cjxOU0RhdGE+IG5zRGF0YSA9IGFkb3B0 TlMoW1tOU0RhdGEgYWxsb2NdIGluaXRXaXRoQnl0ZXNOb0NvcHk6KHZvaWQqKWRhdGEgbGVuZ3Ro OnNpemUgZnJlZVdoZW5Eb25lOk5PXSk7CisgICAgUmV0YWluUHRyPE5TRGF0YT4gbnNEYXRhID0g YWRvcHROUyhbW05TRGF0YSBhbGxvY10gaW5pdFdpdGhCeXRlc05vQ29weToodm9pZCopZGF0YS5k YXRhKCkgbGVuZ3RoOmRhdGEuc2l6ZSgpIGZyZWVXaGVuRG9uZTpOT10pOwogCiAgICAgaWYgKCFb W05TRmlsZU1hbmFnZXIgZGVmYXVsdE1hbmFnZXJdIGNyZWF0ZUZpbGVBdFBhdGg6bnNQYXRoIGNv bnRlbnRzOm5zRGF0YS5nZXQoKSBhdHRyaWJ1dGVzOmZpbGVBdHRyaWJ1dGVzLmdldCgpXSkgewot ICAgICAgICBXVEZMb2dBbHdheXMoIkNhbm5vdCBjcmVhdGUgUERGIGZpbGUgaW4gdGhlIHRlbXBv cmFyeSBkaXJlY3RvcnkgKCVzKS4iLCBzdWdnZXN0ZWRGaWxlbmFtZS51dGY4KCkuZGF0YSgpKTsK KyAgICAgICAgV1RGTG9nQWx3YXlzKCJDYW5ub3QgY3JlYXRlIFBERiBmaWxlIGluIHRoZSB0ZW1w b3JhcnkgZGlyZWN0b3J5ICglcykuIiwgZW5jb2RlZEZpbGVOYW1lLnV0ZjgoKS5kYXRhKCkpOwog ICAgICAgICByZXR1cm47CiAgICAgfQogCkBAIC01MjcsMTYgKzUzNCw2IEBAIHZvaWQgV2ViUGFn ZVByb3h5OjpzYXZlUERGVG9UZW1wb3JhcnlGb2xkZXJBbmRPcGVuV2l0aE5hdGl2ZUFwcGxpY2F0 aW9uUmF3KGNvbnN0CiAgICAgW1tOU1dvcmtzcGFjZSBzaGFyZWRXb3Jrc3BhY2VdIG9wZW5GaWxl Om5zUGF0aF07CiB9CiAKLXZvaWQgV2ViUGFnZVByb3h5OjpzYXZlUERGVG9UZW1wb3JhcnlGb2xk ZXJBbmRPcGVuV2l0aE5hdGl2ZUFwcGxpY2F0aW9uKGNvbnN0IFN0cmluZyYgc3VnZ2VzdGVkRmls ZW5hbWUsIGNvbnN0IFN0cmluZyYgb3JpZ2luYXRpbmdVUkxTdHJpbmcsIGNvbnN0IElQQzo6RGF0 YVJlZmVyZW5jZSYgZGF0YSwgY29uc3QgU3RyaW5nJiBwZGZVVUlEKQotewotICAgIGlmIChkYXRh LmlzRW1wdHkoKSkgewotICAgICAgICBXVEZMb2dBbHdheXMoIkNhbm5vdCBzYXZlIGVtcHR5IFBE RiBmaWxlIHRvIHRoZSB0ZW1wb3JhcnkgZGlyZWN0b3J5LiIpOwotICAgICAgICByZXR1cm47Ci0g ICAgfQotCi0gICAgc2F2ZVBERlRvVGVtcG9yYXJ5Rm9sZGVyQW5kT3BlbldpdGhOYXRpdmVBcHBs aWNhdGlvblJhdyhzdWdnZXN0ZWRGaWxlbmFtZSwgb3JpZ2luYXRpbmdVUkxTdHJpbmcsIGRhdGEu ZGF0YSgpLCBkYXRhLnNpemUoKSwgcGRmVVVJRCk7Ci19Ci0KIHZvaWQgV2ViUGFnZVByb3h5Ojpv cGVuUERGRnJvbVRlbXBvcmFyeUZvbGRlcldpdGhOYXRpdmVBcHBsaWNhdGlvbihjb25zdCBTdHJp bmcmIHBkZlVVSUQpCiB7CiAgICAgU3RyaW5nIHBkZkZpbGVuYW1lID0gbV90ZW1wb3JhcnlQREZG aWxlcy5nZXQocGRmVVVJRCk7Cg== 379256 2019-09-20 12:15:45 -0700 2019-09-20 14:40:42 -0700 Patch bug-202034-20190920121544.patch text/plain 8786 thorton U3VidmVyc2lvbiBSZXZpc2lvbjogMjUwMDk3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDFjZWIxZDM1ZGNkMzNlZjEw OWY4Y2YyZDgyM2YxYWQ5OTYxMDg1MzEuLjU2ZDIyZDllMmVhNGQ5ZGMxYmQ4OWE1MDc1MmQzMmM4 YzlkYTlkMzUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjQgQEAKKzIwMTktMDktMTkgIFRpbSBIb3J0 b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CisKKyAgICAgICAgU2FuaXRpemUgc3VnZ2Vz dGVkIGZpbGVuYW1lcyB1c2VkIGZvciBzYXZpbmcgUERGcworICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjAyMDM0CisgICAgICAgIDxyZGFyOi8vcHJvYmxl bS81MzE4MzA3NT4KKworICAgICAgICBSZXZpZXdlZCBieSBDaHJpcyBEdW1lei4KKworICAgICAg ICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdl UHJveHk6OmRpZEZpbmlzaExvYWRpbmdEYXRhRm9yQ3VzdG9tQ29udGVudFByb3ZpZGVyKToKKyAg ICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpzYXZlRGF0YVRvRmlsZUluRG93bmxvYWRzRm9s ZGVyKToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpzYXZlUERGVG9GaWxlSW5Eb3du bG9hZHNGb2xkZXIpOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaDoKKyAgICAg ICAgKiBVSVByb2Nlc3MvaW9zL1dlYlBhZ2VQcm94eUlPUy5tbToKKyAgICAgICAgKFdlYktpdDo6 V2ViUGFnZVByb3h5OjpzYXZlUERGVG9UZW1wb3JhcnlGb2xkZXJBbmRPcGVuV2l0aE5hdGl2ZUFw cGxpY2F0aW9uUmF3KTogRGVsZXRlZC4KKyAgICAgICAgKiBVSVByb2Nlc3MvbWFjL1dlYlBhZ2VQ cm94eU1hYy5tbToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpzYXZlUERGVG9UZW1w b3JhcnlGb2xkZXJBbmRPcGVuV2l0aE5hdGl2ZUFwcGxpY2F0aW9uKToKKyAgICAgICAgKFdlYktp dDo6V2ViUGFnZVByb3h5OjpzYXZlUERGVG9UZW1wb3JhcnlGb2xkZXJBbmRPcGVuV2l0aE5hdGl2 ZUFwcGxpY2F0aW9uUmF3KTogRGVsZXRlZC4KKyAgICAgICAgU2FuaXRpemUgc3VnZ2VzdGVkIGZp bGVuYW1lcyB0byBlbnN1cmUgdGhhdCB0aGV5IGNvbXByaXNlIG9ubHkgb25lIHBhdGggY29tcG9u ZW50CisgICAgICAgIHdoZW4gY29uY2F0ZW5hdGVkIHdpdGggdGhlaXIgZGVzdGluYXRpb24gZGly ZWN0b3J5LgorCiAyMDE5LTA5LTE5ICBCcmVudCBGdWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29t PgogCiAgICAgICAgIENyZWF0ZSBJbmplY3RlZEJ1bmRsZSBTUEkgdG8gYmV0dGVyIHN1cHBvcnQg TlNTZWN1cmVDb2RpbmcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBh Z2VQcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCmlu ZGV4IDlkY2E4Zjc3ZjljYTdkNjVhNjU0OGYzMmRjM2FhYWExYTE4OGFjZjQuLmE1ZGVjYzViZTQ0 MDIwNzRkMjZiY2VkZWEwMzdiMzZlZGUxZTAwODAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv V2ViUGFnZVByb3h5LmNwcApAQCAtNzY4Nyw3ICs3Njg3LDcgQEAgdm9pZCBXZWJQYWdlUHJveHk6 OnVwZGF0ZVdlYnNpdGVQb2xpY2llcyhXZWJzaXRlUG9saWNpZXNEYXRhJiYgd2Vic2l0ZVBvbGlj aWVzKQogCiB2b2lkIFdlYlBhZ2VQcm94eTo6ZGlkRmluaXNoTG9hZGluZ0RhdGFGb3JDdXN0b21D b250ZW50UHJvdmlkZXIoY29uc3QgU3RyaW5nJiBzdWdnZXN0ZWRGaWxlbmFtZSwgY29uc3QgSVBD OjpEYXRhUmVmZXJlbmNlJiBkYXRhUmVmZXJlbmNlKQogewotICAgIHBhZ2VDbGllbnQoKS5kaWRG aW5pc2hMb2FkaW5nRGF0YUZvckN1c3RvbUNvbnRlbnRQcm92aWRlcihzdWdnZXN0ZWRGaWxlbmFt ZSwgZGF0YVJlZmVyZW5jZSk7CisgICAgcGFnZUNsaWVudCgpLmRpZEZpbmlzaExvYWRpbmdEYXRh Rm9yQ3VzdG9tQ29udGVudFByb3ZpZGVyKFJlc291cmNlUmVzcG9uc2VCYXNlOjpzYW5pdGl6ZVN1 Z2dlc3RlZEZpbGVuYW1lKHN1Z2dlc3RlZEZpbGVuYW1lKSwgZGF0YVJlZmVyZW5jZSk7CiB9CiAK IHZvaWQgV2ViUGFnZVByb3h5OjpiYWNrRm9yd2FyZFJlbW92ZWRJdGVtKGNvbnN0IEJhY2tGb3J3 YXJkSXRlbUlkZW50aWZpZXImIGl0ZW1JRCkKQEAgLTc4MjIsMTUgKzc4MjIsMTYgQEAgdm9pZCBX ZWJQYWdlUHJveHk6OnVwZGF0ZUJhY2tpbmdTdG9yZURpc2NhcmRhYmxlU3RhdGUoKQogCiB2b2lk IFdlYlBhZ2VQcm94eTo6c2F2ZURhdGFUb0ZpbGVJbkRvd25sb2Fkc0ZvbGRlcihTdHJpbmcmJiBz dWdnZXN0ZWRGaWxlbmFtZSwgU3RyaW5nJiYgbWltZVR5cGUsIFVSTCYmIG9yaWdpbmF0aW5nVVJM U3RyaW5nLCBBUEk6OkRhdGEmIGRhdGEpCiB7Ci0gICAgbV91aUNsaWVudC0+c2F2ZURhdGFUb0Zp bGVJbkRvd25sb2Fkc0ZvbGRlcih0aGlzLCBzdWdnZXN0ZWRGaWxlbmFtZSwgbWltZVR5cGUsIG9y aWdpbmF0aW5nVVJMU3RyaW5nLCBkYXRhKTsKKyAgICBtX3VpQ2xpZW50LT5zYXZlRGF0YVRvRmls ZUluRG93bmxvYWRzRm9sZGVyKHRoaXMsIFJlc291cmNlUmVzcG9uc2VCYXNlOjpzYW5pdGl6ZVN1 Z2dlc3RlZEZpbGVuYW1lKHN1Z2dlc3RlZEZpbGVuYW1lKSwgbWltZVR5cGUsIG9yaWdpbmF0aW5n VVJMU3RyaW5nLCBkYXRhKTsKIH0KIAogdm9pZCBXZWJQYWdlUHJveHk6OnNhdmVQREZUb0ZpbGVJ bkRvd25sb2Fkc0ZvbGRlcihTdHJpbmcmJiBzdWdnZXN0ZWRGaWxlbmFtZSwgVVJMJiYgb3JpZ2lu YXRpbmdVUkwsIGNvbnN0IElQQzo6RGF0YVJlZmVyZW5jZSYgZGF0YVJlZmVyZW5jZSkKIHsKLSAg ICBpZiAoIXN1Z2dlc3RlZEZpbGVuYW1lLmVuZHNXaXRoSWdub3JpbmdBU0NJSUNhc2UoIi5wZGYi KSkKKyAgICBTdHJpbmcgc2FuaXRpemVkRmlsZW5hbWUgPSBSZXNvdXJjZVJlc3BvbnNlQmFzZTo6 c2FuaXRpemVTdWdnZXN0ZWRGaWxlbmFtZShzdWdnZXN0ZWRGaWxlbmFtZSk7CisgICAgaWYgKCFz YW5pdGl6ZWRGaWxlbmFtZS5lbmRzV2l0aElnbm9yaW5nQVNDSUlDYXNlKCIucGRmIikpCiAgICAg ICAgIHJldHVybjsKIAotICAgIHNhdmVEYXRhVG9GaWxlSW5Eb3dubG9hZHNGb2xkZXIoV1RGTW92 ZShzdWdnZXN0ZWRGaWxlbmFtZSksICJhcHBsaWNhdGlvbi9wZGYiX3MsIFdURk1vdmUob3JpZ2lu YXRpbmdVUkwpLAorICAgIHNhdmVEYXRhVG9GaWxlSW5Eb3dubG9hZHNGb2xkZXIoV1RGTW92ZShz YW5pdGl6ZWRGaWxlbmFtZSksICJhcHBsaWNhdGlvbi9wZGYiX3MsIFdURk1vdmUob3JpZ2luYXRp bmdVUkwpLAogICAgICAgICBBUEk6OkRhdGE6OmNyZWF0ZShkYXRhUmVmZXJlbmNlLmRhdGEoKSwg ZGF0YVJlZmVyZW5jZS5zaXplKCkpLmdldCgpKTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9X ZWJQYWdlUHJveHkuaAppbmRleCA3MWQwYTFjZWI3ZTUzYjdjYzYwZjliNjJmMjdiMzFmOWJhYWRj MzdhLi5iYzZiOWYyODNiYmU1OWJiYjk5OGUxYjBiNGE5OGFkZTllZTAyNDk1IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAorKysgYi9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaApAQCAtMTE5Myw3ICsxMTkzLDYgQEAgcHVibGlj OgogICAgIHZvaWQgc2F2ZURhdGFUb0ZpbGVJbkRvd25sb2Fkc0ZvbGRlcihTdHJpbmcmJiBzdWdn ZXN0ZWRGaWxlbmFtZSwgU3RyaW5nJiYgbWltZVR5cGUsIFVSTCYmIG9yaWdpbmF0aW5nVVJMLCBB UEk6OkRhdGEmKTsKICAgICB2b2lkIHNhdmVQREZUb0ZpbGVJbkRvd25sb2Fkc0ZvbGRlcihTdHJp bmcmJiBzdWdnZXN0ZWRGaWxlbmFtZSwgVVJMJiYgb3JpZ2luYXRpbmdVUkwsIGNvbnN0IElQQzo6 RGF0YVJlZmVyZW5jZSYpOwogI2lmIFBMQVRGT1JNKENPQ09BKQotICAgIHZvaWQgc2F2ZVBERlRv VGVtcG9yYXJ5Rm9sZGVyQW5kT3BlbldpdGhOYXRpdmVBcHBsaWNhdGlvblJhdyhjb25zdCBTdHJp bmcmIHN1Z2dlc3RlZEZpbGVuYW1lLCBjb25zdCBTdHJpbmcmIG9yaWdpbmF0aW5nVVJMU3RyaW5n LCBjb25zdCB1aW50OF90KiBkYXRhLCB1bnNpZ25lZCBsb25nIHNpemUsIGNvbnN0IFN0cmluZyYg cGRmVVVJRCk7CiAgICAgdm9pZCBzYXZlUERGVG9UZW1wb3JhcnlGb2xkZXJBbmRPcGVuV2l0aE5h dGl2ZUFwcGxpY2F0aW9uKGNvbnN0IFN0cmluZyYgc3VnZ2VzdGVkRmlsZW5hbWUsIGNvbnN0IFN0 cmluZyYgb3JpZ2luYXRpbmdVUkxTdHJpbmcsIGNvbnN0IElQQzo6RGF0YVJlZmVyZW5jZSYsIGNv bnN0IFN0cmluZyYgcGRmVVVJRCk7CiAgICAgdm9pZCBvcGVuUERGRnJvbVRlbXBvcmFyeUZvbGRl cldpdGhOYXRpdmVBcHBsaWNhdGlvbihjb25zdCBTdHJpbmcmIHBkZlVVSUQpOwogI2VuZGlmCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV2ViUGFnZVByb3h5SU9TLm1t IGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dlYlBhZ2VQcm94eUlPUy5tbQppbmRleCA0 MDdkOTZhNjY3MmRmYmY4YTMyYmYxODNmMTdiYzVlMzU1NjE5MjBjLi5lYWZiZGY4MGY4NjZkZDA4 MmY1M2U0MmMyY2RlMjMyYzM0OTI5NGRiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9pb3MvV2ViUGFnZVByb3h5SU9TLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L2lvcy9XZWJQYWdlUHJveHlJT1MubW0KQEAgLTEwMzksMTEgKzEwMzksNiBAQCB2b2lkIFdlYlBh Z2VQcm94eTo6c2F2ZVBERlRvVGVtcG9yYXJ5Rm9sZGVyQW5kT3BlbldpdGhOYXRpdmVBcHBsaWNh dGlvbihjb25zdCBTdAogICAgIG5vdEltcGxlbWVudGVkKCk7CiB9CiAKLXZvaWQgV2ViUGFnZVBy b3h5OjpzYXZlUERGVG9UZW1wb3JhcnlGb2xkZXJBbmRPcGVuV2l0aE5hdGl2ZUFwcGxpY2F0aW9u UmF3KGNvbnN0IFN0cmluZyYsIGNvbnN0IFN0cmluZyYsIGNvbnN0IHVpbnQ4X3QqLCB1bnNpZ25l ZCBsb25nLCBjb25zdCBTdHJpbmcmKQotewotICAgIG5vdEltcGxlbWVudGVkKCk7Ci19Ci0KIHZv aWQgV2ViUGFnZVByb3h5OjpvcGVuUERGRnJvbVRlbXBvcmFyeUZvbGRlcldpdGhOYXRpdmVBcHBs aWNhdGlvbihjb25zdCBTdHJpbmcmKQogewogICAgIG5vdEltcGxlbWVudGVkKCk7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9tYWMvV2ViUGFnZVByb3h5TWFjLm1tIGIvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvbWFjL1dlYlBhZ2VQcm94eU1hYy5tbQppbmRleCA3ZDQxMWU4 MDg4YmRjMzZjZWM1NWVmM2FjZmU2MDA4MjMyMTczZGZmLi4xMTY5ZTI1MmU5NWIxYjFhYWU5ZmY1 MDViNGFlZDhiNTYwMTBkMzk5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9t YWMvV2ViUGFnZVByb3h5TWFjLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL21hYy9X ZWJQYWdlUHJveHlNYWMubW0KQEAgLTQ5MywzMiArNDkzLDMzIEBAIHN0YXRpYyBOU1N0cmluZyAq cGF0aFRvUERGT25EaXNrKGNvbnN0IFN0cmluZyYgc3VnZ2VzdGVkRmlsZW5hbWUpCiAgICAgcmV0 dXJuIHBhdGg7CiB9CiAKLXZvaWQgV2ViUGFnZVByb3h5OjpzYXZlUERGVG9UZW1wb3JhcnlGb2xk ZXJBbmRPcGVuV2l0aE5hdGl2ZUFwcGxpY2F0aW9uUmF3KGNvbnN0IFN0cmluZyYgc3VnZ2VzdGVk RmlsZW5hbWUsIGNvbnN0IFN0cmluZyYgb3JpZ2luYXRpbmdVUkxTdHJpbmcsIGNvbnN0IHVpbnQ4 X3QqIGRhdGEsIHVuc2lnbmVkIGxvbmcgc2l6ZSwgY29uc3QgU3RyaW5nJiBwZGZVVUlEKQordm9p ZCBXZWJQYWdlUHJveHk6OnNhdmVQREZUb1RlbXBvcmFyeUZvbGRlckFuZE9wZW5XaXRoTmF0aXZl QXBwbGljYXRpb24oY29uc3QgU3RyaW5nJiBzdWdnZXN0ZWRGaWxlbmFtZSwgY29uc3QgU3RyaW5n JiBvcmlnaW5hdGluZ1VSTFN0cmluZywgY29uc3QgSVBDOjpEYXRhUmVmZXJlbmNlJiBkYXRhLCBj b25zdCBTdHJpbmcmIHBkZlVVSUQpCiB7CiAgICAgLy8gRklYTUU6IFdyaXRlIG9yaWdpbmF0aW5n VVJMU3RyaW5nIHRvIHRoZSBmaWxlJ3Mgb3JpZ2luYXRpbmcgVVJMIG1ldGFkYXRhIChwZXJoYXBz IEZpbGVTeXN0ZW06OnNldE1ldGFkYXRhVVJMKCk/KS4KICAgICBVTlVTRURfUEFSQU0ob3JpZ2lu YXRpbmdVUkxTdHJpbmcpOwogCi0gICAgaWYgKCFzdWdnZXN0ZWRGaWxlbmFtZS5lbmRzV2l0aEln bm9yaW5nQVNDSUlDYXNlKCIucGRmIikpIHsKLSAgICAgICAgV1RGTG9nQWx3YXlzKCJDYW5ub3Qg c2F2ZSBmaWxlIHdpdGhvdXQgLnBkZiBleHRlbnNpb24gdG8gdGhlIHRlbXBvcmFyeSBkaXJlY3Rv cnkuIik7CisgICAgaWYgKGRhdGEuaXNFbXB0eSgpKSB7CisgICAgICAgIFdURkxvZ0Fsd2F5cygi Q2Fubm90IHNhdmUgZW1wdHkgUERGIGZpbGUgdG8gdGhlIHRlbXBvcmFyeSBkaXJlY3RvcnkuIik7 CiAgICAgICAgIHJldHVybjsKICAgICB9CiAKLSAgICBpZiAoIXNpemUpIHsKLSAgICAgICAgV1RG TG9nQWx3YXlzKCJDYW5ub3Qgc2F2ZSBlbXB0eSBQREYgZmlsZSB0byB0aGUgdGVtcG9yYXJ5IGRp cmVjdG9yeS4iKTsKKyAgICBhdXRvIHNhbml0aXplZEZpbGVuYW1lID0gUmVzb3VyY2VSZXNwb25z ZUJhc2U6OnNhbml0aXplU3VnZ2VzdGVkRmlsZW5hbWUoc3VnZ2VzdGVkRmlsZW5hbWUpOworICAg IGlmICghc2FuaXRpemVkRmlsZW5hbWUuZW5kc1dpdGhJZ25vcmluZ0FTQ0lJQ2FzZSgiLnBkZiIp KSB7CisgICAgICAgIFdURkxvZ0Fsd2F5cygiQ2Fubm90IHNhdmUgZmlsZSB3aXRob3V0IC5wZGYg ZXh0ZW5zaW9uIHRvIHRoZSB0ZW1wb3JhcnkgZGlyZWN0b3J5LiIpOwogICAgICAgICByZXR1cm47 CiAgICAgfQogCi0gICAgTlNTdHJpbmcgKm5zUGF0aCA9IHBhdGhUb1BERk9uRGlzayhzdWdnZXN0 ZWRGaWxlbmFtZSk7CisgICAgTlNTdHJpbmcgKm5zUGF0aCA9IHBhdGhUb1BERk9uRGlzayhzYW5p dGl6ZWRGaWxlbmFtZSk7CiAKICAgICBpZiAoIW5zUGF0aCkKICAgICAgICAgcmV0dXJuOwogCiAg ICAgUmV0YWluUHRyPE5TTnVtYmVyPiBwZXJtaXNzaW9ucyA9IGFkb3B0TlMoW1tOU051bWJlciBh bGxvY10gaW5pdFdpdGhJbnQ6U19JUlVTUl0pOwogICAgIFJldGFpblB0cjxOU0RpY3Rpb25hcnk+ IGZpbGVBdHRyaWJ1dGVzID0gYWRvcHROUyhbW05TRGljdGlvbmFyeSBhbGxvY10gaW5pdFdpdGhP YmplY3RzQW5kS2V5czpwZXJtaXNzaW9ucy5nZXQoKSwgTlNGaWxlUG9zaXhQZXJtaXNzaW9ucywg bmlsXSk7Ci0gICAgUmV0YWluUHRyPE5TRGF0YT4gbnNEYXRhID0gYWRvcHROUyhbW05TRGF0YSBh bGxvY10gaW5pdFdpdGhCeXRlc05vQ29weToodm9pZCopZGF0YSBsZW5ndGg6c2l6ZSBmcmVlV2hl bkRvbmU6Tk9dKTsKKyAgICBSZXRhaW5QdHI8TlNEYXRhPiBuc0RhdGEgPSBhZG9wdE5TKFtbTlNE YXRhIGFsbG9jXSBpbml0V2l0aEJ5dGVzTm9Db3B5Oih2b2lkKilkYXRhLmRhdGEoKSBsZW5ndGg6 ZGF0YS5zaXplKCkgZnJlZVdoZW5Eb25lOk5PXSk7CiAKICAgICBpZiAoIVtbTlNGaWxlTWFuYWdl ciBkZWZhdWx0TWFuYWdlcl0gY3JlYXRlRmlsZUF0UGF0aDpuc1BhdGggY29udGVudHM6bnNEYXRh LmdldCgpIGF0dHJpYnV0ZXM6ZmlsZUF0dHJpYnV0ZXMuZ2V0KCldKSB7Ci0gICAgICAgIFdURkxv Z0Fsd2F5cygiQ2Fubm90IGNyZWF0ZSBQREYgZmlsZSBpbiB0aGUgdGVtcG9yYXJ5IGRpcmVjdG9y eSAoJXMpLiIsIHN1Z2dlc3RlZEZpbGVuYW1lLnV0ZjgoKS5kYXRhKCkpOworICAgICAgICBXVEZM b2dBbHdheXMoIkNhbm5vdCBjcmVhdGUgUERGIGZpbGUgaW4gdGhlIHRlbXBvcmFyeSBkaXJlY3Rv cnkgKCVzKS4iLCBzYW5pdGl6ZWRGaWxlbmFtZS51dGY4KCkuZGF0YSgpKTsKICAgICAgICAgcmV0 dXJuOwogICAgIH0KIApAQCAtNTI3LDE2ICs1MjgsNiBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6c2F2 ZVBERlRvVGVtcG9yYXJ5Rm9sZGVyQW5kT3BlbldpdGhOYXRpdmVBcHBsaWNhdGlvblJhdyhjb25z dAogICAgIFtbTlNXb3Jrc3BhY2Ugc2hhcmVkV29ya3NwYWNlXSBvcGVuRmlsZTpuc1BhdGhdOwog fQogCi12b2lkIFdlYlBhZ2VQcm94eTo6c2F2ZVBERlRvVGVtcG9yYXJ5Rm9sZGVyQW5kT3Blbldp dGhOYXRpdmVBcHBsaWNhdGlvbihjb25zdCBTdHJpbmcmIHN1Z2dlc3RlZEZpbGVuYW1lLCBjb25z dCBTdHJpbmcmIG9yaWdpbmF0aW5nVVJMU3RyaW5nLCBjb25zdCBJUEM6OkRhdGFSZWZlcmVuY2Um IGRhdGEsIGNvbnN0IFN0cmluZyYgcGRmVVVJRCkKLXsKLSAgICBpZiAoZGF0YS5pc0VtcHR5KCkp IHsKLSAgICAgICAgV1RGTG9nQWx3YXlzKCJDYW5ub3Qgc2F2ZSBlbXB0eSBQREYgZmlsZSB0byB0 aGUgdGVtcG9yYXJ5IGRpcmVjdG9yeS4iKTsKLSAgICAgICAgcmV0dXJuOwotICAgIH0KLQotICAg IHNhdmVQREZUb1RlbXBvcmFyeUZvbGRlckFuZE9wZW5XaXRoTmF0aXZlQXBwbGljYXRpb25SYXco c3VnZ2VzdGVkRmlsZW5hbWUsIG9yaWdpbmF0aW5nVVJMU3RyaW5nLCBkYXRhLmRhdGEoKSwgZGF0 YS5zaXplKCksIHBkZlVVSUQpOwotfQotCiB2b2lkIFdlYlBhZ2VQcm94eTo6b3BlblBERkZyb21U ZW1wb3JhcnlGb2xkZXJXaXRoTmF0aXZlQXBwbGljYXRpb24oY29uc3QgU3RyaW5nJiBwZGZVVUlE KQogewogICAgIFN0cmluZyBwZGZGaWxlbmFtZSA9IG1fdGVtcG9yYXJ5UERGRmlsZXMuZ2V0KHBk ZlVVSUQpOwo=