[mupen64plus-core] 209/310: Don't free user managed msg when doing osd_exit during resize

[Sven Eckelmann]

This is an automated email from the git hooks/post-receive script.

ecsv-guest pushed a commit to branch armhf_test
in repository mupen64plus-core.

commit 15e21b993dbb61fc75f270cc141397c6d01f8aa0
Author: Sven Eckelmann <sven at narfation.org>
Date:   Tue May 28 20:41:10 2013 +0200

    Don't free user managed msg when doing osd_exit during resize
---
 debian/changelog                     |  3 +++
 debian/patches/osd_exit_resize.patch | 23 +++++++++++++++++++++++
 debian/patches/series                |  1 +
 3 files changed, 27 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index df9cf5e..90bc390 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,9 @@ mupen64plus-core (1.99.5+207+cbb5cbe2d4fc-1) UNRELEASED; urgency=low
     - Remove old mupen64plus-vidext-abi-2
   * Enable link-time optimization in debian/rules similar to upstream
   * Add VidExt_ResizeWindow at Base to libmupen64plus2 symbols
+  * debian/patches:
+    - Add osd_exit_resize.patch, Don't free user managed msg when doing
+      osd_exit during resize
 
  -- Sven Eckelmann <sven at narfation.org>  Tue, 28 May 2013 19:26:55 +0200
 
diff --git a/debian/patches/osd_exit_resize.patch b/debian/patches/osd_exit_resize.patch
new file mode 100644
index 0000000..720f83c
--- /dev/null
+++ b/debian/patches/osd_exit_resize.patch
@@ -0,0 +1,23 @@
+Description: Don't free user managed msg when doing osd_exit during resize
+Author: Sven Eckelmann <sven at narfation.org>
+
+---
+diff --git a/src/osd/osd.cpp b/src/osd/osd.cpp
+index cf59a9cfa7e02b710661b4978add723887d8e50b..d5a59f38f24ba7a38735a596bfe0b69b142f0060 100644
+--- a/src/osd/osd.cpp
++++ b/src/osd/osd.cpp
+@@ -276,8 +276,12 @@ void osd_exit(void)
+     // delete message queue
+     SDL_LockMutex(osd_list_lock);
+     list_for_each_entry_safe(msg, safe, &l_messageQueue, osd_message_t, list) {
+-        free(msg->text);
+-        free(msg);
++        if (msg->user_managed) {
++            osd_remove_message(msg);
++        } else {
++            osd_remove_message(msg);
++            free(msg);
++        }
+     }
+     SDL_UnlockMutex(osd_list_lock);
+ 
diff --git a/debian/patches/series b/debian/patches/series
index f2b4630..db9c979 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 dejavu-font.patch
 printf_fixup.patch
 disable_recompiler_disassembler.patch
+osd_exit_resize.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mupen64plus-core.git