aboutsummaryrefslogtreecommitdiff
path: root/src/scintilla.patch
diff options
context:
space:
mode:
Diffstat (limited to 'src/scintilla.patch')
-rw-r--r--src/scintilla.patch14
1 files changed, 14 insertions, 0 deletions
diff --git a/src/scintilla.patch b/src/scintilla.patch
index 74fba967..deeefcc1 100644
--- a/src/scintilla.patch
+++ b/src/scintilla.patch
@@ -3,6 +3,7 @@ Scintilla changes:
* Add Message::ChangeInsertion for programmatically setting input method.
This is helpful on newer versions of macOS, where changing the input method is flaky.
* Handle leading whitespace in XPM images in order to prevent crashes.
+* Fixed crash in upstream Scintilla that will ultimately be fixed.
diff -r 52d56f79dc0f gtk/ScintillaGTK.cxx
--- a/gtk/ScintillaGTK.cxx Fri Apr 09 15:11:26 2021 +1000
@@ -32,3 +33,16 @@ diff -r 22b6bbb36280 src/XPM.cxx
if ((0 == memcmp(textForm, "/* X", 4)) && (0 == memcmp(textForm, "/* XPM */", 9))) {
// Build the lines form out of the text form
std::vector<const char *> linesForm = LinesFormFromTextForm(textForm);
+diff -r beeb51d2c645 gtk/ScintillaGTK.cxx
+--- a/gtk/ScintillaGTK.cxx Wed Sep 29 10:29:58 2021 +1000
++++ b/gtk/ScintillaGTK.cxx Thu Sep 30 16:28:06 2021 -0400
+@@ -282,9 +282,6 @@
+ if (settingsHandlerId) {
+ g_signal_handler_disconnect(settings, settingsHandlerId);
+ }
+- if (settings) {
+- g_object_unref(settings);
+- }
+ }
+
+ void ScintillaGTK::RealizeThis(GtkWidget *widget) {