From 2c8fc5ca728c4b55dc2cc3c07ecf9b585b1de9b2 Mon Sep 17 00:00:00 2001
From: Just van Rossum <justvanrossum@gmail.com>
Date: Wed, 1 Apr 2020 17:02:03 +0200
Subject: [PATCH] Fix crash in message API (#39)

* if a method was used for the message callback, uharfbuzz would crash, as it didn't keep a reference to the callback.
---
 src/uharfbuzz/_harfbuzz.pyx |  3 +++
 tests/test_uharfbuzz.py     | 15 +++++++++++++++
 2 files changed, 18 insertions(+)

diff --git a/src/uharfbuzz/_harfbuzz.pyx b/src/uharfbuzz/_harfbuzz.pyx
index 654062f..8384e9f 100644
--- a/src/uharfbuzz/_harfbuzz.pyx
+++ b/src/uharfbuzz/_harfbuzz.pyx
@@ -77,11 +77,13 @@ cdef class GlyphPosition:
 
 cdef class Buffer:
     cdef hb_buffer_t* _hb_buffer
+    cdef object _message_callback
 
     def __cinit__(self):
         self._hb_buffer = hb_buffer_create()
         if not hb_buffer_allocation_successful(self._hb_buffer):
             raise MemoryError()
+        self._message_callback = None
 
     def __dealloc__(self):
         if self._hb_buffer is not NULL:
@@ -238,6 +240,7 @@ cdef class Buffer:
         hb_buffer_guess_segment_properties(self._hb_buffer)
 
     def set_message_func(self, callback) -> None:
+        self._message_callback = callback
         hb_buffer_set_message_func(self._hb_buffer, msgcallback, <void*>callback, NULL)
 
 
diff --git a/tests/test_uharfbuzz.py b/tests/test_uharfbuzz.py
index cb122ef..fe80be3 100644
--- a/tests/test_uharfbuzz.py
+++ b/tests/test_uharfbuzz.py
@@ -232,6 +232,21 @@ def message(msg):
         assert advances_trace == [[0, 0, 0, 0, 0], [0, 0, 0, 0, 0],
                                   [0, 0, 0, 0, 0], [0, 0, 0, 100, 0]]
 
+    def test_message_func_crash(self, blankfont):
+        string = "edcba"
+        buf = hb.Buffer()
+        buf.add_str(string)
+        buf.guess_segment_properties()
+        message_collector = MessageCollector()
+        buf.set_message_func(message_collector.message)
+        hb.shape(blankfont, buf)
+
+
+class MessageCollector:
+    def message(self, message):
+        pass
+
+
 class TestGetBaseline:
     # The test font contains a BASE table with some test values
     def test_ot_layout_get_baseline_invalid_tag(self, blankfont):