Home Explore 引导页 在线工具 Blog
Register Sign In
Pchen0
/
electron
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Tree: b13f05e2dc
Branches Tags
electron
/
patches
/
chromium
/
add_ui_scopedcliboardwriter_writeunsaferawdata.patch

add_ui_scopedcliboardwriter_writeunsaferawdata.patch 2.0 KB
History Raw

123456789101112131415161718192021222324252627282930313233343536373839404142434445 
  1. From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
    2. 

  2. From: Henri Torgemane <[email protected]>
    3. 

  3. Date: Thu, 23 Sep 2021 21:30:33 -0500
    4. 

  4. Subject: add ui::ScopedCliboardWriter::WriteUnsafeRawData
    5. 

  5. 

  6. This restores some ability to write to the clipboard using raw formats, which
    7. 

  7. was removed as part of the Raw Clipboard API scrubbing.
    8. 

  8. https://bugs.chromium.org/p/chromium/issues/detail?id=1217643
    9. 

  9. 

  10. diff --git a/ui/base/clipboard/scoped_clipboard_writer.cc b/ui/base/clipboard/scoped_clipboard_writer.cc
    11. 

  11. index fd162a607424bd4d0b324ccc7270522eb3b6a991..df1d5564a52ef67b447bbc222ceb1f864eb3dd81 100644
    12. 

  12. --- a/ui/base/clipboard/scoped_clipboard_writer.cc
    13. 

  13. +++ b/ui/base/clipboard/scoped_clipboard_writer.cc
    14. 

  14. @@ -230,6 +230,16 @@ void ScopedClipboardWriter::WriteData(std::u16string_view format,
    15. 

  15.    }
    16. 

  16.  }
    17. 

  17.  
    18. 

  18. +void ScopedClipboardWriter::WriteUnsafeRawData(const std::u16string& format,
    19. 

  19. +                                               mojo_base::BigBuffer data) {
    20. 

  20. +  static constexpr int kMaxRegisteredFormats = 100;
    21. 

  21. +  if (counter_ >= kMaxRegisteredFormats)
    22. 

  22. +    return;
    23. 

  23. +  counter_++;
    24. 

  24. +  platform_representations_.push_back(
    25. 

  25. +      {base::UTF16ToUTF8(format), std::move(data)});
    26. 

  26. +}
    27. 

  27. +
    28. 

  28.  void ScopedClipboardWriter::Reset() {
    29. 

  29.    objects_.clear();
    30. 

  30.    raw_objects_.clear();
    31. 

  31. diff --git a/ui/base/clipboard/scoped_clipboard_writer.h b/ui/base/clipboard/scoped_clipboard_writer.h
    32. 

  32. index d8fd611e88c22f2c1319da769dcd14cc218f9c90..f17304e1e9fd202dc4e1b7724031dc4c333a4baf 100644
    33. 

  33. --- a/ui/base/clipboard/scoped_clipboard_writer.h
    34. 

  34. +++ b/ui/base/clipboard/scoped_clipboard_writer.h
    35. 

  35. @@ -87,6 +87,10 @@ class COMPONENT_EXPORT(UI_BASE_CLIPBOARD) ScopedClipboardWriter {
    36. 

  36.    // This is only used to write custom format data.
    37. 

  37.    void WriteData(std::u16string_view format, mojo_base::BigBuffer data);
    38. 

  38.  
    39. 

  39. +  // write raw (non-pickled) data to the clipboard
    40. 

  40. +  void WriteUnsafeRawData(const std::u16string& format,
    41. 

  41. +                          mojo_base::BigBuffer data);
    42. 

  42. +
    43. 

  43.    void WriteImage(const SkBitmap& bitmap);
    44. 

  44.  
    45. 

  45.    // Mark the data to be written as confidential.
    46.