119477 2013-08-04 02:10:13 -0700 [GStreamer] Store preloaded media in webkit's cache 2018-01-09 07:06:39 -0800 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED https://bugzilla.gnome.org/show_bug.cgi?id=755280 https://bugzilla.gnome.org/show_bug.cgi?id=761035 https://bugs.webkit.org/show_bug.cgi?id=156369 P2 Normal --- 1 pnormand eocanha aperez bugs-noreply calvaris cgarcia clopez commit-queue cristian.ciupitu csaavedra eocanha ht990332 magomez mcatanzaro slomo oldest_to_newest 914435 0 pnormand 2013-08-04 02:10:13 -0700 Right now preloaded videos go to ~/.cache but they should be stored in the webkit's cache folder instead. The cache location can be configured using queue2::temp-location property but I'm not sure yet how to access the right queue2 element at runtime. Some investigation is needed :) 917044 1 slomo 2013-08-14 02:07:23 -0700 It currently is impossible to do that properly, best solution would probably be to expose that queue2 property on uridecodebin and playbin. 1127621 2 cgarcia 2015-09-21 06:16:07 -0700 Is that cache permanent? I mean, can it be reused among sessions? Otherwise I don't think it should be stored in the home dir at all, but in /tmp 1127622 3 csaavedra 2015-09-21 06:17:49 -0700 Carlos nailed it. If it cannot be reused between sessions then it doesn't belong in .cache. 1127624 4 slomo 2015-09-21 06:38:58 -0700 It can be used between sessions if webkit gives an appropriate name to the files IIRC. But yes, it should probably go into g_get_tmp_dir(). Main problem with that is that some people put /tmp on a tmpfs... so if you want to watch a long enough movie, your memory runs full. 1127625 5 mcatanzaro 2015-09-21 06:46:26 -0700 (In reply to comment #4) > It can be used between sessions if webkit gives an appropriate name to the > files IIRC. But yes, it should probably go into g_get_tmp_dir(). Main > problem with that is that some people put /tmp on a tmpfs... so if you want > to watch a long enough movie, your memory runs full. /tmp on tmpfs has been default in Fedora for several years now... I was amazed quite recently to learn that other distros are still not doing this. Anyway, the videos would have to go in /var/tmp since they are big. But /var/tmp is not cleaned automatically, so there needs to be some measure to clean up leaked videos in the event of a web process crash. 1127646 6 pnormand 2015-09-21 08:58:22 -0700 The UIProcess is notified when the WebProcess crashes, so perhaps we could do the clean-up at that moment. 1127965 7 slomo 2015-09-22 02:13:58 -0700 Or you could make the videos actually cacheable so they can be reused in future sessions until cleared from the cache ;) Cleaning up from the webprocess crashes would mean that you need to have a way to identify which files belong to the pid of the crashed process 1158108 8 mcatanzaro 2016-01-24 06:59:41 -0800 Note that we've gotten multiple reports of ~/.cache rising to excessive size; apparently there is no way to clean up cached video files if there is a web process crash. 1260725 9 mcatanzaro 2016-12-16 13:23:47 -0800 CCing some media folks... how do we want to go about solving this? Anything cached should go under WebKitWebsiteDataManager's base-cache-dir if it's persistent, or /var/tmp otherwise. Note that we have to be robust to UI process crashes as well. That happens. We are already careful to never leak in the normal disk cache. 1262364 10 mcatanzaro 2016-12-22 12:52:54 -0800 Probably bug #156369 needs to be fixed at the same time as this. 1262365 11 mcatanzaro 2016-12-22 12:53:29 -0800 (Changing component just so that we can find this bug again.) 1262560 12 clopez 2016-12-23 09:42:47 -0800 (In reply to comment #5) > (In reply to comment #4) > > It can be used between sessions if webkit gives an appropriate name to the > > files IIRC. But yes, it should probably go into g_get_tmp_dir(). Main > > problem with that is that some people put /tmp on a tmpfs... so if you want > > to watch a long enough movie, your memory runs full. > > /tmp on tmpfs has been default in Fedora for several years now... I was > amazed quite recently to learn that other distros are still not doing this. > Anyway, the videos would have to go in /var/tmp since they are big. But > /var/tmp is not cleaned automatically, so there needs to be some measure to > clean up leaked videos in the event of a web process crash. I suggest removing the file just after opening it for write. That way you can continue to use the file for reading or writing to it, by passing the file descriptor id. The kernel will automatically remove the file once the descriptor id is closed or the process holding the file descriptor id dies (crashes or exits) So you not longer have to take care of cleaning the files. The file will be automatically cleaned when you not longer use it. 1262565 13 clopez 2016-12-23 09:59:15 -0800 (In reply to comment #5) > (In reply to comment #4) > > It can be used between sessions if webkit gives an appropriate name to the > > files IIRC. But yes, it should probably go into g_get_tmp_dir(). Main > > problem with that is that some people put /tmp on a tmpfs... so if you want > > to watch a long enough movie, your memory runs full. > > /tmp on tmpfs has been default in Fedora for several years now... Personally, I don't think /tmp on tmpfs is a good idea. In the worst case (you have configured your system without swap) you end wasting precious memory space for tmp files. Which is nuts. In the best case, you end wasting swap space and risking incurring in more swappiness related freezes than otherwise you would have. /tmp on tmpfs supporters main argument was they were worried about incrementing their SSD wearing level more than needed. This has been exaggerated a lot. I still have to find anyone that has nuked their SSD because of not having /tmp on tmpfs. Related: https://lists.debian.org/debian-devel/2012/05/msg01092.html https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=666096 1262736 14 eocanha 2016-12-26 04:08:13 -0800 (In reply to comment #5) > (In reply to comment #4) > > It can be used between sessions if webkit gives an appropriate name to the > > files IIRC. But yes, it should probably go into g_get_tmp_dir(). Main > > problem with that is that some people put /tmp on a tmpfs... so if you want > > to watch a long enough movie, your memory runs full. > > /tmp on tmpfs has been default in Fedora for several years now... I was > amazed quite recently to learn that other distros are still not doing this. > Anyway, the videos would have to go in /var/tmp since they are big. But > /var/tmp is not cleaned automatically, so there needs to be some measure to > clean up leaked videos in the event of a web process crash. A naive suggestion would be to treat /var/tmp as system storing /tmp on disk treat it. Those systems clean /tmp on boot. My suggestion is to use /var/tmp/${USER}/WebKit-media (or some better name) as "tmp", and not cleaning it at webprocess' death (which can be uncontrolled in the very worst case), but at WebKit start. Each time WebKit starts, it cleans the previous "tmp". More efficient approaches can be implemented on top of that, but I think this one could be fine as a baseline. 1263287 15 aperez 2017-01-02 04:49:36 -0800 (In reply to comment #12) > (In reply to comment #5) > > (In reply to comment #4) > > > It can be used between sessions if webkit gives an appropriate name to the > > > files IIRC. But yes, it should probably go into g_get_tmp_dir(). Main > > > problem with that is that some people put /tmp on a tmpfs... so if you want > > > to watch a long enough movie, your memory runs full. > > > > /tmp on tmpfs has been default in Fedora for several years now... I was > > amazed quite recently to learn that other distros are still not doing this. > > Anyway, the videos would have to go in /var/tmp since they are big. But > > /var/tmp is not cleaned automatically, so there needs to be some measure to > > clean up leaked videos in the event of a web process crash. This is not necessarily true, many (most?) GNU/Linux distributions clean “/var/tmp”: % grep '/var/tmp ' /usr/lib/tmpfiles.d/tmp.conf q /var/tmp 1777 root root 30d % Still, using “/var/tmp” is not a good option because many systems are known *not to* clean it by default ({Free,Open,Net}BSD), and applications are expected to clean up after themselves when creating files under ”/var/tmp”. > I suggest removing the file just after opening it for write. +1 If we can make GStreamer happy without having named files, passing the FD around is the absolute best option. > That way you can continue to use the file for reading or writing to it, by > passing the file descriptor id. > > The kernel will automatically remove the file once the descriptor id is > closed or the process holding the file descriptor id dies (crashes or exits) > > So you not longer have to take care of cleaning the files. The file will be > automatically cleaned when you not longer use it. As an additional small side bonus unlinking the file after opening causes less name space pollution in the directory used for temporary files. Which reduces contention for creating new temporary files — anyway this is most likely irrelevant for web browsing, but still nice :) 1263311 16 mcatanzaro 2017-01-02 08:12:52 -0800 (In reply to comment #15) > This is not necessarily true, many (most?) GNU/Linux distributions clean > “/var/tmp”: You're right, systemd does this, even when the GNOME option to clean temporary files is disabled.... 1271822 17 eocanha 2017-01-31 11:59:38 -0800 Today I tried to solve this by setting the temp-remove[1] property of GstDownloadBuffer to true, only to find that it's already true by default and that the "delete on READY" statement in the documentation doesnt refer to the NULL -> READY -> PAUSED -> PLAYING transition (ie: delete after creation), but to the PLAYING -> PAUSED -> READY -> NULL one (ie: delete on destruction, the current behaviour). I guess I'll have to try a different approach and delete the file by myself. [1] https://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer-plugins/html/gstreamer-plugins-downloadbuffer.html#GstDownloadBuffer--temp-remove 1272165 18 300331 eocanha 2017-02-01 09:41:20 -0800 Created attachment 300331 Patch 1272181 19 mcatanzaro 2017-02-01 10:04:23 -0800 LGTM. Would be good for a GStreamer reviewer to review it. Please add it to https://trac.webkit.org/wiki/WebKitGTK/2.14.x after committing. 1272191 20 300331 cgarcia 2017-02-01 10:29:48 -0800 Comment on attachment 300331 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=300331&action=review > Source/WebCore/ChangeLog:13 > + Files cached on disk by MediaPlayerPrivateGStreamer are deleted only when the player is closed. If the > + WebProcess crashed, they're just left there in the cache directory. This patch changes the location > + of those temporary files to a proper temporary directory (/var/tmp, as those files aren't actually > + reusable, so they don't belong to a cache directory, and /tmp is a bad place because it's RAM-based on > + some distros), unlinks (deletes) them right after creation and also deletes any other stalled temporary > + file on the old legacy cache directory. Wouldn't it be a problem if /var is in a different partition? I'm not sure if the solution to leaked files is placing them in /tmp to be honest. If we can decide the folder, then we can use a specific one in the user cache dir, and clean it up at startup, for example. > Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:1348 > + if (!g_strcmp0(className, "GstDownloadBuffer")) { Early return here instead. > Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:1350 > + g_signal_handlers_disconnect_by_func(bin, gpointer(uriDecodeBinElementAddedCallback), player); Use C++ style casts > Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:1358 > + processName = "GStreamer"; shouldn't it be WebKitWebProcess by default? > Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:1360 > + GUniquePtr<gchar> newDownloadTemplate(g_strdup_printf("/var/tmp/%s-XXXXXX", processName)); Use g_build_filename > Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:1364 > + player->purgeOldDownloadFiles(oldDownloadTemplate.get()); So, if we purge the old files, then we don't really need to use /var/tmp, no? > Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:1372 > + g_signal_handlers_disconnect_by_func(player->m_downloadBuffer.get(), gpointer(downloadBufferFileCreatedCallback), player); Use C++ style cast > Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:1379 > + GUniqueOutPtr<gchar> downloadFile; > + g_object_get(player->m_downloadBuffer.get(), "temp-location", &downloadFile.outPtr(), nullptr); > + if (g_unlink(downloadFile.get()) == -1) > + GST_WARNING("Couldn't unlink media temporary file %s after creation", downloadFile.get()); > + else > + GST_TRACE("Unlinked media temporary file %s after creation", downloadFile.get()); Do we need a signal for this? Doesn't gst changes it when g_object_set(element, "temp-template", synchronously? > Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:1411 > + GDir* directory = g_dir_open(templatePath.get(), 0, nullptr); > + > + if (!directory) > + return; > + > + for (const gchar* fileName = g_dir_read_name(directory); fileName; fileName = g_dir_read_name(directory)) { > + if (g_str_has_prefix(fileName, templateFile.get())) { > + GUniquePtr<gchar> filePath(g_build_filename(templatePath.get(), fileName, nullptr)); > + if (g_unlink(filePath.get()) == -1) > + GST_WARNING("Couldn't unlink legacy media temporary file: %s", filePath.get()); > + else > + GST_TRACE("Unlinked legacy media temporary file: %s", filePath.get()); > + } > + } You can simplify this by using FileSystem::listDirectory(), you can pass a regexp to mathc the files directly > Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:1418 > m_source.clear(); You should disconnect previous signals here and in the destructor I guess, since you are disconnecting only if the signals was emitted. > Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h:249 > + GRefPtr<GstElement> m_downloadBuffer; Do we really want to keepo this buffer object alive for the whole life of the media platyer? Or can we release it at some point? 1272197 21 mcatanzaro 2017-02-01 10:48:34 -0800 (In reply to comment #20) > Wouldn't it be a problem if /var is in a different partition? Why would that be a problem? 1272231 22 300331 eocanha 2017-02-01 12:25:37 -0800 Comment on attachment 300331 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=300331&action=review Thanks for the rest of the comments I'm not replying, they're really useful. >> Source/WebCore/ChangeLog:13 >> + file on the old legacy cache directory. > > Wouldn't it be a problem if /var is in a different partition? I'm not sure if the solution to leaked files is placing them in /tmp to be honest. If we can decide the folder, then we can use a specific one in the user cache dir, and clean it up at startup, for example. I don't think GstDownloadBuffer is ready to reuse the media files between sessions with its current design, so as per https://bugs.webkit.org/show_bug.cgi?id=119477#c2 and https://bugs.webkit.org/show_bug.cgi?id=119477#c3 the files shouldn't be considered "cache" but temporary files. They can be huge (eg: 2GB or similar movie sizes), so they aren't appropriate for /tmp (because of some distros using tmpfs) but they're appropriate for /var/tmp as per https://bugs.webkit.org/show_bug.cgi?id=119477#c5 I considered /var/tmp as the consensus solution for storing this kind of files. If it's not the consensus solution, then discuss it first among yourselves before requesting an implementation. Having /var in a different partition is as problematic as having /home or /tmp in a different partition too. If the former hasn't been a problem until now, using /var shouldn't be a problem too. >> Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:1358 >> + processName = "GStreamer"; > > shouldn't it be WebKitWebProcess by default? That's what g_get_prgname() should return, yes. In the very unlikely case that it returns NULL, I'm just defaulting to the same value that GstUriDecodeBin would: https://github.com/GStreamer/gst-plugins-base/blob/1.8.0/gst/playback/gsturidecodebin.c#L1951 >> Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:1364 >> + player->purgeOldDownloadFiles(oldDownloadTemplate.get()); > > So, if we purge the old files, then we don't really need to use /var/tmp, no? The "$HOME/.cache" vs. "/var/tmp" discussion was about if the files were considered as "cache" or as "temporary". It's the second, so they belong to a temporary directory. This purging is here just for legacy files generated by WebKit prior to this patch. Michael told me that leaking those legacy files wasn't unacceptable. That's why I added the purge method. Ideally, when all the users have migrated to a WebKit version having this patch, the purge shouldn't be needed anymore and might be removed. >> Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:1379 >> + GST_TRACE("Unlinked media temporary file %s after creation", downloadFile.get()); > > Do we need a signal for this? Doesn't gst changes it when g_object_set(element, "temp-template", synchronously? I don't understand this comment. GstDownloadBuffer was already removing the file when the element was destroyed (when destroying the player). That's not enough for us. We want to delete the file immediately after it's created. The only way I found to get notified of the file creation is listening to changes on the temp-location property, because it's updated with the final (random) filename right after the file is created. "temp-template" is just a template. The file isn't created when you set it, but when GstDownloadBuffer decides that it's time to create the file. >> Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h:249 >> + GRefPtr<GstElement> m_downloadBuffer; > > Do we really want to keepo this buffer object alive for the whole life of the media platyer? Or can we release it at some point? Right, I should have set it to null in downloadBufferFileCreatedCallback(), when it's not needed anymore. 1272389 23 cgarcia 2017-02-01 22:32:12 -0800 (In reply to comment #21) > (In reply to comment #20) > > Wouldn't it be a problem if /var is in a different partition? > > Why would that be a problem? I don't know that's why I'm asking :-) 1272390 24 cgarcia 2017-02-01 22:46:55 -0800 (In reply to comment #22) > Comment on attachment 300331 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=300331&action=review > > Thanks for the rest of the comments I'm not replying, they're really useful. > > >> Source/WebCore/ChangeLog:13 > >> + file on the old legacy cache directory. > > > > Wouldn't it be a problem if /var is in a different partition? I'm not sure if the solution to leaked files is placing them in /tmp to be honest. If we can decide the folder, then we can use a specific one in the user cache dir, and clean it up at startup, for example. > > I don't think GstDownloadBuffer is ready to reuse the media files between > sessions with its current design, so as per > https://bugs.webkit.org/show_bug.cgi?id=119477#c2 and > https://bugs.webkit.org/show_bug.cgi?id=119477#c3 the files shouldn't be > considered "cache" but temporary files. They can be huge (eg: 2GB or similar > movie sizes), so they aren't appropriate for /tmp (because of some distros > using tmpfs) but they're appropriate for /var/tmp as per > https://bugs.webkit.org/show_bug.cgi?id=119477#c5 > > I considered /var/tmp as the consensus solution for storing this kind of > files. If it's not the consensus solution, then discuss it first among > yourselves before requesting an implementation. Ok, my fault, I tried to help reviewing this, but I didn't read the discussion first, there's even a comment by me suggesting not to use home cache dir :-P > Having /var in a different partition is as problematic as having /home or > /tmp in a different partition too. If the former hasn't been a problem until > now, using /var shouldn't be a problem too. Yes, sure, but it's more unlikely. Anyway, I only asked. I know, for example, that we write the partial download files in the same download directory instead of /tmp to avoid copies between partitions. > >> Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:1358 > >> + processName = "GStreamer"; > > > > shouldn't it be WebKitWebProcess by default? > > That's what g_get_prgname() should return, yes. In the very unlikely case > that it returns NULL, I'm just defaulting to the same value that > GstUriDecodeBin would: > > https://github.com/GStreamer/gst-plugins-base/blob/1.8.0/gst/playback/ > gsturidecodebin.c#L1951 Because gst can't know in which process is running, but we know it. > >> Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:1364 > >> + player->purgeOldDownloadFiles(oldDownloadTemplate.get()); > > > > So, if we purge the old files, then we don't really need to use /var/tmp, no? > > The "$HOME/.cache" vs. "/var/tmp" discussion was about if the files were > considered as "cache" or as "temporary". It's the second, so they belong to > a temporary directory. Right, ok. > This purging is here just for legacy files generated by WebKit prior to this > patch. Michael told me that leaking those legacy files wasn't unacceptable. > That's why I added the purge method. Ah, I see, I wonder if we should purge also leaked files from previous sessions too. That would solve the problem for systems where /var/tmp is not cleaned, or people who hardly ever reboot. Btw, I have old files in my /var/tmp so I'm not sure systemd is cleaning it up, and I reboot every day. All of them are actually empty dirs though. > Ideally, when all the users have migrated to a WebKit version having this > patch, the purge shouldn't be needed anymore and might be removed. > > >> Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:1379 > >> + GST_TRACE("Unlinked media temporary file %s after creation", downloadFile.get()); > > > > Do we need a signal for this? Doesn't gst changes it when g_object_set(element, "temp-template", synchronously? > > I don't understand this comment. GstDownloadBuffer was already removing the > file when the element was destroyed (when destroying the player). That's not > enough for us. We want to delete the file immediately after it's created. > > The only way I found to get notified of the file creation is listening to > changes on the temp-location property, because it's updated with the final > (random) filename right after the file is created. "temp-template" is just a > template. The file isn't created when you set it, but when GstDownloadBuffer > decides that it's time to create the file. Ok, understood. I was wondering if setting the template would set the location too, but it doesn't. > >> Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h:249 > >> + GRefPtr<GstElement> m_downloadBuffer; > > > > Do we really want to keepo this buffer object alive for the whole life of the media platyer? Or can we release it at some point? > > Right, I should have set it to null in downloadBufferFileCreatedCallback(), > when it's not needed anymore. 1272427 25 300331 calvaris 2017-02-02 03:44:44 -0800 Comment on attachment 300331 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=300331&action=review Lots of comments and suggestions, let's see this patch again. >> Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:1348 >> + const gchar* className = G_OBJECT_CLASS_NAME(G_OBJECT_GET_CLASS(G_OBJECT(element))); >> + if (!g_strcmp0(className, "GstDownloadBuffer")) { > > Early return here instead. Remove the variable because it is only used at the if. Besides, type should have been const char*. > Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:1353 > + GUniqueOutPtr<gchar> oldDownloadTemplate; char > Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:1356 > + const gchar* processName = g_get_prgname(); char >>>> Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:1358 >>>> + processName = "GStreamer"; >>> >>> shouldn't it be WebKitWebProcess by default? >> >> That's what g_get_prgname() should return, yes. In the very unlikely case that it returns NULL, I'm just defaulting to the same value that GstUriDecodeBin would: >> >> https://github.com/GStreamer/gst-plugins-base/blob/1.8.0/gst/playback/gsturidecodebin.c#L1951 > > Because gst can't know in which process is running, but we know it. I am with Carlos here. We don't need the process name actually to name the temp file. I'd go for something like WebKit-Media-xxxxxx. This would be positive for not having to rename in case in the future we can do these downloads thru the network process. >> Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:1360 >> + GUniquePtr<gchar> newDownloadTemplate(g_strdup_printf("/var/tmp/%s-XXXXXX", processName)); > > Use g_build_filename char. Another thing is that I think we should ensure the files are created in a different directory for each user and ensure that directory has the proper permissions so that it cannot be access by anyone else other than the user. I think media people watch online can vary a lot from cats to other things. I'd write a function to return the template and ensure it is placed in the proper directory. > Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:1362 > + GST_TRACE("Reconfiguring file download template from '%s' to '%s'\n", oldDownloadTemplate.get(), newDownloadTemplate.get()); The \n is not advisable. >>>> Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:1364 >>>> + player->purgeOldDownloadFiles(oldDownloadTemplate.get()); >>> >>> So, if we purge the old files, then we don't really need to use /var/tmp, no? >> >> The "$HOME/.cache" vs. "/var/tmp" discussion was about if the files were considered as "cache" or as "temporary". It's the second, so they belong to a temporary directory. >> >> This purging is here just for legacy files generated by WebKit prior to this patch. Michael told me that leaking those legacy files wasn't unacceptable. That's why I added the purge method. >> >> Ideally, when all the users have migrated to a WebKit version having this patch, the purge shouldn't be needed anymore and might be removed. > > Right, ok. Yep, this will purge the old files. I have a concern though for the files that fall under the GST_WARNING of line 1377 of not being able to unlink. Should we assume that is is very unlikely and forget (and trust distros to purge this from time to time)? Btw, if it is so unlikely, we can tag the decission as UNLIKELY(). > Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:1374 > + GUniqueOutPtr<gchar> downloadFile; char > Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:1382 > +void MediaPlayerPrivateGStreamer::purgeOldDownloadFiles(const gchar* downloadFileTemplate) char > Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:1388 > + GUniquePtr<gchar> templatePath(g_path_get_dirname(downloadFileTemplate)); > + GUniquePtr<gchar> templateFile(g_path_get_basename(downloadFileTemplate)); char > Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:1391 > + gchar* found = g_strrstr(templateFile.get(), "-XX"); char > Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:1393 > + if (!found) This might be UNLIKELY too. > Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:1405 > + for (const gchar* fileName = g_dir_read_name(directory); fileName; fileName = g_dir_read_name(directory)) { > + if (g_str_has_prefix(fileName, templateFile.get())) { > + GUniquePtr<gchar> filePath(g_build_filename(templatePath.get(), fileName, nullptr)); If you use FileSystem::listDirectory you won't probably use this, but char. > Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h:171 > + void purgeOldDownloadFiles(const gchar* downloadFileTemplate); char, remove parameter name 1272428 26 300331 eocanha 2017-02-02 04:37:59 -0800 Comment on attachment 300331 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=300331&action=review >>> Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:1360 >>> + GUniquePtr<gchar> newDownloadTemplate(g_strdup_printf("/var/tmp/%s-XXXXXX", processName)); >> >> Use g_build_filename > > char. > > Another thing is that I think we should ensure the files are created in a different directory for each user and ensure that directory has the proper permissions so that it cannot be access by anyone else other than the user. I think media people watch online can vary a lot from cats to other things. I'd write a function to return the template and ensure it is placed in the proper directory. This is tricky and, IMHO, not needed. Having and extra directory under /var/tmp means that we would have to maintain (delete) that directory by ourselves. This is problematic because we can't use the elegant trick of deleting the file right after its creation to delete the directory. If several videos are being played at once by different WebProcesses a race condition can happen: - Process A creates /var/tmp/$USER - Process A creates WebKit-Media-123456 there - Process B tries to create /var/tmp/$USER (but it's already created, no problem) - Process A deletes WebKit-Media-123456 there and /var/tmp/$USER - Process B creates WebKit-Media-ABCDEF there but... the directory doesn't exist anymore. ERROR! Anyway, the directory itself isn't needed because the new temporary files are now deleted right after their creation. This means that no other processes can open them anymore, so there shouldn't be any concern regarding privacy. I've checked it by myself with a "while true; do ls /var/tmp; done" script. >>>>> Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:1364 >>>>> + player->purgeOldDownloadFiles(oldDownloadTemplate.get()); >>>> >>>> So, if we purge the old files, then we don't really need to use /var/tmp, no? >>> >>> The "$HOME/.cache" vs. "/var/tmp" discussion was about if the files were considered as "cache" or as "temporary". It's the second, so they belong to a temporary directory. >>> >>> This purging is here just for legacy files generated by WebKit prior to this patch. Michael told me that leaking those legacy files wasn't unacceptable. That's why I added the purge method. >>> >>> Ideally, when all the users have migrated to a WebKit version having this patch, the purge shouldn't be needed anymore and might be removed. >> >> Right, ok. > > Yep, this will purge the old files. I have a concern though for the files that fall under the GST_WARNING of line 1377 of not being able to unlink. Should we assume that is is very unlikely and forget (and trust distros to purge this from time to time)? Btw, if it is so unlikely, we can tag the decission as UNLIKELY(). Michael would say that WebKit should try hard to clean its own files. I don't think distros are going to mess with the contents of the user home dir, even for the .cache dir. Thanks for the UNLIKELY() suggestion, btw. 1272429 27 300398 eocanha 2017-02-02 04:49:20 -0800 Created attachment 300398 Patch 1272449 28 300398 cgarcia 2017-02-02 06:50:13 -0800 Comment on attachment 300398 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=300398&action=review > Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:40 > +#include <WebCore/FileSystem.h> Don't use <> since you are in WebCore. > Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:203 > + if (m_source && WEBKIT_IS_WEB_SRC(m_source.get())) G_TYPE_CHECK_INSTANCE_TYPE already null checks the pointer. > Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:204 > + g_signal_handlers_disconnect_by_func(GST_ELEMENT_PARENT(m_source.get()), reinterpret_cast<gpointer>(uriDecodeBinElementAddedCallback), this); What if it has been disconnected before? I think it would be better to save the handler id and use g_signal_handler_disconnect() and invalidate the id. > Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:1350 > + if (g_strcmp0(G_OBJECT_CLASS_NAME(G_OBJECT_GET_CLASS(G_OBJECT(element))), "GstDownloadBuffer")) GST_IS_DOWNLOAD_BUFFER? > Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:1395 > + // Transform "-XXXXXX" into "-??????" to get a file wildcard expression from the template. > + for (char* p = &templateFile.get()[strlen(templateFile.get()) - 1]; p >= templateFile.get() && *p == 'X'; --p) > + *p = '?'; I'm not sure I understand this, maybe you can simply do g_strdelimit (templateFile.get(), "X", '?'); Can't you pass something like "*-XXXXXX*" as pattern to listDirectory? > Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:1397 > + for (auto filePath : listDirectory(templatePath.get(), templateFile.get())) { auto& > Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:1409 > + if (m_source && WEBKIT_IS_WEB_SRC(m_source.get())) G_TYPE_CHECK_INSTANCE_TYPE already null checks the pointer. 1272455 29 mcatanzaro 2017-02-02 07:04:32 -0800 (In reply to comment #25) > Another thing is that I think we should ensure the files are created in a > different directory for each user and ensure that directory has the proper > permissions so that it cannot be access by anyone else other than the user. > I think media people watch online can vary a lot from cats to other things. > I'd write a function to return the template and ensure it is placed in the > proper directory. It should be sufficient to just create the files with 600 permission, right? 1272457 30 300398 calvaris 2017-02-02 07:05:50 -0800 Comment on attachment 300398 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=300398&action=review > Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:203 > + if (m_source && WEBKIT_IS_WEB_SRC(m_source.get())) You don't need the m_source && as WEBKIT_IS_WEB_SRC checks for nulls as expected. > Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:1362 > + GUniqueOutPtr<char> oldDownloadTemplate; > + g_object_get(element, "temp-template", &oldDownloadTemplate.outPtr(), nullptr); > + > + GUniquePtr<char> newDownloadTemplate(g_build_filename(G_DIR_SEPARATOR_S, "var", "tmp", "WebKit-Media-XXXXXX", nullptr)); > + g_object_set(element, "temp-template", newDownloadTemplate.get(), nullptr); > + GST_TRACE("Reconfiguring file download template from '%s' to '%s'", oldDownloadTemplate.get(), newDownloadTemplate.get()); Nit: you can move getting oldDownloadTemplate after setting newDownloadTemplate (it is going to be actually used before the GST_TRACE and specially relevant for the purge). Another nit: "Reconfigured" is better because the relevant action already happened. > Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:1395 > + // Transform "-XXXXXX" into "-??????" to get a file wildcard expression from the template. > + for (char* p = &templateFile.get()[strlen(templateFile.get()) - 1]; p >= templateFile.get() && *p == 'X'; --p) > + *p = '?'; Maybe you can use String::replace instead of doing this (it can take position and length. > Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:1409 > + if (m_source && WEBKIT_IS_WEB_SRC(m_source.get())) You don't need the m_source && as WEBKIT_IS_WEB_SRC checks for nulls as expected. 1272519 31 calvaris 2017-02-02 10:35:15 -0800 (In reply to comment #26) > > Another thing is that I think we should ensure the files are created in a different directory for each user and ensure that directory has the proper permissions so that it cannot be access by anyone else other than the user. I think media people watch online can vary a lot from cats to other things. I'd write a function to return the template and ensure it is placed in the proper directory. > > This is tricky and, IMHO, not needed. > > Having and extra directory under /var/tmp means that we would have to > maintain (delete) that directory by ourselves. This is problematic because > we can't use the elegant trick of deleting the file right after its creation > to delete the directory. If several videos are being played at once by > different WebProcesses a race condition can happen: > > - Process A creates /var/tmp/$USER > - Process A creates WebKit-Media-123456 there > - Process B tries to create /var/tmp/$USER (but it's already created, no > problem) > - Process A deletes WebKit-Media-123456 there and /var/tmp/$USER > - Process B creates WebKit-Media-ABCDEF there but... the directory doesn't > exist anymore. ERROR! > > Anyway, the directory itself isn't needed because the new temporary files > are now deleted right after their creation. This means that no other > processes can open them anymore, so there shouldn't be any concern regarding > privacy. I've checked it by myself with a "while true; do ls /var/tmp; done" > script. Well, I don't think deleting the directory is needed, it is just 4k on disk. > > Yep, this will purge the old files. I have a concern though for the files that fall under the GST_WARNING of line 1377 of not being able to unlink. Should we assume that is is very unlikely and forget (and trust distros to purge this from time to time)? Btw, if it is so unlikely, we can tag the decission as UNLIKELY(). > > Michael would say that WebKit should try hard to clean its own files. I > don't think distros are going to mess with the contents of the user home > dir, even for the .cache dir. Thanks for the UNLIKELY() suggestion, btw. I think I wasn't clear here. Line 1377, if the regular unlink fails (not the purge one, the regular) we are leaking them (under /var/tmp/). 1272523 32 300398 calvaris 2017-02-02 10:40:23 -0800 Comment on attachment 300398 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=300398&action=review >> Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:1362 >> + GST_TRACE("Reconfiguring file download template from '%s' to '%s'", oldDownloadTemplate.get(), newDownloadTemplate.get()); > > Nit: you can move getting oldDownloadTemplate after setting newDownloadTemplate (it is going to be actually used before the GST_TRACE and specially relevant for the purge). > > Another nit: "Reconfigured" is better because the relevant action already happened. Forget this, it is wrong. 1272539 33 300398 eocanha 2017-02-02 11:04:20 -0800 Comment on attachment 300398 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=300398&action=review >> Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:204 >> + g_signal_handlers_disconnect_by_func(GST_ELEMENT_PARENT(m_source.get()), reinterpret_cast<gpointer>(uriDecodeBinElementAddedCallback), this); > > What if it has been disconnected before? I think it would be better to save the handler id and use g_signal_handler_disconnect() and invalidate the id. If the callback has been disconnected before, then g_signal_handlers_disconnect_matched() (the actual function called by the macro) just returns "0" matches and nothing happens. >> Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:1350 >> + if (g_strcmp0(G_OBJECT_CLASS_NAME(G_OBJECT_GET_CLASS(G_OBJECT(element))), "GstDownloadBuffer")) > > GST_IS_DOWNLOAD_BUFFER? Sorry, that's not possible. GstDownloadBuffer is an element, and as such, comes from a dynamically loaded plugin. It seems that the gstdownloadbuffer.h header isn't distributed for usage from third party applications. If I can't find it in WebKit/WebKitBuild/DependenciesGTK/Root/include/gstreamer-1.0/gst when using jhbuild, I doubt it's going to be available on regular distros. >>> Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:1395 >>> + *p = '?'; >> >> I'm not sure I understand this, maybe you can simply do g_strdelimit (templateFile.get(), "X", '?'); >> >> Can't you pass something like "*-XXXXXX*" as pattern to listDirectory? > > Maybe you can use String::replace instead of doing this (it can take position and length. Carlos: It doesn't work like that. "X" isn't an actual letter X, but the character g_mkstemp()[1] uses as wildcard to construct actual random filenames. That character is equivalent to "?" in shell glob syntax. Now that I think about it, if we're comfident about what the legacy base name was ("WebKitWebProcess-XXXXXX") and are sure that it doesn't have "X" in any other place than in the pattern, we can do a simple character replacement in the base name without fear to screw legitimate "X" letters up. [1] https://developer.gnome.org/glib/stable/glib-File-Utilities.html#g-mkstemp 1272543 34 calvaris 2017-02-02 11:10:54 -0800 After discussing in private I think the best solution because of permissions is sticking to ~/.cache/ but ensuring deleting and purge of old files. I guess a new patch would be needed. 1272545 35 clopez 2017-02-02 11:14:04 -0800 (In reply to comment #34) > After discussing in private I think the best solution because of permissions > is sticking to ~/.cache/ but ensuring deleting and purge of old files. I > guess a new patch would be needed. Why you can't you apply there the same approach of unlinking the file just after its created? Its simpler to implement and more robust. 1272558 36 eocanha 2017-02-02 11:39:53 -0800 (In reply to comment #34) > After discussing in private I think the best solution because of permissions > is sticking to ~/.cache/ but ensuring deleting and purge of old files. I > guess a new patch would be needed. I've checked it (after adding a hack to avoid removing the file, normally external processes can't see it), and the file permissions are "600": 1605111 81156 -rw------- 1 enrique enrique 83103373 Feb 2 19:33 WebKit-Media-VPHGVY Having this into account, there's no reason why plain /var/tmp is a bad idea, and there are several reasons why it's a good idea (as per the "cache" vs. "temporary" file discussion in previous comments). 1272829 37 calvaris 2017-02-02 23:59:13 -0800 (In reply to comment #35) > Why you can't you apply there the same approach of unlinking the file just > after its created? Its simpler to implement and more robust. Probably I wasn't clear enough but my proposal implied this inside WebKit code the problem was a possible permissions race condition between creation and deletion.(In reply to comment #36) > (In reply to comment #34) > I've checked it (after adding a hack to avoid removing the file, normally > external processes can't see it), and the file permissions are "600": > > 1605111 81156 -rw------- 1 enrique enrique 83103373 Feb 2 19:33 > WebKit-Media-VPHGVY > > Having this into account, there's no reason why plain /var/tmp is a bad > idea, and there are several reasons why it's a good idea (as per the "cache" > vs. "temporary" file discussion in previous comments). Then I think we would be good to go once you fix the less serious comments such as extra null checks, chars replacing, etc. 1272858 38 eocanha 2017-02-03 03:04:39 -0800 (In reply to comment #31) > (In reply to comment #26) > > > Yep, this will purge the old files. I have a concern though for the files that fall under the GST_WARNING of line 1377 of not being able to unlink. Should we assume that is is very unlikely and forget (and trust distros to purge this from time to time)? Btw, if it is so unlikely, we can tag the decission as UNLIKELY(). > > > > Michael would say that WebKit should try hard to clean its own files. I > > don't think distros are going to mess with the contents of the user home > > dir, even for the .cache dir. Thanks for the UNLIKELY() suggestion, btw. > > I think I wasn't clear here. Line 1377, if the regular unlink fails (not the > purge one, the regular) we are leaking them (under /var/tmp/). Trying to purge leaked files in the new /var/tmp location doesn't make sense. If the files couldn't be deleted right after creation in the first place (because of a race condition with permissions, where some malicious (root?) process changes the permissions in the milisecond that the file is visible), then ther's no point on trying to delete the file later: the deletion will also fail for the same reasons it failed initially. Purging files in the old location still makes sense, because with the old implementation more time passed from file creation to file deletion (eg: 2h until the movie finishes being played) and the probability of a crash or kill (the only reason why the file would have been leaked) was higher. 1272861 39 300517 eocanha 2017-02-03 03:19:04 -0800 Created attachment 300517 Patch 1272865 40 300517 commit-queue 2017-02-03 04:04:37 -0800 Comment on attachment 300517 Patch Clearing flags on attachment: 300517 Committed r211627: <http://trac.webkit.org/changeset/211627> 1272866 41 commit-queue 2017-02-03 04:04:44 -0800 All reviewed patches have been landed. Closing bug. 1272872 42 mcatanzaro 2017-02-03 04:26:54 -0800 \o/ Kinda a shame that this went in with a misleading commit name, since the media is most definitely not being stored in WebKit's cache, but oh well. 1273022 43 clopez 2017-02-03 12:37:27 -0800 Storing this big media files on the homedir is a potentially performance problem on systems where the home-dir is mounted over a shared network file-system (like happens on many shared computers at places like universities) I think /var/tmp is the right place for this. This directory will be served from local storage, and never from a network file-system. Also, the possibility of an attacker opening the file in the millisecond that happens between the file is created and the file is unlinked are pretty low. Adding that to the fact that videos you watch on your browser is not something that I would consider critical information (like a password). If you are that kind of person, is better you ensure that you are not sharing your computer with anyone when you watch the videos, rating than expecting WebKitGTK+ to do magic tricks to protect your privacy from the other users of your own computer. So... I'm happy that in the end the simplest approach of storing the file on /var/tmp and unlink it was committed, and we didn't end creating an over-engineered solution to something I don't think is a real problem Just my 2 cents. 1387248 44 300517 pnormand 2018-01-09 07:06:39 -0800 Comment on attachment 300517 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=300517&action=review > Source/WebCore/ChangeLog:13 > + some distros), unlinks (deletes) them right after creation and also deletes any other stalled temporary > + file on the old legacy cache directory. The problem with this approach is that if a page contains 2 video element for instance, one player will indirectly hijack the other and we could end-up with some hard-to-debug fallout issues. 300331 2017-02-01 09:41:20 -0800 2017-02-02 04:49:10 -0800 Patch bug-119477-20170201173907.patch text/plain 7733 eocanha U3VidmVyc2lvbiBSZXZpc2lvbjogMjExMDM4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTAwNzcyNDU1MzIzNzcw MThlZTVlMTZjOGM1ZWQ3MzUxNTE3NTY4My4uMTI2MjMzYjNiNzczNzc3MjcyY2JmOTg1ZTUxNGZm MDQxMWU0Y2RhYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDE3LTAyLTAxICBFbnJp cXVlIE9jYcOxYSBHb256w6FsZXogIDxlb2NhbmhhQGlnYWxpYS5jb20+CisKKyAgICAgICAgW0dT dHJlYW1lcl0gU3RvcmUgcHJlbG9hZGVkIG1lZGlhIGluIHdlYmtpdCdzIGNhY2hlCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTk0NzcKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBGaWxlcyBjYWNoZWQgb24g ZGlzayBieSBNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIgYXJlIGRlbGV0ZWQgb25seSB3aGVu IHRoZSBwbGF5ZXIgaXMgY2xvc2VkLiBJZiB0aGUKKyAgICAgICAgV2ViUHJvY2VzcyBjcmFzaGVk LCB0aGV5J3JlIGp1c3QgbGVmdCB0aGVyZSBpbiB0aGUgY2FjaGUgZGlyZWN0b3J5LiBUaGlzIHBh dGNoIGNoYW5nZXMgdGhlIGxvY2F0aW9uCisgICAgICAgIG9mIHRob3NlIHRlbXBvcmFyeSBmaWxl cyB0byBhIHByb3BlciB0ZW1wb3JhcnkgZGlyZWN0b3J5ICgvdmFyL3RtcCwgYXMgdGhvc2UgZmls ZXMgYXJlbid0IGFjdHVhbGx5CisgICAgICAgIHJldXNhYmxlLCBzbyB0aGV5IGRvbid0IGJlbG9u ZyB0byBhIGNhY2hlIGRpcmVjdG9yeSwgYW5kIC90bXAgaXMgYSBiYWQgcGxhY2UgYmVjYXVzZSBp dCdzIFJBTS1iYXNlZCBvbgorICAgICAgICBzb21lIGRpc3Ryb3MpLCB1bmxpbmtzIChkZWxldGVz KSB0aGVtIHJpZ2h0IGFmdGVyIGNyZWF0aW9uIGFuZCBhbHNvIGRlbGV0ZXMgYW55IG90aGVyIHN0 YWxsZWQgdGVtcG9yYXJ5CisgICAgICAgIGZpbGUgb24gdGhlIG9sZCBsZWdhY3kgY2FjaGUgZGly ZWN0b3J5LgorCisgICAgICAgIFRoZXJlJ3Mgbm8gQVBJIGluIEdzdFBsYXliaW4gdG8gY29udHJv bCB0aGUgdGVtcG9yYXJ5IGZpbGUgbG9jYXRpb24sIHNvIHdlIGRvIGl0IG1hbnVhbGx5IGJ5IGxv Y2F0aW5nCisgICAgICAgIHRoZSBHc3REb3dubG9hZEJ1ZmZlciBlbGVtZW50IGluIHRoZSBwaXBl bGluZSBhcyBzb29uIGFzIGl0J3MgY3JlYXRlZCwgcmVjb25maWd1cmluZyBpdCB3aXRoIHRoZSBy aWdodAorICAgICAgICB0ZW1wb3JhcnkgZmlsZSBwYXRoIGFuZCBkZWxldGluZyB0aGUgZmlsZSBh cyBzb29uIGFzIGl0J3MgY3JlYXRlZC4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2dz dHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6TWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjp1cmlEZWNvZGVCaW5FbGVtZW50QWRkZWRD YWxsYmFjayk6IExvb2sgZm9yIEdzdERvd25sb2FkQnVmZmVyLgorICAgICAgICAoV2ViQ29yZTo6 TWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjpkb3dubG9hZEJ1ZmZlckZpbGVDcmVhdGVkQ2Fs bGJhY2spOiBSZW1vdmUgdGhlIGZpbGUgYWZ0ZXIgY3JlYXRpb24uCisgICAgICAgIChXZWJDb3Jl OjpNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6OnB1cmdlT2xkRG93bmxvYWRGaWxlcyk6IERl bGV0ZSBsZWdhY3kgZmlsZXMuCisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVH U3RyZWFtZXI6OnNvdXJjZUNoYW5nZWQpOiBMaXN0ZW4gdG8gZWxlbWVudC1hZGRlZCBzaWduYWxz IG9uIEdzdFVyaURlY29kZUJpbi4KKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFt ZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmg6IE5ldyByZWZlcmVuY2UgdG8gR3N0RG93 bmxvYWRCdWZmZXIuCisKIDIwMTctMDEtMjMgIEpvc2VwaCBQZWNvcmFybyAgPHBlY29yYXJvQGFw cGxlLmNvbT4KIAogICAgICAgICBSZW1vdmUgYWxsb3dXaW5kb3dPcGVuV2l0aG91dFVzZXJHZXN0 dXJlIHNldHRpbmcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIuY3BwIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1l ci5jcHAKaW5kZXggZjAzZjI0ZjRmZThiMmJhM2EyNjY1YWM1NmY4ODllZmYwY2ZkNmI5Ny4uN2U4 Y2M2MzBkNzc0ZDYwNTdmMzUxZWZlYjJjYTFiYWI0MTY1MWI0MSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdT dHJlYW1lci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVh bWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5jcHAKQEAgLTM3LDYgKzM3LDggQEAKICNp bmNsdWRlICJTZWN1cml0eU9yaWdpbi5oIgogI2luY2x1ZGUgIlRpbWVSYW5nZXMuaCIKICNpbmNs dWRlICJXZWJLaXRXZWJTb3VyY2VHU3RyZWFtZXIuaCIKKyNpbmNsdWRlIDxnbGliLmg+CisjaW5j bHVkZSA8Z2xpYi9nc3RkaW8uaD4KICNpbmNsdWRlIDxnc3QvZ3N0Lmg+CiAjaW5jbHVkZSA8Z3N0 L3BidXRpbHMvbWlzc2luZy1wbHVnaW5zLmg+CiAjaW5jbHVkZSA8bGltaXRzPgpAQCAtMTM0MCwx MyArMTM0Miw4NiBAQCB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6c291cmNlQ2hh bmdlZENhbGxiYWNrKE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYQogICAgIHBsYXllci0+c291cmNl Q2hhbmdlZCgpOwogfQogCit2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6dXJpRGVj b2RlQmluRWxlbWVudEFkZGVkQ2FsbGJhY2soR3N0QmluKiBiaW4sIEdzdEVsZW1lbnQqIGVsZW1l bnQsIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lciogcGxheWVyKQoreworICAgIGNvbnN0IGdj aGFyKiBjbGFzc05hbWUgPSBHX09CSkVDVF9DTEFTU19OQU1FKEdfT0JKRUNUX0dFVF9DTEFTUyhH X09CSkVDVChlbGVtZW50KSkpOworICAgIGlmICghZ19zdHJjbXAwKGNsYXNzTmFtZSwgIkdzdERv d25sb2FkQnVmZmVyIikpIHsKKyAgICAgICAgcGxheWVyLT5tX2Rvd25sb2FkQnVmZmVyID0gZWxl bWVudDsKKyAgICAgICAgZ19zaWduYWxfaGFuZGxlcnNfZGlzY29ubmVjdF9ieV9mdW5jKGJpbiwg Z3BvaW50ZXIodXJpRGVjb2RlQmluRWxlbWVudEFkZGVkQ2FsbGJhY2spLCBwbGF5ZXIpOworICAg ICAgICBnX3NpZ25hbF9jb25uZWN0X3N3YXBwZWQoZWxlbWVudCwgIm5vdGlmeTo6dGVtcC1sb2Nh dGlvbiIsIEdfQ0FMTEJBQ0soZG93bmxvYWRCdWZmZXJGaWxlQ3JlYXRlZENhbGxiYWNrKSwgcGxh eWVyKTsKKworICAgICAgICBHVW5pcXVlT3V0UHRyPGdjaGFyPiBvbGREb3dubG9hZFRlbXBsYXRl OworICAgICAgICBnX29iamVjdF9nZXQoZWxlbWVudCwgInRlbXAtdGVtcGxhdGUiLCAmb2xkRG93 bmxvYWRUZW1wbGF0ZS5vdXRQdHIoKSwgbnVsbHB0cik7CisKKyAgICAgICAgY29uc3QgZ2NoYXIq IHByb2Nlc3NOYW1lID0gZ19nZXRfcHJnbmFtZSgpOworICAgICAgICBpZiAoIXByb2Nlc3NOYW1l KQorICAgICAgICAgICAgcHJvY2Vzc05hbWUgPSAiR1N0cmVhbWVyIjsKKworICAgICAgICBHVW5p cXVlUHRyPGdjaGFyPiBuZXdEb3dubG9hZFRlbXBsYXRlKGdfc3RyZHVwX3ByaW50ZigiL3Zhci90 bXAvJXMtWFhYWFhYIiwgcHJvY2Vzc05hbWUpKTsKKyAgICAgICAgZ19vYmplY3Rfc2V0KGVsZW1l bnQsICJ0ZW1wLXRlbXBsYXRlIiwgbmV3RG93bmxvYWRUZW1wbGF0ZS5nZXQoKSwgbnVsbHB0cik7 CisgICAgICAgIEdTVF9UUkFDRSgiUmVjb25maWd1cmluZyBmaWxlIGRvd25sb2FkIHRlbXBsYXRl IGZyb20gJyVzJyB0byAnJXMnXG4iLCBvbGREb3dubG9hZFRlbXBsYXRlLmdldCgpLCBuZXdEb3du bG9hZFRlbXBsYXRlLmdldCgpKTsKKworICAgICAgICBwbGF5ZXItPnB1cmdlT2xkRG93bmxvYWRG aWxlcyhvbGREb3dubG9hZFRlbXBsYXRlLmdldCgpKTsKKyAgICB9Cit9CisKK3ZvaWQgTWVkaWFQ bGF5ZXJQcml2YXRlR1N0cmVhbWVyOjpkb3dubG9hZEJ1ZmZlckZpbGVDcmVhdGVkQ2FsbGJhY2so TWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyKiBwbGF5ZXIpCit7CisgICAgQVNTRVJUKHBsYXll ci0+bV9kb3dubG9hZEJ1ZmZlcik7CisKKyAgICBnX3NpZ25hbF9oYW5kbGVyc19kaXNjb25uZWN0 X2J5X2Z1bmMocGxheWVyLT5tX2Rvd25sb2FkQnVmZmVyLmdldCgpLCBncG9pbnRlcihkb3dubG9h ZEJ1ZmZlckZpbGVDcmVhdGVkQ2FsbGJhY2spLCBwbGF5ZXIpOworCisgICAgR1VuaXF1ZU91dFB0 cjxnY2hhcj4gZG93bmxvYWRGaWxlOworICAgIGdfb2JqZWN0X2dldChwbGF5ZXItPm1fZG93bmxv YWRCdWZmZXIuZ2V0KCksICJ0ZW1wLWxvY2F0aW9uIiwgJmRvd25sb2FkRmlsZS5vdXRQdHIoKSwg bnVsbHB0cik7CisgICAgaWYgKGdfdW5saW5rKGRvd25sb2FkRmlsZS5nZXQoKSkgPT0gLTEpCisg ICAgICAgIEdTVF9XQVJOSU5HKCJDb3VsZG4ndCB1bmxpbmsgbWVkaWEgdGVtcG9yYXJ5IGZpbGUg JXMgYWZ0ZXIgY3JlYXRpb24iLCBkb3dubG9hZEZpbGUuZ2V0KCkpOworICAgIGVsc2UKKyAgICAg ICAgR1NUX1RSQUNFKCJVbmxpbmtlZCBtZWRpYSB0ZW1wb3JhcnkgZmlsZSAlcyBhZnRlciBjcmVh dGlvbiIsIGRvd25sb2FkRmlsZS5nZXQoKSk7Cit9CisKK3ZvaWQgTWVkaWFQbGF5ZXJQcml2YXRl R1N0cmVhbWVyOjpwdXJnZU9sZERvd25sb2FkRmlsZXMoY29uc3QgZ2NoYXIqIGRvd25sb2FkRmls ZVRlbXBsYXRlKQoreworICAgIGlmICghZG93bmxvYWRGaWxlVGVtcGxhdGUpCisgICAgICAgIHJl dHVybjsKKworICAgIEdVbmlxdWVQdHI8Z2NoYXI+IHRlbXBsYXRlUGF0aChnX3BhdGhfZ2V0X2Rp cm5hbWUoZG93bmxvYWRGaWxlVGVtcGxhdGUpKTsKKyAgICBHVW5pcXVlUHRyPGdjaGFyPiB0ZW1w bGF0ZUZpbGUoZ19wYXRoX2dldF9iYXNlbmFtZShkb3dubG9hZEZpbGVUZW1wbGF0ZSkpOworCisg ICAgLy8gRmluZCAiLVhYWFhYWCIgYW5kIGNsZWFuIHRoZSBYcyBmcm9tIHRoZSBzdHJpbmcsIGxl YXZpbmcgIi0iLgorICAgIGdjaGFyKiBmb3VuZCA9IGdfc3RycnN0cih0ZW1wbGF0ZUZpbGUuZ2V0 KCksICItWFgiKTsKKworICAgIGlmICghZm91bmQpCisgICAgICAgIHJldHVybjsKKworICAgIGZv dW5kWzFdID0gJ1wwJzsKKworICAgIEdEaXIqIGRpcmVjdG9yeSA9IGdfZGlyX29wZW4odGVtcGxh dGVQYXRoLmdldCgpLCAwLCBudWxscHRyKTsKKworICAgIGlmICghZGlyZWN0b3J5KQorICAgICAg ICByZXR1cm47CisKKyAgICBmb3IgKGNvbnN0IGdjaGFyKiBmaWxlTmFtZSA9IGdfZGlyX3JlYWRf bmFtZShkaXJlY3RvcnkpOyBmaWxlTmFtZTsgZmlsZU5hbWUgPSBnX2Rpcl9yZWFkX25hbWUoZGly ZWN0b3J5KSkgeworICAgICAgICBpZiAoZ19zdHJfaGFzX3ByZWZpeChmaWxlTmFtZSwgdGVtcGxh dGVGaWxlLmdldCgpKSkgeworICAgICAgICAgICAgR1VuaXF1ZVB0cjxnY2hhcj4gZmlsZVBhdGgo Z19idWlsZF9maWxlbmFtZSh0ZW1wbGF0ZVBhdGguZ2V0KCksIGZpbGVOYW1lLCBudWxscHRyKSk7 CisgICAgICAgICAgICBpZiAoZ191bmxpbmsoZmlsZVBhdGguZ2V0KCkpID09IC0xKQorICAgICAg ICAgICAgICAgIEdTVF9XQVJOSU5HKCJDb3VsZG4ndCB1bmxpbmsgbGVnYWN5IG1lZGlhIHRlbXBv cmFyeSBmaWxlOiAlcyIsIGZpbGVQYXRoLmdldCgpKTsKKyAgICAgICAgICAgIGVsc2UKKyAgICAg ICAgICAgICAgICBHU1RfVFJBQ0UoIlVubGlua2VkIGxlZ2FjeSBtZWRpYSB0ZW1wb3JhcnkgZmls ZTogJXMiLCBmaWxlUGF0aC5nZXQoKSk7CisgICAgICAgIH0KKyAgICB9CisKKyAgICBnX2Rpcl9j bG9zZShkaXJlY3RvcnkpOworfQorCiB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6 c291cmNlQ2hhbmdlZCgpCiB7CiAgICAgbV9zb3VyY2UuY2xlYXIoKTsKICAgICBnX29iamVjdF9n ZXQobV9waXBlbGluZS5nZXQoKSwgInNvdXJjZSIsICZtX3NvdXJjZS5vdXRQdHIoKSwgbnVsbHB0 cik7CiAKLSAgICBpZiAoV0VCS0lUX0lTX1dFQl9TUkMobV9zb3VyY2UuZ2V0KCkpKQorICAgIGlm IChXRUJLSVRfSVNfV0VCX1NSQyhtX3NvdXJjZS5nZXQoKSkpIHsKICAgICAgICAgd2ViS2l0V2Vi U3JjU2V0TWVkaWFQbGF5ZXIoV0VCS0lUX1dFQl9TUkMobV9zb3VyY2UuZ2V0KCkpLCBtX3BsYXll cik7CisgICAgICAgIGdfc2lnbmFsX2Nvbm5lY3QoR1NUX0VMRU1FTlRfUEFSRU5UKG1fc291cmNl LmdldCgpKSwgImVsZW1lbnQtYWRkZWQiLCBHX0NBTExCQUNLKHVyaURlY29kZUJpbkVsZW1lbnRB ZGRlZENhbGxiYWNrKSwgdGhpcyk7CisgICAgfQogfQogCiB2b2lkIE1lZGlhUGxheWVyUHJpdmF0 ZUdTdHJlYW1lcjo6Y2FuY2VsTG9hZCgpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmggYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2 YXRlR1N0cmVhbWVyLmgKaW5kZXggMjdhNjE5OGYzMzMyOWVhNDg5YzEyZThhZTJmODQ0MWZkMWI1 ZDVjYS4uODAzZWJmNzVlOTA4MjQ3MmE3ZjM0NjIxZTgyZDczMzIwYmRiYzg1MyAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVy UHJpdmF0ZUdTdHJlYW1lci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIuaApAQCAtMTY4LDYgKzE2OCwx MCBAQCBwcml2YXRlOgogICAgIGJvb2wgZGlkUGFzc0NPUlNBY2Nlc3NDaGVjaygpIGNvbnN0IG92 ZXJyaWRlOwogICAgIGJvb2wgY2FuU2F2ZU1lZGlhRGF0YSgpIGNvbnN0IG92ZXJyaWRlOwogCisg ICAgdm9pZCBwdXJnZU9sZERvd25sb2FkRmlsZXMoY29uc3QgZ2NoYXIqIGRvd25sb2FkRmlsZVRl bXBsYXRlKTsKKyAgICBzdGF0aWMgdm9pZCB1cmlEZWNvZGVCaW5FbGVtZW50QWRkZWRDYWxsYmFj ayhHc3RCaW4qLCBHc3RFbGVtZW50KiwgTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyKik7Cisg ICAgc3RhdGljIHZvaWQgZG93bmxvYWRCdWZmZXJGaWxlQ3JlYXRlZENhbGxiYWNrKE1lZGlhUGxh eWVyUHJpdmF0ZUdTdHJlYW1lciopOworCiBwcm90ZWN0ZWQ6CiAgICAgdm9pZCBjYWNoZUR1cmF0 aW9uKCk7CiAKQEAgLTI0Miw2ICsyNDYsNyBAQCBwcml2YXRlOgogICAgIHN0ZDo6dW5pcXVlX3B0 cjxBdWRpb1NvdXJjZVByb3ZpZGVyR1N0cmVhbWVyPiBtX2F1ZGlvU291cmNlUHJvdmlkZXI7CiAj ZW5kaWYKICAgICBHUmVmUHRyPEdzdEVsZW1lbnQ+IG1fYXV0b0F1ZGlvU2luazsKKyAgICBHUmVm UHRyPEdzdEVsZW1lbnQ+IG1fZG93bmxvYWRCdWZmZXI7CiAgICAgUmVmUHRyPE1lZGlhUGxheWVy UmVxdWVzdEluc3RhbGxNaXNzaW5nUGx1Z2luc0NhbGxiYWNrPiBtX21pc3NpbmdQbHVnaW5zQ2Fs bGJhY2s7CiAjaWYgRU5BQkxFKFZJREVPX1RSQUNLKQogICAgIFZlY3RvcjxSZWZQdHI8QXVkaW9U cmFja1ByaXZhdGVHU3RyZWFtZXI+PiBtX2F1ZGlvVHJhY2tzOwo= 300398 2017-02-02 04:49:20 -0800 2017-02-03 03:18:53 -0800 Patch bug-119477-20170202124705.patch text/plain 8210 eocanha U3VidmVyc2lvbiBSZXZpc2lvbjogMjExMDM4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTAwNzcyNDU1MzIzNzcw MThlZTVlMTZjOGM1ZWQ3MzUxNTE3NTY4My4uZTUzMTA2NjE1MGE3NDgwMGZmYzA4MWQ3MWJjNmUx NGJlOWFmNTNhOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDE3LTAyLTAyICBFbnJp cXVlIE9jYcOxYSBHb256w6FsZXogIDxlb2NhbmhhQGlnYWxpYS5jb20+CisKKyAgICAgICAgW0dT dHJlYW1lcl0gU3RvcmUgcHJlbG9hZGVkIG1lZGlhIGluIHdlYmtpdCdzIGNhY2hlCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTk0NzcKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBGaWxlcyBjYWNoZWQgb24g ZGlzayBieSBNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIgYXJlIGRlbGV0ZWQgb25seSB3aGVu IHRoZSBwbGF5ZXIgaXMgY2xvc2VkLiBJZiB0aGUKKyAgICAgICAgV2ViUHJvY2VzcyBjcmFzaGVk LCB0aGV5J3JlIGp1c3QgbGVmdCB0aGVyZSBpbiB0aGUgY2FjaGUgZGlyZWN0b3J5LiBUaGlzIHBh dGNoIGNoYW5nZXMgdGhlIGxvY2F0aW9uCisgICAgICAgIG9mIHRob3NlIHRlbXBvcmFyeSBmaWxl cyB0byBhIHByb3BlciB0ZW1wb3JhcnkgZGlyZWN0b3J5ICgvdmFyL3RtcCwgYXMgdGhvc2UgZmls ZXMgYXJlbid0IGFjdHVhbGx5CisgICAgICAgIHJldXNhYmxlLCBzbyB0aGV5IGRvbid0IGJlbG9u ZyB0byBhIGNhY2hlIGRpcmVjdG9yeSwgYW5kIC90bXAgaXMgYSBiYWQgcGxhY2UgYmVjYXVzZSBp dCdzIFJBTS1iYXNlZCBvbgorICAgICAgICBzb21lIGRpc3Ryb3MpLCB1bmxpbmtzIChkZWxldGVz KSB0aGVtIHJpZ2h0IGFmdGVyIGNyZWF0aW9uIGFuZCBhbHNvIGRlbGV0ZXMgYW55IG90aGVyIHN0 YWxsZWQgdGVtcG9yYXJ5CisgICAgICAgIGZpbGUgb24gdGhlIG9sZCBsZWdhY3kgY2FjaGUgZGly ZWN0b3J5LgorCisgICAgICAgIFRoZXJlJ3Mgbm8gQVBJIGluIEdzdFBsYXliaW4gdG8gY29udHJv bCB0aGUgdGVtcG9yYXJ5IGZpbGUgbG9jYXRpb24sIHNvIHdlIGRvIGl0IG1hbnVhbGx5IGJ5IGxv Y2F0aW5nCisgICAgICAgIHRoZSBHc3REb3dubG9hZEJ1ZmZlciBlbGVtZW50IGluIHRoZSBwaXBl bGluZSBhcyBzb29uIGFzIGl0J3MgY3JlYXRlZCwgcmVjb25maWd1cmluZyBpdCB3aXRoIHRoZSBy aWdodAorICAgICAgICB0ZW1wb3JhcnkgZmlsZSBwYXRoIGFuZCBkZWxldGluZyB0aGUgZmlsZSBh cyBzb29uIGFzIGl0J3MgY3JlYXRlZC4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2dz dHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6TWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjp+TWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVh bWVyKTogU3RvcCBsaXN0ZW5pbmcgdG8gZWxlbWVudC1hZGRlZC4KKyAgICAgICAgKFdlYkNvcmU6 Ok1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6dXJpRGVjb2RlQmluRWxlbWVudEFkZGVkQ2Fs bGJhY2spOiBMb29rIGZvciBHc3REb3dubG9hZEJ1ZmZlci4KKyAgICAgICAgKFdlYkNvcmU6Ok1l ZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6ZG93bmxvYWRCdWZmZXJGaWxlQ3JlYXRlZENhbGxi YWNrKTogUmVtb3ZlIHRoZSBmaWxlIGFmdGVyIGNyZWF0aW9uLgorICAgICAgICAoV2ViQ29yZTo6 TWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjpwdXJnZU9sZERvd25sb2FkRmlsZXMpOiBEZWxl dGUgbGVnYWN5IGZpbGVzLgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlR1N0 cmVhbWVyOjpzb3VyY2VDaGFuZ2VkKTogTGlzdGVuIHRvIGVsZW1lbnQtYWRkZWQgc2lnbmFscyBv biBHc3RVcmlEZWNvZGVCaW4uCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVy L01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5oOiBOZXcgcmVmZXJlbmNlIHRvIEdzdERvd25s b2FkQnVmZmVyLgorCiAyMDE3LTAxLTIzICBKb3NlcGggUGVjb3Jhcm8gIDxwZWNvcmFyb0BhcHBs ZS5jb20+CiAKICAgICAgICAgUmVtb3ZlIGFsbG93V2luZG93T3BlbldpdGhvdXRVc2VyR2VzdHVy ZSBzZXR0aW5nCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9n c3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmNwcCBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIu Y3BwCmluZGV4IGYwM2YyNGY0ZmU4YjJiYTNhMjY2NWFjNTZmODg5ZWZmMGNmZDZiOTcuLmZmYWI5 NWU3OWI1M2M5NTY3ODM4NDIyN2E4MzFhODBkMTNmOGRkNjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVHU3Ry ZWFtZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1l ci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIuY3BwCkBAIC0zNyw2ICszNyw4IEBACiAjaW5j bHVkZSAiU2VjdXJpdHlPcmlnaW4uaCIKICNpbmNsdWRlICJUaW1lUmFuZ2VzLmgiCiAjaW5jbHVk ZSAiV2ViS2l0V2ViU291cmNlR1N0cmVhbWVyLmgiCisjaW5jbHVkZSA8V2ViQ29yZS9GaWxlU3lz dGVtLmg+CisjaW5jbHVkZSA8Z2xpYi5oPgogI2luY2x1ZGUgPGdzdC9nc3QuaD4KICNpbmNsdWRl IDxnc3QvcGJ1dGlscy9taXNzaW5nLXBsdWdpbnMuaD4KICNpbmNsdWRlIDxsaW1pdHM+CkBAIC0x OTgsNiArMjAwLDkgQEAgTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjp+TWVkaWFQbGF5ZXJQ cml2YXRlR1N0cmVhbWVyKCkKICAgICAgICAgbV9tZWRpYUxvY2F0aW9ucyA9IDA7CiAgICAgfQog CisgICAgaWYgKG1fc291cmNlICYmIFdFQktJVF9JU19XRUJfU1JDKG1fc291cmNlLmdldCgpKSkK KyAgICAgICAgZ19zaWduYWxfaGFuZGxlcnNfZGlzY29ubmVjdF9ieV9mdW5jKEdTVF9FTEVNRU5U X1BBUkVOVChtX3NvdXJjZS5nZXQoKSksIHJlaW50ZXJwcmV0X2Nhc3Q8Z3BvaW50ZXI+KHVyaURl Y29kZUJpbkVsZW1lbnRBZGRlZENhbGxiYWNrKSwgdGhpcyk7CisKICAgICBpZiAobV9hdXRvQXVk aW9TaW5rKQogICAgICAgICBnX3NpZ25hbF9oYW5kbGVyc19kaXNjb25uZWN0X2J5X2Z1bmMoR19P QkpFQ1QobV9hdXRvQXVkaW9TaW5rLmdldCgpKSwKICAgICAgICAgICAgIHJlaW50ZXJwcmV0X2Nh c3Q8Z3BvaW50ZXI+KHNldEF1ZGlvU3RyZWFtUHJvcGVydGllc0NhbGxiYWNrKSwgdGhpcyk7CkBA IC0xMzQwLDEzICsxMzQ1LDc3IEBAIHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjpz b3VyY2VDaGFuZ2VkQ2FsbGJhY2soTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhCiAgICAgcGxheWVy LT5zb3VyY2VDaGFuZ2VkKCk7CiB9CiAKK3ZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVy Ojp1cmlEZWNvZGVCaW5FbGVtZW50QWRkZWRDYWxsYmFjayhHc3RCaW4qIGJpbiwgR3N0RWxlbWVu dCogZWxlbWVudCwgTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyKiBwbGF5ZXIpCit7CisgICAg aWYgKGdfc3RyY21wMChHX09CSkVDVF9DTEFTU19OQU1FKEdfT0JKRUNUX0dFVF9DTEFTUyhHX09C SkVDVChlbGVtZW50KSkpLCAiR3N0RG93bmxvYWRCdWZmZXIiKSkKKyAgICAgICAgcmV0dXJuOwor CisgICAgcGxheWVyLT5tX2Rvd25sb2FkQnVmZmVyID0gZWxlbWVudDsKKyAgICBnX3NpZ25hbF9o YW5kbGVyc19kaXNjb25uZWN0X2J5X2Z1bmMoYmluLCByZWludGVycHJldF9jYXN0PGdwb2ludGVy Pih1cmlEZWNvZGVCaW5FbGVtZW50QWRkZWRDYWxsYmFjayksIHBsYXllcik7CisgICAgZ19zaWdu YWxfY29ubmVjdF9zd2FwcGVkKGVsZW1lbnQsICJub3RpZnk6OnRlbXAtbG9jYXRpb24iLCBHX0NB TExCQUNLKGRvd25sb2FkQnVmZmVyRmlsZUNyZWF0ZWRDYWxsYmFjayksIHBsYXllcik7CisKKyAg ICBHVW5pcXVlT3V0UHRyPGNoYXI+IG9sZERvd25sb2FkVGVtcGxhdGU7CisgICAgZ19vYmplY3Rf Z2V0KGVsZW1lbnQsICJ0ZW1wLXRlbXBsYXRlIiwgJm9sZERvd25sb2FkVGVtcGxhdGUub3V0UHRy KCksIG51bGxwdHIpOworCisgICAgR1VuaXF1ZVB0cjxjaGFyPiBuZXdEb3dubG9hZFRlbXBsYXRl KGdfYnVpbGRfZmlsZW5hbWUoR19ESVJfU0VQQVJBVE9SX1MsICJ2YXIiLCAidG1wIiwgIldlYktp dC1NZWRpYS1YWFhYWFgiLCBudWxscHRyKSk7CisgICAgZ19vYmplY3Rfc2V0KGVsZW1lbnQsICJ0 ZW1wLXRlbXBsYXRlIiwgbmV3RG93bmxvYWRUZW1wbGF0ZS5nZXQoKSwgbnVsbHB0cik7CisgICAg R1NUX1RSQUNFKCJSZWNvbmZpZ3VyaW5nIGZpbGUgZG93bmxvYWQgdGVtcGxhdGUgZnJvbSAnJXMn IHRvICclcyciLCBvbGREb3dubG9hZFRlbXBsYXRlLmdldCgpLCBuZXdEb3dubG9hZFRlbXBsYXRl LmdldCgpKTsKKworICAgIHBsYXllci0+cHVyZ2VPbGREb3dubG9hZEZpbGVzKG9sZERvd25sb2Fk VGVtcGxhdGUuZ2V0KCkpOworfQorCit2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6 ZG93bmxvYWRCdWZmZXJGaWxlQ3JlYXRlZENhbGxiYWNrKE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJl YW1lciogcGxheWVyKQoreworICAgIEFTU0VSVChwbGF5ZXItPm1fZG93bmxvYWRCdWZmZXIpOwor CisgICAgZ19zaWduYWxfaGFuZGxlcnNfZGlzY29ubmVjdF9ieV9mdW5jKHBsYXllci0+bV9kb3du bG9hZEJ1ZmZlci5nZXQoKSwgcmVpbnRlcnByZXRfY2FzdDxncG9pbnRlcj4oZG93bmxvYWRCdWZm ZXJGaWxlQ3JlYXRlZENhbGxiYWNrKSwgcGxheWVyKTsKKworICAgIEdVbmlxdWVPdXRQdHI8Y2hh cj4gZG93bmxvYWRGaWxlOworICAgIGdfb2JqZWN0X2dldChwbGF5ZXItPm1fZG93bmxvYWRCdWZm ZXIuZ2V0KCksICJ0ZW1wLWxvY2F0aW9uIiwgJmRvd25sb2FkRmlsZS5vdXRQdHIoKSwgbnVsbHB0 cik7CisgICAgcGxheWVyLT5tX2Rvd25sb2FkQnVmZmVyID0gbnVsbHB0cjsKKworICAgIGlmIChV TkxJS0VMWSghZGVsZXRlRmlsZShkb3dubG9hZEZpbGUuZ2V0KCkpKSkgeworICAgICAgICBHU1Rf V0FSTklORygiQ291bGRuJ3QgdW5saW5rIG1lZGlhIHRlbXBvcmFyeSBmaWxlICVzIGFmdGVyIGNy ZWF0aW9uIiwgZG93bmxvYWRGaWxlLmdldCgpKTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKwor ICAgIEdTVF9UUkFDRSgiVW5saW5rZWQgbWVkaWEgdGVtcG9yYXJ5IGZpbGUgJXMgYWZ0ZXIgY3Jl YXRpb24iLCBkb3dubG9hZEZpbGUuZ2V0KCkpOworfQorCit2b2lkIE1lZGlhUGxheWVyUHJpdmF0 ZUdTdHJlYW1lcjo6cHVyZ2VPbGREb3dubG9hZEZpbGVzKGNvbnN0IGNoYXIqIGRvd25sb2FkRmls ZVRlbXBsYXRlKQoreworICAgIGlmICghZG93bmxvYWRGaWxlVGVtcGxhdGUpCisgICAgICAgIHJl dHVybjsKKworICAgIEdVbmlxdWVQdHI8Y2hhcj4gdGVtcGxhdGVQYXRoKGdfcGF0aF9nZXRfZGly bmFtZShkb3dubG9hZEZpbGVUZW1wbGF0ZSkpOworICAgIEdVbmlxdWVQdHI8Y2hhcj4gdGVtcGxh dGVGaWxlKGdfcGF0aF9nZXRfYmFzZW5hbWUoZG93bmxvYWRGaWxlVGVtcGxhdGUpKTsKKworICAg IC8vIFRyYW5zZm9ybSAiLVhYWFhYWCIgaW50byAiLT8/Pz8/PyIgdG8gZ2V0IGEgZmlsZSB3aWxk Y2FyZCBleHByZXNzaW9uIGZyb20gdGhlIHRlbXBsYXRlLgorICAgIGZvciAoY2hhciogcCA9ICZ0 ZW1wbGF0ZUZpbGUuZ2V0KClbc3RybGVuKHRlbXBsYXRlRmlsZS5nZXQoKSkgLSAxXTsgcCA+PSB0 ZW1wbGF0ZUZpbGUuZ2V0KCkgJiYgKnAgPT0gJ1gnOyAtLXApCisgICAgICAgICpwID0gJz8nOwor CisgICAgZm9yIChhdXRvIGZpbGVQYXRoIDogbGlzdERpcmVjdG9yeSh0ZW1wbGF0ZVBhdGguZ2V0 KCksIHRlbXBsYXRlRmlsZS5nZXQoKSkpIHsKKyAgICAgICAgaWYgKFVOTElLRUxZKCFkZWxldGVG aWxlKGZpbGVQYXRoKSkpIHsKKyAgICAgICAgICAgIEdTVF9XQVJOSU5HKCJDb3VsZG4ndCB1bmxp bmsgbGVnYWN5IG1lZGlhIHRlbXBvcmFyeSBmaWxlOiAlcyIsIGZpbGVQYXRoLnV0ZjgoKS5kYXRh KCkpOworICAgICAgICAgICAgY29udGludWU7CisgICAgICAgIH0KKworICAgICAgICBHU1RfVFJB Q0UoIlVubGlua2VkIGxlZ2FjeSBtZWRpYSB0ZW1wb3JhcnkgZmlsZTogJXMiLCBmaWxlUGF0aC51 dGY4KCkuZGF0YSgpKTsKKyAgICB9Cit9CisKIHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVh bWVyOjpzb3VyY2VDaGFuZ2VkKCkKIHsKKyAgICBpZiAobV9zb3VyY2UgJiYgV0VCS0lUX0lTX1dF Ql9TUkMobV9zb3VyY2UuZ2V0KCkpKQorICAgICAgICBnX3NpZ25hbF9oYW5kbGVyc19kaXNjb25u ZWN0X2J5X2Z1bmMoR1NUX0VMRU1FTlRfUEFSRU5UKG1fc291cmNlLmdldCgpKSwgcmVpbnRlcnBy ZXRfY2FzdDxncG9pbnRlcj4odXJpRGVjb2RlQmluRWxlbWVudEFkZGVkQ2FsbGJhY2spLCB0aGlz KTsKKwogICAgIG1fc291cmNlLmNsZWFyKCk7CiAgICAgZ19vYmplY3RfZ2V0KG1fcGlwZWxpbmUu Z2V0KCksICJzb3VyY2UiLCAmbV9zb3VyY2Uub3V0UHRyKCksIG51bGxwdHIpOwogCi0gICAgaWYg KFdFQktJVF9JU19XRUJfU1JDKG1fc291cmNlLmdldCgpKSkKKyAgICBpZiAoV0VCS0lUX0lTX1dF Ql9TUkMobV9zb3VyY2UuZ2V0KCkpKSB7CiAgICAgICAgIHdlYktpdFdlYlNyY1NldE1lZGlhUGxh eWVyKFdFQktJVF9XRUJfU1JDKG1fc291cmNlLmdldCgpKSwgbV9wbGF5ZXIpOworICAgICAgICBn X3NpZ25hbF9jb25uZWN0KEdTVF9FTEVNRU5UX1BBUkVOVChtX3NvdXJjZS5nZXQoKSksICJlbGVt ZW50LWFkZGVkIiwgR19DQUxMQkFDSyh1cmlEZWNvZGVCaW5FbGVtZW50QWRkZWRDYWxsYmFjayks IHRoaXMpOworICAgIH0KIH0KIAogdm9pZCBNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6OmNh bmNlbExvYWQoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv Z3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5oIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5o CmluZGV4IDI3YTYxOThmMzMzMjllYTQ4OWMxMmU4YWUyZjg0NDFmZDFiNWQ1Y2EuLmEzNGMyOTAy NTA0MmJmZDAxNDZhOGU1YmM3NTA0MWE4Mzk0ZjZkZmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFt ZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVk aWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmgKQEAgLTE2OCw2ICsxNjgsMTAgQEAgcHJpdmF0ZToK ICAgICBib29sIGRpZFBhc3NDT1JTQWNjZXNzQ2hlY2soKSBjb25zdCBvdmVycmlkZTsKICAgICBi b29sIGNhblNhdmVNZWRpYURhdGEoKSBjb25zdCBvdmVycmlkZTsKIAorICAgIHZvaWQgcHVyZ2VP bGREb3dubG9hZEZpbGVzKGNvbnN0IGNoYXIqKTsKKyAgICBzdGF0aWMgdm9pZCB1cmlEZWNvZGVC aW5FbGVtZW50QWRkZWRDYWxsYmFjayhHc3RCaW4qLCBHc3RFbGVtZW50KiwgTWVkaWFQbGF5ZXJQ cml2YXRlR1N0cmVhbWVyKik7CisgICAgc3RhdGljIHZvaWQgZG93bmxvYWRCdWZmZXJGaWxlQ3Jl YXRlZENhbGxiYWNrKE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lciopOworCiBwcm90ZWN0ZWQ6 CiAgICAgdm9pZCBjYWNoZUR1cmF0aW9uKCk7CiAKQEAgLTI0Miw2ICsyNDYsNyBAQCBwcml2YXRl OgogICAgIHN0ZDo6dW5pcXVlX3B0cjxBdWRpb1NvdXJjZVByb3ZpZGVyR1N0cmVhbWVyPiBtX2F1 ZGlvU291cmNlUHJvdmlkZXI7CiAjZW5kaWYKICAgICBHUmVmUHRyPEdzdEVsZW1lbnQ+IG1fYXV0 b0F1ZGlvU2luazsKKyAgICBHUmVmUHRyPEdzdEVsZW1lbnQ+IG1fZG93bmxvYWRCdWZmZXI7CiAg ICAgUmVmUHRyPE1lZGlhUGxheWVyUmVxdWVzdEluc3RhbGxNaXNzaW5nUGx1Z2luc0NhbGxiYWNr PiBtX21pc3NpbmdQbHVnaW5zQ2FsbGJhY2s7CiAjaWYgRU5BQkxFKFZJREVPX1RSQUNLKQogICAg IFZlY3RvcjxSZWZQdHI8QXVkaW9UcmFja1ByaXZhdGVHU3RyZWFtZXI+PiBtX2F1ZGlvVHJhY2tz Owo= 300517 2017-02-03 03:19:04 -0800 2017-02-03 04:04:37 -0800 Patch bug-119477-20170203111647.patch text/plain 8168 eocanha U3VidmVyc2lvbiBSZXZpc2lvbjogMjExMDM4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTAwNzcyNDU1MzIzNzcw MThlZTVlMTZjOGM1ZWQ3MzUxNTE3NTY4My4uZDVkOTIwYWJiOTQ0NGFhNzZmZTE1YzkyNjVlZmNl NzhmMzIxMDYxYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDE3LTAyLTAzICBFbnJp cXVlIE9jYcOxYSBHb256w6FsZXogIDxlb2NhbmhhQGlnYWxpYS5jb20+CisKKyAgICAgICAgW0dT dHJlYW1lcl0gU3RvcmUgcHJlbG9hZGVkIG1lZGlhIGluIHdlYmtpdCdzIGNhY2hlCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTk0NzcKKworICAgICAg ICBSZXZpZXdlZCBieSBYYWJpZXIgUm9kcmlndWV6LUNhbHZhci4KKworICAgICAgICBGaWxlcyBj YWNoZWQgb24gZGlzayBieSBNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIgYXJlIGRlbGV0ZWQg b25seSB3aGVuIHRoZSBwbGF5ZXIgaXMgY2xvc2VkLiBJZiB0aGUKKyAgICAgICAgV2ViUHJvY2Vz cyBjcmFzaGVkLCB0aGV5J3JlIGp1c3QgbGVmdCB0aGVyZSBpbiB0aGUgY2FjaGUgZGlyZWN0b3J5 LiBUaGlzIHBhdGNoIGNoYW5nZXMgdGhlIGxvY2F0aW9uCisgICAgICAgIG9mIHRob3NlIHRlbXBv cmFyeSBmaWxlcyB0byBhIHByb3BlciB0ZW1wb3JhcnkgZGlyZWN0b3J5ICgvdmFyL3RtcCwgYXMg dGhvc2UgZmlsZXMgYXJlbid0IGFjdHVhbGx5CisgICAgICAgIHJldXNhYmxlLCBzbyB0aGV5IGRv bid0IGJlbG9uZyB0byBhIGNhY2hlIGRpcmVjdG9yeSwgYW5kIC90bXAgaXMgYSBiYWQgcGxhY2Ug YmVjYXVzZSBpdCdzIFJBTS1iYXNlZCBvbgorICAgICAgICBzb21lIGRpc3Ryb3MpLCB1bmxpbmtz IChkZWxldGVzKSB0aGVtIHJpZ2h0IGFmdGVyIGNyZWF0aW9uIGFuZCBhbHNvIGRlbGV0ZXMgYW55 IG90aGVyIHN0YWxsZWQgdGVtcG9yYXJ5CisgICAgICAgIGZpbGUgb24gdGhlIG9sZCBsZWdhY3kg Y2FjaGUgZGlyZWN0b3J5LgorCisgICAgICAgIFRoZXJlJ3Mgbm8gQVBJIGluIEdzdFBsYXliaW4g dG8gY29udHJvbCB0aGUgdGVtcG9yYXJ5IGZpbGUgbG9jYXRpb24sIHNvIHdlIGRvIGl0IG1hbnVh bGx5IGJ5IGxvY2F0aW5nCisgICAgICAgIHRoZSBHc3REb3dubG9hZEJ1ZmZlciBlbGVtZW50IGlu IHRoZSBwaXBlbGluZSBhcyBzb29uIGFzIGl0J3MgY3JlYXRlZCwgcmVjb25maWd1cmluZyBpdCB3 aXRoIHRoZSByaWdodAorICAgICAgICB0ZW1wb3JhcnkgZmlsZSBwYXRoIGFuZCBkZWxldGluZyB0 aGUgZmlsZSBhcyBzb29uIGFzIGl0J3MgY3JlYXRlZC4KKworICAgICAgICAqIHBsYXRmb3JtL2dy YXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjp+TWVkaWFQbGF5ZXJQcml2 YXRlR1N0cmVhbWVyKTogU3RvcCBsaXN0ZW5pbmcgdG8gZWxlbWVudC1hZGRlZC4KKyAgICAgICAg KFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6dXJpRGVjb2RlQmluRWxlbWVu dEFkZGVkQ2FsbGJhY2spOiBMb29rIGZvciBHc3REb3dubG9hZEJ1ZmZlci4KKyAgICAgICAgKFdl YkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6ZG93bmxvYWRCdWZmZXJGaWxlQ3Jl YXRlZENhbGxiYWNrKTogUmVtb3ZlIHRoZSBmaWxlIGFmdGVyIGNyZWF0aW9uLgorICAgICAgICAo V2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjpwdXJnZU9sZERvd25sb2FkRmls ZXMpOiBEZWxldGUgbGVnYWN5IGZpbGVzLgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQ cml2YXRlR1N0cmVhbWVyOjpzb3VyY2VDaGFuZ2VkKTogTGlzdGVuIHRvIGVsZW1lbnQtYWRkZWQg c2lnbmFscyBvbiBHc3RVcmlEZWNvZGVCaW4uCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mv Z3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5oOiBOZXcgcmVmZXJlbmNlIHRv IEdzdERvd25sb2FkQnVmZmVyLgorCiAyMDE3LTAxLTIzICBKb3NlcGggUGVjb3Jhcm8gIDxwZWNv cmFyb0BhcHBsZS5jb20+CiAKICAgICAgICAgUmVtb3ZlIGFsbG93V2luZG93T3BlbldpdGhvdXRV c2VyR2VzdHVyZSBzZXR0aW5nCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmNwcCBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVH U3RyZWFtZXIuY3BwCmluZGV4IGYwM2YyNGY0ZmU4YjJiYTNhMjY2NWFjNTZmODg5ZWZmMGNmZDZi OTcuLjAxZjA0NjY2NWFmZmYzNDcyZjBhYmE0N2ZmNWExOTY4NGU0YWZjYjMgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclBy aXZhdGVHU3RyZWFtZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIuY3BwCkBAIC0yOCw2ICsyOCw3 IEBACiAKICNpZiBFTkFCTEUoVklERU8pICYmIFVTRShHU1RSRUFNRVIpCiAKKyNpbmNsdWRlICJG aWxlU3lzdGVtLmgiCiAjaW5jbHVkZSAiR1N0cmVhbWVyVXRpbGl0aWVzLmgiCiAjaW5jbHVkZSAi VVJMLmgiCiAjaW5jbHVkZSAiTUlNRVR5cGVSZWdpc3RyeS5oIgpAQCAtMzcsNiArMzgsNyBAQAog I2luY2x1ZGUgIlNlY3VyaXR5T3JpZ2luLmgiCiAjaW5jbHVkZSAiVGltZVJhbmdlcy5oIgogI2lu Y2x1ZGUgIldlYktpdFdlYlNvdXJjZUdTdHJlYW1lci5oIgorI2luY2x1ZGUgPGdsaWIuaD4KICNp bmNsdWRlIDxnc3QvZ3N0Lmg+CiAjaW5jbHVkZSA8Z3N0L3BidXRpbHMvbWlzc2luZy1wbHVnaW5z Lmg+CiAjaW5jbHVkZSA8bGltaXRzPgpAQCAtMTk4LDYgKzIwMCw5IEBAIE1lZGlhUGxheWVyUHJp dmF0ZUdTdHJlYW1lcjo6fk1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcigpCiAgICAgICAgIG1f bWVkaWFMb2NhdGlvbnMgPSAwOwogICAgIH0KIAorICAgIGlmIChXRUJLSVRfSVNfV0VCX1NSQyht X3NvdXJjZS5nZXQoKSkpCisgICAgICAgIGdfc2lnbmFsX2hhbmRsZXJzX2Rpc2Nvbm5lY3RfYnlf ZnVuYyhHU1RfRUxFTUVOVF9QQVJFTlQobV9zb3VyY2UuZ2V0KCkpLCByZWludGVycHJldF9jYXN0 PGdwb2ludGVyPih1cmlEZWNvZGVCaW5FbGVtZW50QWRkZWRDYWxsYmFjayksIHRoaXMpOworCiAg ICAgaWYgKG1fYXV0b0F1ZGlvU2luaykKICAgICAgICAgZ19zaWduYWxfaGFuZGxlcnNfZGlzY29u bmVjdF9ieV9mdW5jKEdfT0JKRUNUKG1fYXV0b0F1ZGlvU2luay5nZXQoKSksCiAgICAgICAgICAg ICByZWludGVycHJldF9jYXN0PGdwb2ludGVyPihzZXRBdWRpb1N0cmVhbVByb3BlcnRpZXNDYWxs YmFjayksIHRoaXMpOwpAQCAtMTM0MCwxMyArMTM0NSw3NCBAQCB2b2lkIE1lZGlhUGxheWVyUHJp dmF0ZUdTdHJlYW1lcjo6c291cmNlQ2hhbmdlZENhbGxiYWNrKE1lZGlhUGxheWVyUHJpdmF0ZUdT dHJlYQogICAgIHBsYXllci0+c291cmNlQ2hhbmdlZCgpOwogfQogCit2b2lkIE1lZGlhUGxheWVy UHJpdmF0ZUdTdHJlYW1lcjo6dXJpRGVjb2RlQmluRWxlbWVudEFkZGVkQ2FsbGJhY2soR3N0Qmlu KiBiaW4sIEdzdEVsZW1lbnQqIGVsZW1lbnQsIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lciog cGxheWVyKQoreworICAgIGlmIChnX3N0cmNtcDAoR19PQkpFQ1RfQ0xBU1NfTkFNRShHX09CSkVD VF9HRVRfQ0xBU1MoR19PQkpFQ1QoZWxlbWVudCkpKSwgIkdzdERvd25sb2FkQnVmZmVyIikpCisg ICAgICAgIHJldHVybjsKKworICAgIHBsYXllci0+bV9kb3dubG9hZEJ1ZmZlciA9IGVsZW1lbnQ7 CisgICAgZ19zaWduYWxfaGFuZGxlcnNfZGlzY29ubmVjdF9ieV9mdW5jKGJpbiwgcmVpbnRlcnBy ZXRfY2FzdDxncG9pbnRlcj4odXJpRGVjb2RlQmluRWxlbWVudEFkZGVkQ2FsbGJhY2spLCBwbGF5 ZXIpOworICAgIGdfc2lnbmFsX2Nvbm5lY3Rfc3dhcHBlZChlbGVtZW50LCAibm90aWZ5Ojp0ZW1w LWxvY2F0aW9uIiwgR19DQUxMQkFDSyhkb3dubG9hZEJ1ZmZlckZpbGVDcmVhdGVkQ2FsbGJhY2sp LCBwbGF5ZXIpOworCisgICAgR1VuaXF1ZU91dFB0cjxjaGFyPiBvbGREb3dubG9hZFRlbXBsYXRl OworICAgIGdfb2JqZWN0X2dldChlbGVtZW50LCAidGVtcC10ZW1wbGF0ZSIsICZvbGREb3dubG9h ZFRlbXBsYXRlLm91dFB0cigpLCBudWxscHRyKTsKKworICAgIEdVbmlxdWVQdHI8Y2hhcj4gbmV3 RG93bmxvYWRUZW1wbGF0ZShnX2J1aWxkX2ZpbGVuYW1lKEdfRElSX1NFUEFSQVRPUl9TLCAidmFy IiwgInRtcCIsICJXZWJLaXQtTWVkaWEtWFhYWFhYIiwgbnVsbHB0cikpOworICAgIGdfb2JqZWN0 X3NldChlbGVtZW50LCAidGVtcC10ZW1wbGF0ZSIsIG5ld0Rvd25sb2FkVGVtcGxhdGUuZ2V0KCks IG51bGxwdHIpOworICAgIEdTVF9UUkFDRSgiUmVjb25maWd1cmVkIGZpbGUgZG93bmxvYWQgdGVt cGxhdGUgZnJvbSAnJXMnIHRvICclcyciLCBvbGREb3dubG9hZFRlbXBsYXRlLmdldCgpLCBuZXdE b3dubG9hZFRlbXBsYXRlLmdldCgpKTsKKworICAgIHBsYXllci0+cHVyZ2VPbGREb3dubG9hZEZp bGVzKG9sZERvd25sb2FkVGVtcGxhdGUuZ2V0KCkpOworfQorCit2b2lkIE1lZGlhUGxheWVyUHJp dmF0ZUdTdHJlYW1lcjo6ZG93bmxvYWRCdWZmZXJGaWxlQ3JlYXRlZENhbGxiYWNrKE1lZGlhUGxh eWVyUHJpdmF0ZUdTdHJlYW1lciogcGxheWVyKQoreworICAgIEFTU0VSVChwbGF5ZXItPm1fZG93 bmxvYWRCdWZmZXIpOworCisgICAgZ19zaWduYWxfaGFuZGxlcnNfZGlzY29ubmVjdF9ieV9mdW5j KHBsYXllci0+bV9kb3dubG9hZEJ1ZmZlci5nZXQoKSwgcmVpbnRlcnByZXRfY2FzdDxncG9pbnRl cj4oZG93bmxvYWRCdWZmZXJGaWxlQ3JlYXRlZENhbGxiYWNrKSwgcGxheWVyKTsKKworICAgIEdV bmlxdWVPdXRQdHI8Y2hhcj4gZG93bmxvYWRGaWxlOworICAgIGdfb2JqZWN0X2dldChwbGF5ZXIt Pm1fZG93bmxvYWRCdWZmZXIuZ2V0KCksICJ0ZW1wLWxvY2F0aW9uIiwgJmRvd25sb2FkRmlsZS5v dXRQdHIoKSwgbnVsbHB0cik7CisgICAgcGxheWVyLT5tX2Rvd25sb2FkQnVmZmVyID0gbnVsbHB0 cjsKKworICAgIGlmIChVTkxJS0VMWSghZGVsZXRlRmlsZShkb3dubG9hZEZpbGUuZ2V0KCkpKSkg eworICAgICAgICBHU1RfV0FSTklORygiQ291bGRuJ3QgdW5saW5rIG1lZGlhIHRlbXBvcmFyeSBm aWxlICVzIGFmdGVyIGNyZWF0aW9uIiwgZG93bmxvYWRGaWxlLmdldCgpKTsKKyAgICAgICAgcmV0 dXJuOworICAgIH0KKworICAgIEdTVF9UUkFDRSgiVW5saW5rZWQgbWVkaWEgdGVtcG9yYXJ5IGZp bGUgJXMgYWZ0ZXIgY3JlYXRpb24iLCBkb3dubG9hZEZpbGUuZ2V0KCkpOworfQorCit2b2lkIE1l ZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6cHVyZ2VPbGREb3dubG9hZEZpbGVzKGNvbnN0IGNo YXIqIGRvd25sb2FkRmlsZVRlbXBsYXRlKQoreworICAgIGlmICghZG93bmxvYWRGaWxlVGVtcGxh dGUpCisgICAgICAgIHJldHVybjsKKworICAgIEdVbmlxdWVQdHI8Y2hhcj4gdGVtcGxhdGVQYXRo KGdfcGF0aF9nZXRfZGlybmFtZShkb3dubG9hZEZpbGVUZW1wbGF0ZSkpOworICAgIEdVbmlxdWVQ dHI8Y2hhcj4gdGVtcGxhdGVGaWxlKGdfcGF0aF9nZXRfYmFzZW5hbWUoZG93bmxvYWRGaWxlVGVt cGxhdGUpKTsKKyAgICBTdHJpbmcgdGVtcGxhdGVQYXR0ZXJuID0gU3RyaW5nKHRlbXBsYXRlRmls ZS5nZXQoKSkucmVwbGFjZSgiWCIsICI/Iik7CisKKyAgICBmb3IgKGF1dG8mIGZpbGVQYXRoIDog bGlzdERpcmVjdG9yeSh0ZW1wbGF0ZVBhdGguZ2V0KCksIHRlbXBsYXRlUGF0dGVybikpIHsKKyAg ICAgICAgaWYgKFVOTElLRUxZKCFkZWxldGVGaWxlKGZpbGVQYXRoKSkpIHsKKyAgICAgICAgICAg IEdTVF9XQVJOSU5HKCJDb3VsZG4ndCB1bmxpbmsgbGVnYWN5IG1lZGlhIHRlbXBvcmFyeSBmaWxl OiAlcyIsIGZpbGVQYXRoLnV0ZjgoKS5kYXRhKCkpOworICAgICAgICAgICAgY29udGludWU7Cisg ICAgICAgIH0KKworICAgICAgICBHU1RfVFJBQ0UoIlVubGlua2VkIGxlZ2FjeSBtZWRpYSB0ZW1w b3JhcnkgZmlsZTogJXMiLCBmaWxlUGF0aC51dGY4KCkuZGF0YSgpKTsKKyAgICB9Cit9CisKIHZv aWQgTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjpzb3VyY2VDaGFuZ2VkKCkKIHsKKyAgICBp ZiAoV0VCS0lUX0lTX1dFQl9TUkMobV9zb3VyY2UuZ2V0KCkpKQorICAgICAgICBnX3NpZ25hbF9o YW5kbGVyc19kaXNjb25uZWN0X2J5X2Z1bmMoR1NUX0VMRU1FTlRfUEFSRU5UKG1fc291cmNlLmdl dCgpKSwgcmVpbnRlcnByZXRfY2FzdDxncG9pbnRlcj4odXJpRGVjb2RlQmluRWxlbWVudEFkZGVk Q2FsbGJhY2spLCB0aGlzKTsKKwogICAgIG1fc291cmNlLmNsZWFyKCk7CiAgICAgZ19vYmplY3Rf Z2V0KG1fcGlwZWxpbmUuZ2V0KCksICJzb3VyY2UiLCAmbV9zb3VyY2Uub3V0UHRyKCksIG51bGxw dHIpOwogCi0gICAgaWYgKFdFQktJVF9JU19XRUJfU1JDKG1fc291cmNlLmdldCgpKSkKKyAgICBp ZiAoV0VCS0lUX0lTX1dFQl9TUkMobV9zb3VyY2UuZ2V0KCkpKSB7CiAgICAgICAgIHdlYktpdFdl YlNyY1NldE1lZGlhUGxheWVyKFdFQktJVF9XRUJfU1JDKG1fc291cmNlLmdldCgpKSwgbV9wbGF5 ZXIpOworICAgICAgICBnX3NpZ25hbF9jb25uZWN0KEdTVF9FTEVNRU5UX1BBUkVOVChtX3NvdXJj ZS5nZXQoKSksICJlbGVtZW50LWFkZGVkIiwgR19DQUxMQkFDSyh1cmlEZWNvZGVCaW5FbGVtZW50 QWRkZWRDYWxsYmFjayksIHRoaXMpOworICAgIH0KIH0KIAogdm9pZCBNZWRpYVBsYXllclByaXZh dGVHU3RyZWFtZXI6OmNhbmNlbExvYWQoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5oIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJp dmF0ZUdTdHJlYW1lci5oCmluZGV4IDI3YTYxOThmMzMzMjllYTQ4OWMxMmU4YWUyZjg0NDFmZDFi NWQ1Y2EuLmEzNGMyOTAyNTA0MmJmZDAxNDZhOGU1YmM3NTA0MWE4Mzk0ZjZkZmIgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXll clByaXZhdGVHU3RyZWFtZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmgKQEAgLTE2OCw2ICsxNjgs MTAgQEAgcHJpdmF0ZToKICAgICBib29sIGRpZFBhc3NDT1JTQWNjZXNzQ2hlY2soKSBjb25zdCBv dmVycmlkZTsKICAgICBib29sIGNhblNhdmVNZWRpYURhdGEoKSBjb25zdCBvdmVycmlkZTsKIAor ICAgIHZvaWQgcHVyZ2VPbGREb3dubG9hZEZpbGVzKGNvbnN0IGNoYXIqKTsKKyAgICBzdGF0aWMg dm9pZCB1cmlEZWNvZGVCaW5FbGVtZW50QWRkZWRDYWxsYmFjayhHc3RCaW4qLCBHc3RFbGVtZW50 KiwgTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyKik7CisgICAgc3RhdGljIHZvaWQgZG93bmxv YWRCdWZmZXJGaWxlQ3JlYXRlZENhbGxiYWNrKE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lciop OworCiBwcm90ZWN0ZWQ6CiAgICAgdm9pZCBjYWNoZUR1cmF0aW9uKCk7CiAKQEAgLTI0Miw2ICsy NDYsNyBAQCBwcml2YXRlOgogICAgIHN0ZDo6dW5pcXVlX3B0cjxBdWRpb1NvdXJjZVByb3ZpZGVy R1N0cmVhbWVyPiBtX2F1ZGlvU291cmNlUHJvdmlkZXI7CiAjZW5kaWYKICAgICBHUmVmUHRyPEdz dEVsZW1lbnQ+IG1fYXV0b0F1ZGlvU2luazsKKyAgICBHUmVmUHRyPEdzdEVsZW1lbnQ+IG1fZG93 bmxvYWRCdWZmZXI7CiAgICAgUmVmUHRyPE1lZGlhUGxheWVyUmVxdWVzdEluc3RhbGxNaXNzaW5n UGx1Z2luc0NhbGxiYWNrPiBtX21pc3NpbmdQbHVnaW5zQ2FsbGJhY2s7CiAjaWYgRU5BQkxFKFZJ REVPX1RSQUNLKQogICAgIFZlY3RvcjxSZWZQdHI8QXVkaW9UcmFja1ByaXZhdGVHU3RyZWFtZXI+ PiBtX2F1ZGlvVHJhY2tzOwo=