From a7c9fd88b3ddc9275be6fa5611ddf60da86b14c3 Mon Sep 17 00:00:00 2001
From: Albrecht Schlosser <albrechts.fltk@online.de>
Date: Wed, 3 Jul 2019 17:35:03 +0200
Subject: Fix a subtle bug in Fl_Menu_::menu_end()

This bug could cause memory allocation/free errors and eventually
cause a crash.
---
 src/Fl_Menu_add.cxx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/Fl_Menu_add.cxx b/src/Fl_Menu_add.cxx
index d29d75a42..b8954c9f0 100644
--- a/src/Fl_Menu_add.cxx
+++ b/src/Fl_Menu_add.cxx
@@ -522,8 +522,8 @@ const Fl_Menu_Item *Fl_Menu_::menu_end() {
     memcpy(newMenu, local_array, n * sizeof(Fl_Menu_Item));
     if (value_)
       value_ = newMenu + value_offset;
+    fl_menu_array_owner = 0;
   }
-  fl_menu_array_owner = 0;
   return menu_;
 }
 
-- 
cgit v1.2.3