From 36ba9c53f43531fa78d41bf1c4b94fc5b8da2467 Mon Sep 17 00:00:00 2001
From: Arne Scheffler <unknown>
Date: Wed, 28 Jul 2021 08:13:31 +1000
Subject: Bug [#2268]. Fix memory leak caused by circular references.

---
 cocoa/ScintillaCocoa.h    |  4 ++--
 doc/ScintillaHistory.html | 13 +++++++++++++
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/cocoa/ScintillaCocoa.h b/cocoa/ScintillaCocoa.h
index 00a0fbc03..dcc85ba22 100644
--- a/cocoa/ScintillaCocoa.h
+++ b/cocoa/ScintillaCocoa.h
@@ -87,11 +87,11 @@ namespace Scintilla::Internal {
  */
 class ScintillaCocoa : public ScintillaBase {
 private:
-	ScintillaView *sciView;
+	__weak ScintillaView *sciView;
 	TimerTarget *timerTarget;
 	NSEvent *lastMouseEvent;
 
-	id<ScintillaNotificationProtocol> delegate;
+	__weak id<ScintillaNotificationProtocol> delegate;
 
 	SciNotifyFunc	notifyProc;
 	intptr_t notifyObj;
diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html
index 7b237d8a5..4c66611ba 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -563,9 +563,22 @@
 	<td>Damiano Lombardi</td>
       </tr><tr>
 	<td>Michael Neuroth</td>
+	<td>Arne Scheffler</td>
     </tr>
     </table>
     <h2>Releases</h2>
+    <h3>
+       <a href="https://www.scintilla.org/scintilla512.zip">Release 5.1.2</a>
+    </h3>
+    <ul>
+	<li>
+	Released 26 July 2021.
+	</li>
+	<li>
+	On Cocoa, fix memory leak caused by circular references.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2268/">Bug #2268</a>.
+	</li>
+    </ul>
     <h3>
        <a href="https://www.scintilla.org/scintilla511.zip">Release 5.1.1</a>
     </h3>
-- 
cgit v1.2.3