218519 2020-11-03 09:06:39 -0800 [WPE][GTK] Can't paste image data (like image/png) from the clipboard in WebKit browsers 2025-10-21 06:37:12 -0700 1 1 1 Unclassified WebKit Platform WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 miikka.veijonen mcatanzaro achristensen bugs-noreply cgarcia lwbaqueros mcatanzaro nazifts nekohayo peter.bittner prodrigestivill sonny ttys3.rust webkit-bug-importer woodlxf00 youennf oldest_to_newest 1704025 0 miikka.veijonen 2020-11-03 09:06:39 -0800 I'm unable to paste any images from my clipboard into browser windows using WebKitGtk (like Epiphany or WebKitGtk MiniBrowser). I've verified that the data certainly is in the clipboard because following commands: xclip -selection clipboard -t image/png -o > image.png xclip -selection clipboard -t image/bmp -o > image.bmp outputs proper bitmap or PNG files. And I'm also able to paste the data in Gimp, Firefox, LibreOffice and Chromium. Only the WebKitGtk based browser does not work properly so I assume the problem is with my WebKitGtk. I compiled webkitgtk-2.30.2 and Epiphany from git (2020-10-29) manually but the problem still exists in Epiphany and in the MiniBrowser. Could there be some library I'm missing or something? I found one bug that could relate: https://bugs.webkit.org/show_bug.cgi?id=211519 but in there there is broken image area when the data has been pasted. With my problem the browser does nothing when I hit Ctrl+V (like in chat/email window or in imgur.com). I compiled WebKitGtk with the following arguments: cmake .. -DCMAKE_BUILD_TYPE=Release -DPORT=GTK -DENABLE_MINIBROWSER=ON -DCMAKE_EXE_LINKER_FLAGS="-Wl,--as-needed -Wl,-z,now -pthread" -DCMAKE_MODULE_LINKER_FLAGS="-Wl,--as-needed -Wl,-z,now -pthread" -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed -Wl,-z,now -pthread" -DUSE_WOFF2=false -DENABLE_MEDIA_SOURCE=OFF -DPYTHON_EXECUTABLE=/usr/bin/python3: -- Enabled features: -- ENABLE_ACCELERATED_2D_CANVAS .................. OFF -- ENABLE_BUBBLEWRAP_SANDBOX ON -- ENABLE_DRAG_SUPPORT ........................... ON -- ENABLE_GLES2 OFF -- ENABLE_GRAPHICS_CONTEXT_GL .................... ON -- ENABLE_GTKDOC OFF -- ENABLE_INTROSPECTION .......................... ON -- ENABLE_MEDIA_SOURCE OFF -- ENABLE_MINIBROWSER ............................ ON -- ENABLE_QUARTZ_TARGET OFF -- ENABLE_SHAREABLE_RESOURCE ..................... ON -- ENABLE_SPELLCHECK ON -- ENABLE_TOUCH_EVENTS ........................... ON -- ENABLE_VIDEO ON -- ENABLE_WAYLAND_TARGET ......................... ON -- ENABLE_WEBDRIVER ON -- ENABLE_WEB_AUDIO .............................. ON -- ENABLE_WEB_CRYPTO ON -- ENABLE_X11_TARGET ............................. ON -- USE_GTK4 OFF -- USE_LIBHYPHEN ................................. ON -- USE_LIBNOTIFY ON -- USE_LIBSECRET ................................. ON -- USE_OPENJPEG ON -- USE_SYSTEMD ................................... ON -- USE_WOFF2 false -- USE_WPE_RENDERER .............................. ON -- Configuring done -- Generating done Distro: openSUSE Leap 15.2 DE: KDE/Plasma 5.18.5 1705162 1 cgarcia 2020-11-06 01:07:17 -0800 Could you try pasting to MiniBrowser started with -e (editor mode). I guess this is on xorg? 1708266 2 miikka.veijonen 2020-11-17 09:37:18 -0800 Yes, it's Xorg I'm using. In the editor mode the pasting of image data from the clipboard works! I also created a separate bug report to Epiphany but it wasn't correct place to submit that: https://gitlab.gnome.org/GNOME/epiphany/-/issues/1388 I've also noticed that pasting works on Evolution email client when I'm writing/composing email. I can embed images from clipboard directly into email. Way to reproduce: Select and copy some image data from Gimp into clipboard for example, in Epiphany go to imgur.com and create new post, hit CTRL+V: nothing happens. If I do this in Chromium or Firefox the browser delivers the image data to imgur and the new post gets created. 1710566 3 miikka.veijonen 2020-11-30 04:21:42 -0800 Is there anything I should try? I've been able to reproduce this on openSUSE 15.2 Leap and on Debian testing (Bullseye). 1712830 4 miikka.veijonen 2020-12-08 10:37:38 -0800 Bump! 1719594 5 sonny 2021-01-14 08:04:08 -0800 I ran some tests Everything works fine on MiniBrowser -e (both Wayland and Xorg) However, on non-editable context it is broken on both Wayland and Xorg. The paste event https://w3c.github.io/clipboard-apis/#clipboard-event-paste is emitted with a DataTransferItemList length of 0. I used https://codepen.io/tmrDevelops/pen/YxGQaW to reproduce. To clarify, file:// pasting works fine - only pasting [Image] data is broken. 1719597 6 sonny 2021-01-14 08:15:26 -0800 Actually a much better test case is to run window.addEventListener('paste', function(e){ console.log(e.clipboardData.items.length) }); in the JavaScript console and then paste data. Both on editable and non-editable contexts it logs 0 when pasting [Image]. 1719620 7 miikka.veijonen 2021-01-14 09:20:28 -0800 Hi Sonny! Thanks, I'm glad to hear that someone else was able to reproduce this. So I can be sure that it does not happen only with my setup. 1721133 8 cgarcia 2021-01-21 05:33:37 -0800 I can reproduce it now. I don't think this is specific to the GTK port. DataTransfer::items() only returns items that are considered to be safe for DOM, see: bool Pasteboard::isSafeTypeForDOMToReadAndWrite(const String& type) { return type == "text/plain" || type == "text/html" || type == "text/uri-list"; } So, images are not allowed. I don't know if that's WebKit specific or part of a spec, though. 1721489 9 miikka.veijonen 2021-01-21 22:11:55 -0800 Thanks Carlos. I tried to modify that particular code in Source/WebCore/platform/Pasteboard.cpp: bool Pasteboard::isSafeTypeForDOMToReadAndWrite(const String& type) { return type == "text/plain" || type == "text/html" || type == "text/uri-list"; } to: bool Pasteboard::isSafeTypeForDOMToReadAndWrite(const String& type) { return type == "text/plain" || type == "text/html" || type == "text/uri-list" || type == "image/apng" || type == "image/avif" || type == "image/gif" || type == "image/jpeg" || type == "image/png" || type == "image/svg+xml" || type == "image/webp"; } And built the WebKitGtk but that didn't fix this issue at least (still unable to paste any image data from the clipboard into WebKit MiniBrowser or Epiphany). Could this issue be related to these changes?: https://webkit.org/blog/8170/clipboard-api-improvements/ https://webkit.org/blog/10855/async-clipboard-api/ What do you think, should I move this issue to some other Component or create completely new issue and ref to this? 1721490 10 miikka.veijonen 2021-01-21 22:18:14 -0800 Actually I found also something interesting from the file: Source/WebCore/Modules/async-clipboard/Clipboard.cpp: if (type == "text/uri-list"_s) { String title; resultAsString = activePasteboard().readURL(itemIndex, title).string(); } if (type == "text/plain"_s) { PasteboardPlainText plainTextReader; activePasteboard().read(plainTextReader, PlainTextURLReadingPolicy::IgnoreURL, itemIndex); resultAsString = WTFMove(plainTextReader.text); } if (type == "text/html"_s) { WebContentMarkupReader markupReader { *frame }; activePasteboard().read(markupReader, WebContentReadingPolicy::OnlyRichTextTypes, itemIndex); resultAsString = WTFMove(markupReader.markup); } // FIXME: Support reading custom data. if (updateSessionValidity() == SessionIsValid::No || resultAsString.isNull()) { promise->reject(NotAllowedError); return; } Could that be related to this issue? 1721492 11 miikka.veijonen 2021-01-21 22:43:32 -0800 And this: File: Source/WebCore/platform/gtk/PasteboardGtk.cpp: void Pasteboard::read(PasteboardPlainText& text, PlainTextURLReadingPolicy, Optional<size_t>): static const ASCIILiteral imageTypes[] = { "image/png"_s, "image/jpeg"_s, "image/gif"_s, "image/bmp"_s, "image/vnd.microsoft.icon"_s, "image/x-icon"_s }; for (const auto& imageType : imageTypes) { if (types.contains(imageType)) { auto buffer = platformStrategies()->pasteboardStrategy()->readBufferFromClipboard(m_name, imageType); if (!buffer->isEmpty() && reader.readImage(buffer.releaseNonNull(), imageType)) return; } } 1721507 12 cgarcia 2021-01-22 00:41:05 -0800 What is probably failing after allowing images is getAsFile(), I don't know why that should work for images, but it's returning null I'm afraid. 1727447 13 miikka.veijonen 2021-02-10 00:20:03 -0800 Should I move this bug report from WebKitGTK Component to something else? 1766323 14 miikka.veijonen 2021-06-03 02:05:38 -0700 Hmm, is there any progress with this? I think all of my WebKit based browsers on Linux are lacking the support of pasting images from the clipboard because of this issue? 1775977 15 ttys3.rust 2021-07-09 06:25:23 -0700 I already found a way to fix up this, and it works good. Need sometime to figure out how to create a patch, seems that submit a patch to webkit is a little bit difficult to me. (I mean, in github I only need one click and submit the Pull Request) 1775994 16 mcatanzaro 2021-07-09 07:54:00 -0700 Hi, there are guidelines for contributing patches here: https://webkit.org/contributing-code/ It would also be good to mention what exactly you've discovered.... 1776205 17 miikka.veijonen 2021-07-11 02:34:49 -0700 (In reply to 荒野無燈 from comment #15) > I already found a way to fix up this, and it works good. Need sometime to > figure out how to create a patch, seems that submit a patch to webkit is a > little bit difficult to me. (I mean, in github I only need one click and > submit the Pull Request) Sounds good! Could you please share the patch somewhere so I can test it too? 1776208 18 433288 ttys3.rust 2021-07-11 06:33:22 -0700 Created attachment 433288 fix: fallback to readBufferFromClipboard if readFilePathsFromClipboard get no files, this fix makes ctrl + v paste image under GTK works in Source/WebCore/dom/DataTransfer.cpp DataTransfer::filesFromPasteboardAndItemList ```cpp WebCorePasteboardFileReader reader(context); m_pasteboard->read(reader); files = WTFMove(reader.files); ``` it only calls `void Pasteboard::read(PasteboardFileReader& reader, std::optional<size_t>)`, and `Pasteboard::read(PasteboardWebContentReader& reader, WebContentReadingPolicy policy, std::optional<size_t>)` got no chances, so the image data dit not got read. this patch is a workaround to fixup the problem (tested under webkitgtk 2.32.0 and 2.32.1). by patching `void Pasteboard::read(PasteboardFileReader& reader, std::optional<size_t>)`, and call `WebCorePasteboardFileReader::readBuffer`, we can make `DataTransferItem::getAsFile()` get the image file data. 1776209 19 ttys3.rust 2021-07-11 06:39:53 -0700 I have some working builds if you need quick verify if it works. ----------------------------------------------------------- libwebkit2gtk-4.0-37_2.32.0 for Ubuntu 20.04.2: curl -LO https://github.com/ttys3/lark-for-linux/releases/download/v0.9.4/libwebkit2gtk-4.0-37_2.32.0-patched-ubuntu-20.04.2-deb.tar.xz tar xvf libwebkit2gtk-4.0-37_2.32.0-patched-ubuntu-20.04.2-deb.tar.xz cd libwebkit2gtk-4.0-37_2.32.0* sudo apt install -y --allow-downgrades ./*.deb use https://github.com/ttys3/lark-for-linux/releases/download/v0.9.4/libwebkit2gtk-4.0-37_2.32.0-patched-ubuntu-21.04-gnome40-deb.tar.xz if you are Ubuntu 21.04 and has GNOME 40 installed. ------------------------------------------------------------- download and install https://github.com/ttys3/lark-for-linux/releases/download/v0.9.4/webkit2gtk-2.32.1-1-x86_64.pkg.tar.zst if you are a ArchLinux user. 1776211 20 mcatanzaro 2021-07-11 07:13:50 -0700 (In reply to 荒野無燈 from comment #18) > Created attachment 433288 [details] > fix: fallback to readBufferFromClipboard if readFilePathsFromClipboard get > no files, this fix makes ctrl + v paste image under GTK works I have no doubt that it works, but that can't be the correct fix. readFilePathsFromClipboard should do what it says, not more. I haven't looked closely, but you might be one level too far down from the right place to fix this. 1776212 21 ttys3.rust 2021-07-11 07:46:57 -0700 (In reply to Michael Catanzaro from comment #20) > (In reply to 荒野無燈 from comment #18) > > Created attachment 433288 [details] > > fix: fallback to readBufferFromClipboard if readFilePathsFromClipboard get > > no files, this fix makes ctrl + v paste image under GTK works > > I have no doubt that it works, but that can't be the correct fix. > readFilePathsFromClipboard should do what it says, not more. I haven't > looked closely, but you might be one level too far down from the right place > to fix this. Thanks for the quick reply. I think you are right, this is not a correct fix. I'm not familiar with the WebKit code at all. And I'm just a normal user which wait the correct patch for about 8 months or maybe longer. I can not do further investigation to finish the right patch. And hope someone will continue the work. Thank you all guys. 1776291 22 miikka.veijonen 2021-07-12 04:48:05 -0700 (In reply to 荒野無燈 from comment #18) > Created attachment 433288 [details] > fix: fallback to readBufferFromClipboard if readFilePathsFromClipboard get > no files, this fix makes ctrl + v paste image under GTK works > > in Source/WebCore/dom/DataTransfer.cpp > DataTransfer::filesFromPasteboardAndItemList > > ```cpp > WebCorePasteboardFileReader reader(context); > m_pasteboard->read(reader); > files = WTFMove(reader.files); > ``` > > it only calls `void Pasteboard::read(PasteboardFileReader& reader, > std::optional<size_t>)`, > > and `Pasteboard::read(PasteboardWebContentReader& reader, > WebContentReadingPolicy policy, std::optional<size_t>)` got no chances, so > the image data dit not got read. > > this patch is a workaround to fixup the problem (tested under webkitgtk > 2.32.0 and 2.32.1). > > by patching `void Pasteboard::read(PasteboardFileReader& reader, > std::optional<size_t>)`, and call > `WebCorePasteboardFileReader::readBuffer`, we can make > `DataTransferItem::getAsFile()` get the image file data. Thanks. I applied the patch you linked (https://bugs.webkit.org/attachment.cgi?id=433288&action=diff) against webkitgtk 2.32.2 and the compiled it and then compiled Epiphany 40.2 against that webkitgtk build but pasting image data from the clipboard still does not work for me. Is this https://bugs.webkit.org/attachment.cgi?id=433288&action=diff enough or should I apply something else too? Waht do you mean with this: "by patching `void Pasteboard::read(PasteboardFileReader& reader, std::optional<size_t>)`, and call `WebCorePasteboardFileReader::readBuffer`, we can make `DataTransferItem::getAsFile()` get the image file data."? 1776305 23 ttys3.rust 2021-07-12 06:30:08 -0700 (In reply to Miikka from comment #22) > (In reply to 荒野無燈 from comment #18) > > Created attachment 433288 [details] > > fix: fallback to readBufferFromClipboard if readFilePathsFromClipboard get > > no files, this fix makes ctrl + v paste image under GTK works > > > > in Source/WebCore/dom/DataTransfer.cpp > > DataTransfer::filesFromPasteboardAndItemList > > > > ```cpp > > WebCorePasteboardFileReader reader(context); > > m_pasteboard->read(reader); > > files = WTFMove(reader.files); > > ``` > > > > it only calls `void Pasteboard::read(PasteboardFileReader& reader, > > std::optional<size_t>)`, > > > > and `Pasteboard::read(PasteboardWebContentReader& reader, > > WebContentReadingPolicy policy, std::optional<size_t>)` got no chances, so > > the image data dit not got read. > > > > this patch is a workaround to fixup the problem (tested under webkitgtk > > 2.32.0 and 2.32.1). > > > > by patching `void Pasteboard::read(PasteboardFileReader& reader, > > std::optional<size_t>)`, and call > > `WebCorePasteboardFileReader::readBuffer`, we can make > > `DataTransferItem::getAsFile()` get the image file data. > > Thanks. I applied the patch you linked > (https://bugs.webkit.org/attachment.cgi?id=433288&action=diff) against > webkitgtk 2.32.2 and the compiled it and then compiled Epiphany 40.2 against > that webkitgtk build but pasting image data from the clipboard still does > not work for me. > > Is this https://bugs.webkit.org/attachment.cgi?id=433288&action=diff enough > or should I apply something else too? Waht do you mean with this: "by > patching `void Pasteboard::read(PasteboardFileReader& reader, > std::optional<size_t>)`, and call > `WebCorePasteboardFileReader::readBuffer`, we can make > `DataTransferItem::getAsFile()` get the image file data."? just use this patch will works fine. please note that this patch does not related to GNOME Web browser Epiphany. I compared from webkitgtk-2.32.0 to webkitgtk-2.32.2, the `Source/WebCore/platform/gtk/PasteboardGtk.cpp` file are all the same, I tested the patch under webkitgtk 2.32.0 and 2.32.1, so I do think it should works for 2.32.2 by the way, I use this page (thanks Sonny Piers) to test: https://codepen.io/tmrDevelops/pen/YxGQaW and I also tested it under Epiphany 40.1 on Ubuntu 21.04 (https://i.ibb.co/FXhhSYZ/Epiphany-40-1-on-Ubuntu-21-042021-07-12-21-07.png), and Epiphany Technology Preview 41.alpha-4-g70730e4dd+ does not work. but I recommend you not to verify the patch via Epiphany browser, this will introduce more variable. Using a simple code (in your favorite lang) to create a webview, then loading the page: https://codepen.io/tmrDevelops/pen/YxGQaW and then see if it works. In my situation, I use the WebKitGtk lib via https://github.com/gtk-rs/webkit2gtk-rs hope this will help you. 1797859 24 mcatanzaro 2021-09-28 06:12:57 -0700 *** Bug 211519 has been marked as a duplicate of this bug. *** 1824051 25 miikka.veijonen 2021-12-14 10:50:09 -0800 (In reply to 荒野無燈 from comment #23) > (In reply to Miikka from comment #22) > > (In reply to 荒野無燈 from comment #18) > > > Created attachment 433288 [details] > > > fix: fallback to readBufferFromClipboard if readFilePathsFromClipboard get > > > no files, this fix makes ctrl + v paste image under GTK works > > > > > > in Source/WebCore/dom/DataTransfer.cpp > > > DataTransfer::filesFromPasteboardAndItemList > > > > > > ```cpp > > > WebCorePasteboardFileReader reader(context); > > > m_pasteboard->read(reader); > > > files = WTFMove(reader.files); > > > ``` > > > > > > it only calls `void Pasteboard::read(PasteboardFileReader& reader, > > > std::optional<size_t>)`, > > > > > > and `Pasteboard::read(PasteboardWebContentReader& reader, > > > WebContentReadingPolicy policy, std::optional<size_t>)` got no chances, so > > > the image data dit not got read. > > > > > > this patch is a workaround to fixup the problem (tested under webkitgtk > > > 2.32.0 and 2.32.1). > > > > > > by patching `void Pasteboard::read(PasteboardFileReader& reader, > > > std::optional<size_t>)`, and call > > > `WebCorePasteboardFileReader::readBuffer`, we can make > > > `DataTransferItem::getAsFile()` get the image file data. > > > > Thanks. I applied the patch you linked > > (https://bugs.webkit.org/attachment.cgi?id=433288&action=diff) against > > webkitgtk 2.32.2 and the compiled it and then compiled Epiphany 40.2 against > > that webkitgtk build but pasting image data from the clipboard still does > > not work for me. > > > > Is this https://bugs.webkit.org/attachment.cgi?id=433288&action=diff enough > > or should I apply something else too? Waht do you mean with this: "by > > patching `void Pasteboard::read(PasteboardFileReader& reader, > > std::optional<size_t>)`, and call > > `WebCorePasteboardFileReader::readBuffer`, we can make > > `DataTransferItem::getAsFile()` get the image file data."? > > just use this patch will works fine. > > please note that this patch does not related to GNOME Web browser Epiphany. > > I compared from webkitgtk-2.32.0 to webkitgtk-2.32.2, the > `Source/WebCore/platform/gtk/PasteboardGtk.cpp` file are all the same, > I tested the patch under webkitgtk 2.32.0 and 2.32.1, so I do think it > should works for 2.32.2 > > by the way, I use this page (thanks Sonny Piers) to test: > https://codepen.io/tmrDevelops/pen/YxGQaW > > and I also tested it under Epiphany 40.1 on Ubuntu 21.04 > (https://i.ibb.co/FXhhSYZ/Epiphany-40-1-on-Ubuntu-21-042021-07-12-21-07.png), > and Epiphany Technology Preview 41.alpha-4-g70730e4dd+ does not work. but I > recommend you not to verify the patch via Epiphany browser, this will > introduce more variable. > > Using a simple code (in your favorite lang) to create a webview, then > loading the page: https://codepen.io/tmrDevelops/pen/YxGQaW and then see if > it works. > > In my situation, I use the WebKitGtk lib via > https://github.com/gtk-rs/webkit2gtk-rs > > hope this will help you. Yes, I tested this by using the WebKit4GTK MiniBrowser now (/usr/lib/x86_64-linux-gnu/webkit2gtk-4.0/MiniBrowser) and the image data pasting works there (both in normal and in editor mode: --editor-mode). But in other WebKit based browsers, like Epiphany it still does not work :( 1824205 26 ttys3.rust 2021-12-14 18:14:22 -0800 (In reply to Miikka from comment #25) > (In reply to 荒野無燈 from comment #23) > > (In reply to Miikka from comment #22) > > Yes, I tested this by using the WebKit4GTK MiniBrowser now > (/usr/lib/x86_64-linux-gnu/webkit2gtk-4.0/MiniBrowser) and the image data > pasting works there (both in normal and in editor mode: --editor-mode). But > in other WebKit based browsers, like Epiphany it still does not work :( I have binary build for ArchLinux ( if you are using), I use it for my everyday work. it is here: https://github.com/ttys3/archlinux-webkit2gtk/releases/tag/v2.34.2-1 1824268 27 miikka.veijonen 2021-12-15 00:20:17 -0800 (In reply to 荒野無燈 from comment #26) > I use it for my everyday work. it is here: > https://github.com/ttys3/archlinux-webkit2gtk/releases/tag/v2.34.2-1 Thanks. I assume you're using this with webkit2gtk-rs where your patch is working, right? But does it work with Gnome Epiphany or other modern/GUI WebKitGTK browser? Have you tested? 1824279 28 ttys3.rust 2021-12-15 01:20:26 -0800 (In reply to Miikka from comment #27) > (In reply to 荒野無燈 from comment #26) > > I use it for my everyday work. it is here: > > https://github.com/ttys3/archlinux-webkit2gtk/releases/tag/v2.34.2-1 > > Thanks. I assume you're using this with webkit2gtk-rs where your patch is > working, right? But does it work with Gnome Epiphany or other modern/GUI > WebKitGTK browser? Have you tested? No. you are totally wrong. I tested with all, works like a charm. including Web 41.0 (Powered by WebKitGTK 2.34.2), yes it is what your ref "Gnome Epiphany" Michael Catanzaro also confirmed that this patch will work. The problem is not it work or not work. It is because this patch is fixing the issue in way which maybe not elegant enough. 1827218 29 miikka.veijonen 2021-12-30 00:26:17 -0800 (In reply to 荒野無燈 from comment #28) > > No. you are totally wrong. I tested with all, works like a charm. > > including Web 41.0 (Powered by WebKitGTK 2.34.2), yes it is what your ref > "Gnome Epiphany" > > Michael Catanzaro also confirmed that this patch will work. > > The problem is not it work or not work. > > It is because this patch is fixing the issue in way which maybe not elegant > enough. Yes, you were right! I had some time now to test and verify this by compiling the WebKitGTK v2.34.3 (with your patches included: https://github.com/ttys3/archlinux-webkit2gtk/tree/main/gtk4.0) and Gnome Web (Epiphany web browser) v3.38.4 on my Debian 11 box and the pasting of images (like PNGs and JPEGs) works now on Gnome Web browser as well. 1950413 30 mcatanzaro 2023-04-21 10:29:39 -0700 *** Bug 255505 has been marked as a duplicate of this bug. *** 2114476 31 peter.bittner 2025-05-01 12:48:38 -0700 I'm confused: I found and reported this bug today on GNOME's issue tracker, for GNOME Web 47.3.1 (WebKitGTK 2.48.1, Streamer 1.26.0, GTK 4.16.12, Libadwaita 1.6.4). The latest comments by 荒野無燈 and Miikka from mid december 2021, roughly 3½ years ago, claim that a fix for the bug was successfully tested with GNOME Web 41.0 (WebKitGTK 2.34.2). Why is the bug still present in GNOME Web today? 2114496 32 mcatanzaro 2025-05-01 13:54:24 -0700 I rejected the proposed fix in comment #20. Somebody just needs to look at this a bit closer. 2114497 33 mcatanzaro 2025-05-01 14:05:35 -0700 My rejection reason isn't even correct, since readFilePathsFromClipboard is not actually modified at all. The patch only touches one of the Pasteboard::read implementations, the one handling file data. So this was actually on the right track, but instead of handling only hardcoded image types, it looks like we should do something similar to the PasteboardCocoa.mm implementation of Pasteboard::read, the one with the PasteboardFileReader parameter. Instead of processing a hardcoded list of MIME types, we should call PasteboardFileReader::shouldReadBuffer to decide if the MIME type we've received is supported, and if so then we can call Pasteboard::readBuffer. Currently the code does this: if (reader.shouldReadBuffer("image/png"_s)) { if (auto buffer = readBuffer(index, "image/png"_s)) reader.readBuffer({ }, { }, buffer.releaseNonNull()); } which should be deleted (from both PasteboardGTK.cpp and PasteboardWPE.cpp). Coincidentally, I asked about this last week in https://github.com/WebKit/WebKit/pull/44409#discussion_r2058824633. It was added after this patch was submitted and it's basically a worse version of what this patch was proposing to do, supporting only one MIME type instead of several. 2115929 34 mcatanzaro 2025-05-08 12:01:56 -0700 I spent some time on this today and am attaching an updated patch, but I'm not submitting it as a pull request because I'm unable to reproduce the original problem so I don't actually understand what I'm "fixing." I can paste PNG and JPEG images into every web page I've tested that accepts images: gitlab.gnome.org, docs.google.com, and even Miikka's test page https://codepen.io/tmrDevelops/pen/YxGQaW. I'm not too surprised, because the Pasteboard::read overload that takes a PasteboardWebContentReader did not require any changes. But I also tried pasting file URIs from nautilus, and even then, JPEG images get pasted just fine... I would have expected only PNG to work. So I assume this was mostly fixed sometime in the past few years. Hi Peter, since you commented here most recently: any chance you have a test page I can use to reproduce the problem you're encountering? Ideally one that does not require logging into a user account. 2115930 35 475171 mcatanzaro 2025-05-08 12:02:47 -0700 Created attachment 475171 Patch 2115935 36 peter.bittner 2025-05-08 12:34:08 -0700 Michael, my test page is bug report on GNOME's GitLab instance. https://gitlab.gnome.org/GNOME/epiphany/-/issues/2660#note_2435144 You commented there that you can paste an image when the rich editor mode is active. The image will be visible after being pasted, it doesn't get uploaded, though. Consequently, it won't be saved. Hence, the JavaScript-powered rich text editor has the same problem as the plain text editor. You can verify this behavior on any GitLab instance, including Gitlab.com. With Firefox and Chromium browsers images pasted from the clipboard will be uploaded, whether you use the plain text or rich text editor mode. With GNOME Web (on my NixOS box) this will consistently not work. 2115938 37 mcatanzaro 2025-05-08 12:47:00 -0700 I think paste is working properly and you're hitting some other bug. Feel free to create a new bug report (here on WebKit Bugzilla) for this problem. 2116049 38 ttys3.rust 2025-05-08 21:14:08 -0700 (In reply to Michael Catanzaro from comment #34) > I spent some time on this today and am attaching an updated patch, but I'm > not submitting it as a pull request because I'm unable to reproduce the > original problem so I don't actually understand what I'm "fixing." I can > paste PNG and JPEG images into every web page I've tested that accepts > images: gitlab.gnome.org, docs.google.com, and even Miikka's test page > https://codepen.io/tmrDevelops/pen/YxGQaW. I'm not too surprised, because > the Pasteboard::read overload that takes a PasteboardWebContentReader did > not require any changes. But I also tried pasting file URIs from nautilus, > and even then, JPEG images get pasted just fine... I would have expected > only PNG to work. So I assume this was mostly fixed sometime in the past few > years. > > Hi Peter, since you commented here most recently: any chance you have a test > page I can use to reproduce the problem you're encountering? Ideally one > that does not require logging into a user account. you can reproduce via Miikka's test page https://codepen.io/tmrDevelops/pen/YxGQaW , if you do screenshot and try paste things to the page. copy from GNOME file manager and the paste will work, because it is `file:///` . but for image data in the clipboard, it is image data. for example, install flameshot (https://github.com/flameshot-org/flameshot) and use hot key to do screenshot (then the image will in clipboard). then try to paste the screenshot to Miikka's test page. you will see nothing got pasted. 2116051 39 ttys3.rust 2025-05-08 21:25:48 -0700 (In reply to Michael Catanzaro from comment #34) > I spent some time on this today and am attaching an updated patch, but I'm > not submitting it as a pull request because I'm unable to reproduce the > original problem so I don't actually understand what I'm "fixing." I can > paste PNG and JPEG images into every web page I've tested that accepts > images: gitlab.gnome.org, docs.google.com, and even Miikka's test page > https://codepen.io/tmrDevelops/pen/YxGQaW. I'm not too surprised, because > the Pasteboard::read overload that takes a PasteboardWebContentReader did > not require any changes. But I also tried pasting file URIs from nautilus, > and even then, JPEG images get pasted just fine... I would have expected > only PNG to work. So I assume this was mostly fixed sometime in the past few > years. > > Hi Peter, since you commented here most recently: any chance you have a test > page I can use to reproduce the problem you're encountering? Ideally one > that does not require logging into a user account. and Michael, At the same time, I would like to point out that this bug only exists in the older way of clipboard reading images. For code using the newer Async Clipboard API （https://webkit.org/blog/10855/async-clipboard-api/）, webkitgtk does not have this bug. I have a demo here https://codepen.io/ttys3/pen/gbbdzdb, you can see that pasting images works well with the existing GNOME Web (Epiphany browser). 2150044 40 mcatanzaro 2025-10-10 12:50:18 -0700 OK, thanks to Mikka's patch, Sonny's codepen, and critical guidance from 荒野無燈, I was able to find a solution. Thanks to you all for helping. Sorry it took 5 years, but better late than never. :) 2150046 41 mcatanzaro 2025-10-10 13:01:42 -0700 Pull request: https://github.com/WebKit/WebKit/pull/52136 2152965 42 ews-feeder 2025-10-21 06:36:35 -0700 Committed 301877@main (d7d1107bc9b6): <https://commits.webkit.org/301877@main> Reviewed commits have been landed. Closing PR #52136 and removing active labels. 2152966 43 webkit-bug-importer 2025-10-21 06:37:12 -0700 <rdar://problem/163112783> 433288 2021-07-11 06:33:22 -0700 2021-07-12 07:39:35 -0700 fix: fallback to readBufferFromClipboard if readFilePathsFromClipboard get no files, this fix makes ctrl + v paste image under GTK works PasteboardGtk.patch text/plain 1604 ttys3.rust Y29tbWl0IDNmOGVhZjc0ZmU5ODkwNGVkN2QzMzA1YTA2YTc2NDdlODI0ZTE3NjEKQXV0aG9yOiDo jZLph47nhKHnh4ggPHR0eXMzLnJ1c3RAZ21haWwuY29tPgpEYXRlOiAgIFN1biBKdWwgMTEgMjE6 MTU6NTggMjAyMSArMDgwMAoKICAgIGZpeDogZmFsbGJhY2sgdG8gcmVhZEJ1ZmZlckZyb21DbGlw Ym9hcmQgaWYgcmVhZEZpbGVQYXRoc0Zyb21DbGlwYm9hcmQgZ2V0IG5vIGZpbGVzLCB0aGlzIGZp eCBtYWtlcyBjdHJsICsgdiBwYXN0ZSBpbWFnZSB1bmRlciBHVEsgd29ya3MKICAgIAogICAgUmVm czogaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxODUxOQoKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9QYXN0ZWJvYXJkR3RrLmNwcCBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9QYXN0ZWJvYXJkR3RrLmNwcAppbmRleCAwMTNjNzAw YmU3Li5iNjhjNmZlNzFiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ndGsv UGFzdGVib2FyZEd0ay5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL1Bhc3Rl Ym9hcmRHdGsuY3BwCkBAIC0zMjMsNiArMzIzLDIwIEBAIHZvaWQgUGFzdGVib2FyZDo6cmVhZChQ YXN0ZWJvYXJkRmlsZVJlYWRlciYgcmVhZGVyLCBzdGQ6Om9wdGlvbmFsPHNpemVfdD4pCiAgICAg YXV0byBmaWxlUGF0aHMgPSBwbGF0Zm9ybVN0cmF0ZWdpZXMoKS0+cGFzdGVib2FyZFN0cmF0ZWd5 KCktPnJlYWRGaWxlUGF0aHNGcm9tQ2xpcGJvYXJkKG1fbmFtZSk7CiAgICAgZm9yIChjb25zdCBh dXRvJiBmaWxlUGF0aCA6IGZpbGVQYXRocykKICAgICAgICAgcmVhZGVyLnJlYWRGaWxlbmFtZShm aWxlUGF0aCk7CisKKyAgICBpZiAoZmlsZVBhdGhzLmlzRW1wdHkoKSkgeworICAgICAgICBhdXRv IHR5cGVzID0gcGxhdGZvcm1TdHJhdGVnaWVzKCktPnBhc3RlYm9hcmRTdHJhdGVneSgpLT50eXBl cyhtX25hbWUpOworICAgICAgICBzdGF0aWMgY29uc3QgQVNDSUlMaXRlcmFsIGltYWdlVHlwZXNb XSA9IHsgImltYWdlL3BuZyJfcywgImltYWdlL2pwZWciX3MsICJpbWFnZS9naWYiX3MsICJpbWFn ZS9ibXAiX3MsICJpbWFnZS92bmQubWljcm9zb2Z0Lmljb24iX3MsICJpbWFnZS94LWljb24iX3Mg fTsKKyAgICAgICAgZm9yIChjb25zdCBhdXRvJiBpbWFnZVR5cGUgOiBpbWFnZVR5cGVzKSB7Cisg ICAgICAgICAgICBpZiAodHlwZXMuY29udGFpbnMoaW1hZ2VUeXBlKSkgeworICAgICAgICAgICAg ICAgIGF1dG8gYnVmZmVyID0gcGxhdGZvcm1TdHJhdGVnaWVzKCktPnBhc3RlYm9hcmRTdHJhdGVn eSgpLT5yZWFkQnVmZmVyRnJvbUNsaXBib2FyZChtX25hbWUsIGltYWdlVHlwZSk7CisgICAgICAg ICAgICAgICAgaWYgKCFidWZmZXItPmlzRW1wdHkoKSkgeworICAgICAgICAgICAgICAgICAgICBy ZWFkZXIucmVhZEJ1ZmZlcihpbWFnZVR5cGUsIGltYWdlVHlwZSwgYnVmZmVyLnJlbGVhc2VOb25O dWxsKCkpOworICAgICAgICAgICAgICAgICAgICByZXR1cm47CisgICAgICAgICAgICAgICAgfQor ICAgICAgICAgICAgfQorICAgICAgICB9CisgICAgfQogfQogCiBib29sIFBhc3RlYm9hcmQ6Omhh c0RhdGEoKQo= 475171 2025-05-08 12:02:47 -0700 2025-05-08 12:02:47 -0700 Patch patch text/plain 6264 mcatanzaro ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Bhc3RlYm9hcmQuY3BwIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vUGFzdGVib2FyZC5jcHAKaW5kZXggYzNlZGI1YmMxYjY5Li4w NTI3MWVkMTAyZTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Bhc3RlYm9h cmQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Bhc3RlYm9hcmQuY3BwCkBAIC02 MywyMSArNjMsMTUgQEAgVmVjdG9yPFN0cmluZz4gUGFzdGVib2FyZDo6cmVhZEFsbFN0cmluZ3Mo Y29uc3QgU3RyaW5nJiB0eXBlKQogCiBzdGQ6Om9wdGlvbmFsPFZlY3RvcjxQYXN0ZWJvYXJkSXRl bUluZm8+PiBQYXN0ZWJvYXJkOjphbGxQYXN0ZWJvYXJkSXRlbUluZm8oKSBjb25zdAogewotI2lm IFBMQVRGT1JNKENPQ09BKSB8fCBQTEFURk9STShHVEspCiAgICAgaWYgKGF1dG8qIHN0cmF0ZWd5 ID0gcGxhdGZvcm1TdHJhdGVnaWVzKCktPnBhc3RlYm9hcmRTdHJhdGVneSgpKQogICAgICAgICBy ZXR1cm4gc3RyYXRlZ3ktPmFsbFBhc3RlYm9hcmRJdGVtSW5mbyhuYW1lKCksIG1fY2hhbmdlQ291 bnQsIGNvbnRleHQoKSk7Ci0jZW5kaWYKICAgICByZXR1cm4gc3RkOjpudWxsb3B0OwogfQogCiBz dGQ6Om9wdGlvbmFsPFBhc3RlYm9hcmRJdGVtSW5mbz4gUGFzdGVib2FyZDo6cGFzdGVib2FyZEl0 ZW1JbmZvKHNpemVfdCBpbmRleCkgY29uc3QKIHsKLSNpZiBQTEFURk9STShDT0NPQSkgfHwgUExB VEZPUk0oR1RLKQogICAgIGlmIChhdXRvKiBzdHJhdGVneSA9IHBsYXRmb3JtU3RyYXRlZ2llcygp LT5wYXN0ZWJvYXJkU3RyYXRlZ3koKSkKICAgICAgICAgcmV0dXJuIHN0cmF0ZWd5LT5pbmZvcm1h dGlvbkZvckl0ZW1BdEluZGV4KGluZGV4LCBuYW1lKCksIG1fY2hhbmdlQ291bnQsIGNvbnRleHQo KSk7Ci0jZWxzZQotICAgIFVOVVNFRF9QQVJBTShpbmRleCk7Ci0jZW5kaWYKICAgICByZXR1cm4g c3RkOjpudWxsb3B0OwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n dGsvUGFzdGVib2FyZEd0ay5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvUGFzdGVi b2FyZEd0ay5jcHAKaW5kZXggZDJjNTU0Nzg0OTU4Li40YTM4Y2U1OWZhNGMgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9QYXN0ZWJvYXJkR3RrLmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvUGFzdGVib2FyZEd0ay5jcHAKQEAgLTI2MSw2ICsyNjEs MjkgQEAgdm9pZCBQYXN0ZWJvYXJkOjpzZXREcmFnSW1hZ2UoRHJhZ0ltYWdlLCBjb25zdCBJbnRQ b2ludCYpCiB9CiAjZW5kaWYKIAorc3RhdGljIHN0ZDo6YXJyYXk8QVNDSUlMaXRlcmFsLCA2PiBp bWFnZVR5cGVzKCkKK3sKKyAgICBzdGF0aWMgc3RkOjphcnJheTxBU0NJSUxpdGVyYWwsIDY+IHR5 cGVzID0geyAiaW1hZ2UvcG5nIl9zLCAiaW1hZ2UvanBlZyJfcywgImltYWdlL2dpZiJfcywgImlt YWdlL2JtcCJfcywgImltYWdlL3ZuZC5taWNyb3NvZnQuaWNvbiJfcywgImltYWdlL3gtaWNvbiJf cyB9OworICAgIHJldHVybiB0eXBlczsKK30KKworc3RhdGljIEFTQ0lJTGl0ZXJhbCBpbWFnZVR5 cGVUb0Zha2VGaWxlbmFtZShjb25zdCBBU0NJSUxpdGVyYWwmIHR5cGUpCit7CisgICAgaWYgKHR5 cGUgPT0gImltYWdlL3BuZyJfcykKKyAgICAgICAgcmV0dXJuICJpbWFnZS5wbmciX3M7CisgICAg aWYgKHR5cGUgPT0gImltYWdlL2pwZWciX3MpCisgICAgICAgIHJldHVybiAiaW1hZ2UuanBlZyJf czsKKyAgICBpZiAodHlwZSA9PSAiaW1hZ2UvZ2lmIl9zKQorICAgICAgICByZXR1cm4gImltYWdl LmdpZiJfczsKKyAgICBpZiAodHlwZSA9PSAiaW1hZ2UvYm1wIl9zKQorICAgICAgICByZXR1cm4g ImltYWdlLmJtcCJfczsKKyAgICBpZiAodHlwZSA9PSAiaW1hZ2Uvdm5kLm1pY3Jvc29mdC5pY29u Il9zIHx8IHR5cGUgPT0gImltYWdlL3gtaWNvbiJfcykKKyAgICAgICAgcmV0dXJuICJpbWFnZS5p Y28iX3M7CisKKyAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKKyAgICByZXR1cm4geyB9OworfQor CiB2b2lkIFBhc3RlYm9hcmQ6OnJlYWQoUGFzdGVib2FyZFBsYWluVGV4dCYgdGV4dCwgUGxhaW5U ZXh0VVJMUmVhZGluZ1BvbGljeSwgc3RkOjpvcHRpb25hbDxzaXplX3Q+KQogewogICAgIHRleHQu dGV4dCA9IHBsYXRmb3JtU3RyYXRlZ2llcygpLT5wYXN0ZWJvYXJkU3RyYXRlZ3koKS0+cmVhZFRl eHRGcm9tQ2xpcGJvYXJkKG1fbmFtZSwgInRleHQvcGxhaW4iX3MpOwpAQCAtMjk2LDggKzMxOSw3 IEBAIHZvaWQgUGFzdGVib2FyZDo6cmVhZChQYXN0ZWJvYXJkV2ViQ29udGVudFJlYWRlciYgcmVh ZGVyLCBXZWJDb250ZW50UmVhZGluZ1BvbGljCiAgICAgaWYgKHBvbGljeSA9PSBXZWJDb250ZW50 UmVhZGluZ1BvbGljeTo6T25seVJpY2hUZXh0VHlwZXMpCiAgICAgICAgIHJldHVybjsKIAotICAg IHN0YXRpYyBjb25zdCBBU0NJSUxpdGVyYWwgaW1hZ2VUeXBlc1tdID0geyAiaW1hZ2UvcG5nIl9z LCAiaW1hZ2UvanBlZyJfcywgImltYWdlL2dpZiJfcywgImltYWdlL2JtcCJfcywgImltYWdlL3Zu ZC5taWNyb3NvZnQuaWNvbiJfcywgImltYWdlL3gtaWNvbiJfcyB9OwotICAgIGZvciAoY29uc3Qg YXV0byYgaW1hZ2VUeXBlIDogaW1hZ2VUeXBlcykgeworICAgIGZvciAoY29uc3QgYXV0byYgaW1h Z2VUeXBlIDogaW1hZ2VUeXBlcygpKSB7CiAgICAgICAgIGlmICh0eXBlcy5jb250YWlucyhpbWFn ZVR5cGUpKSB7CiAgICAgICAgICAgICBhdXRvIGJ1ZmZlciA9IHBsYXRmb3JtU3RyYXRlZ2llcygp LT5wYXN0ZWJvYXJkU3RyYXRlZ3koKS0+cmVhZEJ1ZmZlckZyb21DbGlwYm9hcmQobV9uYW1lLCBp bWFnZVR5cGUpOwogICAgICAgICAgICAgaWYgKCFidWZmZXItPmlzRW1wdHkoKSAmJiByZWFkZXIu cmVhZEltYWdlKGJ1ZmZlci5yZWxlYXNlTm9uTnVsbCgpLCBpbWFnZVR5cGUpKQpAQCAtMzMzLDkg KzM1NSwyNiBAQCB2b2lkIFBhc3RlYm9hcmQ6OnJlYWQoUGFzdGVib2FyZEZpbGVSZWFkZXImIHJl YWRlciwgc3RkOjpvcHRpb25hbDxzaXplX3Q+IGluZGV4KQogICAgICAgICByZXR1cm47CiAgICAg fQogCi0gICAgaWYgKHJlYWRlci5zaG91bGRSZWFkQnVmZmVyKCJpbWFnZS9wbmciX3MpKSB7Ci0g ICAgICAgIGlmIChhdXRvIGJ1ZmZlciA9IHJlYWRCdWZmZXIoaW5kZXgsICJpbWFnZS9wbmciX3Mp KQotICAgICAgICAgICAgcmVhZGVyLnJlYWRCdWZmZXIoeyB9LCB7IH0sIGJ1ZmZlci5yZWxlYXNl Tm9uTnVsbCgpKTsKKyAgICBhdXRvIHJlYWRCdWZmZXJBdEluZGV4ID0gWyZdKHNpemVfdCBpdGVt SW5kZXgpIHsKKyAgICAgICAgZm9yIChjb25zdCBhdXRvJiBpbWFnZVR5cGUgOiBpbWFnZVR5cGVz KCkpIHsKKyAgICAgICAgICAgIGlmICghcmVhZGVyLnNob3VsZFJlYWRCdWZmZXIoaW1hZ2VUeXBl KSkKKyAgICAgICAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAgICAgIGF1dG8gYnVmZmVyID0g cmVhZEJ1ZmZlcihpdGVtSW5kZXgsIGltYWdlVHlwZSk7CisgICAgICAgICAgICBpZiAoYnVmZmVy KSB7CisgICAgICAgICAgICAgICAgcmVhZGVyLnJlYWRCdWZmZXIoaW1hZ2VUeXBlVG9GYWtlRmls ZW5hbWUoaW1hZ2VUeXBlKSwgaW1hZ2VUeXBlLCBidWZmZXIucmVsZWFzZU5vbk51bGwoKSk7Cisg ICAgICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAgICB9CisgICAgICAgIH0KKyAgICB9Owor CisgICAgaWYgKGluZGV4KSB7CisgICAgICAgIHJlYWRCdWZmZXJBdEluZGV4KCppbmRleCk7Cisg ICAgICAgIHJldHVybjsKKyAgICB9CisKKyAgICBpZiAoYXV0byBhbGxJbmZvID0gYWxsUGFzdGVi b2FyZEl0ZW1JbmZvKCkpIHsKKyAgICAgICAgZm9yIChzaXplX3QgaXRlbUluZGV4ID0gMDsgaXRl bUluZGV4IDwgYWxsSW5mby0+c2l6ZSgpOyArK2l0ZW1JbmRleCkKKyAgICAgICAgICAgIHJlYWRC dWZmZXJBdEluZGV4KGl0ZW1JbmRleCk7CiAgICAgfQogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS93cGUvUGFzdGVib2FyZFdQRS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS93cGUvUGFzdGVib2FyZFdQRS5jcHAKaW5kZXggYzA4NDdhODRlNGFlLi5lMTU1OGUw MmNkYjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3dwZS9QYXN0ZWJvYXJk V1BFLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS93cGUvUGFzdGVib2FyZFdQRS5j cHAKQEAgLTEyMiw2ICsxMjIsMjkgQEAgYm9vbCBQYXN0ZWJvYXJkOjpjYW5TbWFydFJlcGxhY2Uo KQogICAgIHJldHVybiBmYWxzZTsKIH0KIAorc3RhdGljIHN0ZDo6YXJyYXk8QVNDSUlMaXRlcmFs LCA2PiBpbWFnZVR5cGVzKCkKK3sKKyAgICBzdGF0aWMgc3RkOjphcnJheTxBU0NJSUxpdGVyYWws IDY+IHR5cGVzID0geyAiaW1hZ2UvcG5nIl9zLCAiaW1hZ2UvanBlZyJfcywgImltYWdlL2dpZiJf cywgImltYWdlL2JtcCJfcywgImltYWdlL3ZuZC5taWNyb3NvZnQuaWNvbiJfcywgImltYWdlL3gt aWNvbiJfcyB9OworICAgIHJldHVybiB0eXBlczsKK30KKworc3RhdGljIEFTQ0lJTGl0ZXJhbCBp bWFnZVR5cGVUb0Zha2VGaWxlbmFtZShjb25zdCBBU0NJSUxpdGVyYWwmIHR5cGUpCit7CisgICAg aWYgKHR5cGUgPT0gImltYWdlL3BuZyJfcykKKyAgICAgICAgcmV0dXJuICJpbWFnZS5wbmciX3M7 CisgICAgaWYgKHR5cGUgPT0gImltYWdlL2pwZWciX3MpCisgICAgICAgIHJldHVybiAiaW1hZ2Uu anBlZyJfczsKKyAgICBpZiAodHlwZSA9PSAiaW1hZ2UvZ2lmIl9zKQorICAgICAgICByZXR1cm4g ImltYWdlLmdpZiJfczsKKyAgICBpZiAodHlwZSA9PSAiaW1hZ2UvYm1wIl9zKQorICAgICAgICBy ZXR1cm4gImltYWdlLmJtcCJfczsKKyAgICBpZiAodHlwZSA9PSAiaW1hZ2Uvdm5kLm1pY3Jvc29m dC5pY29uIl9zIHx8IHR5cGUgPT0gImltYWdlL3gtaWNvbiJfcykKKyAgICAgICAgcmV0dXJuICJp bWFnZS5pY28iX3M7CisKKyAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKKyAgICByZXR1cm4geyB9 OworfQorCiB2b2lkIFBhc3RlYm9hcmQ6OnJlYWQoUGFzdGVib2FyZFBsYWluVGV4dCYgdGV4dCwg UGxhaW5UZXh0VVJMUmVhZGluZ1BvbGljeSwgc3RkOjpvcHRpb25hbDxzaXplX3Q+KQogewogICAg IHRleHQudGV4dCA9IHBsYXRmb3JtU3RyYXRlZ2llcygpLT5wYXN0ZWJvYXJkU3RyYXRlZ3koKS0+ cmVhZFRleHRGcm9tQ2xpcGJvYXJkKG1fbmFtZSwgInRleHQvcGxhaW47Y2hhcnNldD11dGYtOCJf cyk7CkBAIC0xNzgsOSArMjAxLDI2IEBAIHZvaWQgUGFzdGVib2FyZDo6cmVhZChQYXN0ZWJvYXJk RmlsZVJlYWRlciYgcmVhZGVyLCBzdGQ6Om9wdGlvbmFsPHNpemVfdD4gaW5kZXgpCiAgICAgICAg IHJldHVybjsKICAgICB9CiAKLSAgICBpZiAocmVhZGVyLnNob3VsZFJlYWRCdWZmZXIoImltYWdl L3BuZyJfcykpIHsKLSAgICAgICAgaWYgKGF1dG8gYnVmZmVyID0gcmVhZEJ1ZmZlcihpbmRleCwg ImltYWdlL3BuZyJfcykpCi0gICAgICAgICAgICByZWFkZXIucmVhZEJ1ZmZlcih7IH0sIHsgfSwg YnVmZmVyLnJlbGVhc2VOb25OdWxsKCkpOworICAgIGF1dG8gcmVhZEJ1ZmZlckF0SW5kZXggPSBb Jl0oc2l6ZV90IGl0ZW1JbmRleCkgeworICAgICAgICBmb3IgKGNvbnN0IGF1dG8mIGltYWdlVHlw ZSA6IGltYWdlVHlwZXMoKSkgeworICAgICAgICAgICAgaWYgKCFyZWFkZXIuc2hvdWxkUmVhZEJ1 ZmZlcihpbWFnZVR5cGUpKQorICAgICAgICAgICAgICAgIGNvbnRpbnVlOworICAgICAgICAgICAg YXV0byBidWZmZXIgPSByZWFkQnVmZmVyKGl0ZW1JbmRleCwgaW1hZ2VUeXBlKTsKKyAgICAgICAg ICAgIGlmIChidWZmZXIpIHsKKyAgICAgICAgICAgICAgICByZWFkZXIucmVhZEJ1ZmZlcihpbWFn ZVR5cGVUb0Zha2VGaWxlbmFtZShpbWFnZVR5cGUpLCBpbWFnZVR5cGUsIGJ1ZmZlci5yZWxlYXNl Tm9uTnVsbCgpKTsKKyAgICAgICAgICAgICAgICBicmVhazsKKyAgICAgICAgICAgIH0KKyAgICAg ICAgfQorICAgIH07CisKKyAgICBpZiAoaW5kZXgpIHsKKyAgICAgICAgcmVhZEJ1ZmZlckF0SW5k ZXgoKmluZGV4KTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKworICAgIGlmIChhdXRvIGFsbElu Zm8gPSBhbGxQYXN0ZWJvYXJkSXRlbUluZm8oKSkgeworICAgICAgICBmb3IgKHNpemVfdCBpdGVt SW5kZXggPSAwOyBpdGVtSW5kZXggPCBhbGxJbmZvLT5zaXplKCk7ICsraXRlbUluZGV4KQorICAg ICAgICAgICAgcmVhZEJ1ZmZlckF0SW5kZXgoaXRlbUluZGV4KTsKICAgICB9CiB9CiAK