r15117 - in packages/trunk/jugglemaster/debian: . patches
Helmut Grohne
helmut-guest at moszumanska.debian.org
Tue May 27 20:01:31 UTC 2014
Author: helmut-guest
Date: 2014-05-27 20:01:31 +0000 (Tue, 27 May 2014)
New Revision: 15117
Modified:
packages/trunk/jugglemaster/debian/changelog
packages/trunk/jugglemaster/debian/patches/010_wx26_trans.patch
Log:
fix use-after-free in 010_wx26_trans.patch
Modified: packages/trunk/jugglemaster/debian/changelog
===================================================================
--- packages/trunk/jugglemaster/debian/changelog 2014-05-27 20:01:29 UTC (rev 15116)
+++ packages/trunk/jugglemaster/debian/changelog 2014-05-27 20:01:31 UTC (rev 15117)
@@ -9,6 +9,8 @@
* Acknowledge NMUs. Thanks to Sebastian Ramacher for taking care of urgent
RC bugs and Moritz Muehlenhoff for providing a patch.
* Add .desktop files. (Addresses: #726446)
+ * Make jmdlx stylechooser work again (use after free in
+ 010_wx26_trans.patch).
[ Evgeni Golov ]
* Correct Vcs-* URLs to point to anonscm.debian.org
Modified: packages/trunk/jugglemaster/debian/patches/010_wx26_trans.patch
===================================================================
--- packages/trunk/jugglemaster/debian/patches/010_wx26_trans.patch 2014-05-27 20:01:29 UTC (rev 15116)
+++ packages/trunk/jugglemaster/debian/patches/010_wx26_trans.patch 2014-05-27 20:01:31 UTC (rev 15117)
@@ -1,10 +1,12 @@
Author: Barry deFreese <bddebian at comcast.net>
Description: Build with wx2.6
Forwarded: Chunky Kibbles <chunky at icculus.org>, Per Johan Groland <per at jugglemaster.net>
+Last-Update: 2014-05-27
+
Index: jugglemaster-0.4/src/jmdlx/Makefile
===================================================================
---- jugglemaster-0.4.orig/src/jmdlx/Makefile 2011-11-03 20:08:55.000000000 +0100
-+++ jugglemaster-0.4/src/jmdlx/Makefile 2011-11-03 20:11:30.000000000 +0100
+--- jugglemaster-0.4.orig/src/jmdlx/Makefile 2004-09-02 02:48:19.000000000 +0200
++++ jugglemaster-0.4/src/jmdlx/Makefile 2014-05-27 21:17:33.000000000 +0200
@@ -2,7 +2,6 @@
CXXFLAGS+=-Wall -fsigned-char `wx-config --cppflags`
@@ -15,8 +17,8 @@
LIBS+=`wx-config --libs`
Index: jugglemaster-0.4/src/jmdlx/advsite.cpp
===================================================================
---- jugglemaster-0.4.orig/src/jmdlx/advsite.cpp 2011-11-03 20:08:55.000000000 +0100
-+++ jugglemaster-0.4/src/jmdlx/advsite.cpp 2011-11-03 20:11:30.000000000 +0100
+--- jugglemaster-0.4.orig/src/jmdlx/advsite.cpp 2004-09-02 02:48:19.000000000 +0200
++++ jugglemaster-0.4/src/jmdlx/advsite.cpp 2014-05-27 21:03:56.000000000 +0200
@@ -25,7 +25,7 @@
END_EVENT_TABLE()
@@ -103,8 +105,8 @@
}
Index: jugglemaster-0.4/src/jmdlx/choosepatt.cpp
===================================================================
---- jugglemaster-0.4.orig/src/jmdlx/choosepatt.cpp 2011-11-03 20:08:55.000000000 +0100
-+++ jugglemaster-0.4/src/jmdlx/choosepatt.cpp 2011-11-03 20:11:30.000000000 +0100
+--- jugglemaster-0.4.orig/src/jmdlx/choosepatt.cpp 2004-09-02 02:48:19.000000000 +0200
++++ jugglemaster-0.4/src/jmdlx/choosepatt.cpp 2014-05-27 21:03:56.000000000 +0200
@@ -25,7 +25,7 @@
END_EVENT_TABLE()
@@ -204,8 +206,8 @@
}
Index: jugglemaster-0.4/src/jmdlx/choosestyle.cpp
===================================================================
---- jugglemaster-0.4.orig/src/jmdlx/choosestyle.cpp 2011-11-03 20:08:55.000000000 +0100
-+++ jugglemaster-0.4/src/jmdlx/choosestyle.cpp 2011-11-03 20:11:30.000000000 +0100
+--- jugglemaster-0.4.orig/src/jmdlx/choosestyle.cpp 2004-09-02 02:48:19.000000000 +0200
++++ jugglemaster-0.4/src/jmdlx/choosestyle.cpp 2014-05-27 21:19:38.000000000 +0200
@@ -22,7 +22,7 @@
END_EVENT_TABLE()
@@ -236,19 +238,23 @@
wxBoxSizer *buttonsizer = new wxBoxSizer(wxHORIZONTAL);
buttonsizer->Add(ok, 1, wxALIGN_CENTRE|wxALL, 5);
buttonsizer->Add(apply, 1, wxALIGN_CENTRE|wxALL, 5);
-@@ -67,7 +67,7 @@
+@@ -65,10 +65,8 @@
+ }
+
void ChooseStyle::ApplySettings() {
- JML_CHAR *newstyle;
-
+- JML_CHAR *newstyle;
+-
- newstyle = (JML_CHAR *)(const char *)stylechoice->GetStringSelection();
-+ newstyle = (JML_CHAR *)(const char *)stylechoice->GetStringSelection().mb_str(wxConvUTF8);
- jmlib->setStyle(newstyle);
+- jmlib->setStyle(newstyle);
++ wxString newstyle(stylechoice->GetStringSelection());
++ jmlib->setStyle((JML_CHAR *)(const char*)newstyle.mb_str(wxConvUTF8));
}
+ void ChooseStyle::OnApply(wxCommandEvent &WXUNUSED(event)) {
Index: jugglemaster-0.4/src/jmdlx/choosestyle.h
===================================================================
---- jugglemaster-0.4.orig/src/jmdlx/choosestyle.h 2011-11-03 20:08:55.000000000 +0100
-+++ jugglemaster-0.4/src/jmdlx/choosestyle.h 2011-11-03 20:11:30.000000000 +0100
+--- jugglemaster-0.4.orig/src/jmdlx/choosestyle.h 2004-09-02 02:48:19.000000000 +0200
++++ jugglemaster-0.4/src/jmdlx/choosestyle.h 2014-05-27 21:03:56.000000000 +0200
@@ -21,12 +21,12 @@
#include "../jmlib/jmlib.h"
#include "jmdlx.h"
@@ -270,8 +276,8 @@
Index: jugglemaster-0.4/src/jmdlx/jmdlx.cpp
===================================================================
---- jugglemaster-0.4.orig/src/jmdlx/jmdlx.cpp 2011-11-03 20:08:55.000000000 +0100
-+++ jugglemaster-0.4/src/jmdlx/jmdlx.cpp 2011-11-03 20:11:50.000000000 +0100
+--- jugglemaster-0.4.orig/src/jmdlx/jmdlx.cpp 2004-09-02 02:48:19.000000000 +0200
++++ jugglemaster-0.4/src/jmdlx/jmdlx.cpp 2014-05-27 21:17:28.000000000 +0200
@@ -26,7 +26,7 @@
windowx = min(480,wxGetDisplaySize().x);
windowy = min(400,wxGetDisplaySize().y);
@@ -466,8 +472,8 @@
// flip
Index: jugglemaster-0.4/src/jmdlx/jmdlx.h
===================================================================
---- jugglemaster-0.4.orig/src/jmdlx/jmdlx.h 2011-11-03 20:08:55.000000000 +0100
-+++ jugglemaster-0.4/src/jmdlx/jmdlx.h 2011-11-03 20:11:30.000000000 +0100
+--- jugglemaster-0.4.orig/src/jmdlx/jmdlx.h 2004-09-02 02:48:19.000000000 +0200
++++ jugglemaster-0.4/src/jmdlx/jmdlx.h 2014-05-27 21:17:31.000000000 +0200
@@ -92,11 +92,11 @@
static const wxCmdLineEntryDesc cmdLineDesc[] =
@@ -487,8 +493,8 @@
Index: jugglemaster-0.4/src/jmdlx/newsemaphore.cpp
===================================================================
---- jugglemaster-0.4.orig/src/jmdlx/newsemaphore.cpp 2011-11-03 20:11:29.000000000 +0100
-+++ jugglemaster-0.4/src/jmdlx/newsemaphore.cpp 2011-11-03 20:11:30.000000000 +0100
+--- jugglemaster-0.4.orig/src/jmdlx/newsemaphore.cpp 2014-05-27 21:03:56.000000000 +0200
++++ jugglemaster-0.4/src/jmdlx/newsemaphore.cpp 2014-05-27 21:03:56.000000000 +0200
@@ -22,18 +22,18 @@
END_EVENT_TABLE()
@@ -599,8 +605,8 @@
free(current_style);
Index: jugglemaster-0.4/src/jmdlx/patt.cpp
===================================================================
---- jugglemaster-0.4.orig/src/jmdlx/patt.cpp 2011-11-03 20:11:28.000000000 +0100
-+++ jugglemaster-0.4/src/jmdlx/patt.cpp 2011-11-03 20:11:30.000000000 +0100
+--- jugglemaster-0.4.orig/src/jmdlx/patt.cpp 2014-05-27 21:03:56.000000000 +0200
++++ jugglemaster-0.4/src/jmdlx/patt.cpp 2014-05-27 21:03:56.000000000 +0200
@@ -75,41 +75,41 @@
snprintf(usr_filename, 255, "/usr/share/jugglemaster/%s", filename);
@@ -681,8 +687,8 @@
}
Index: jugglemaster-0.4/src/jmdlx/print.cpp
===================================================================
---- jugglemaster-0.4.orig/src/jmdlx/print.cpp 2011-11-03 20:08:55.000000000 +0100
-+++ jugglemaster-0.4/src/jmdlx/print.cpp 2011-11-03 20:11:30.000000000 +0100
+--- jugglemaster-0.4.orig/src/jmdlx/print.cpp 2004-09-02 02:48:19.000000000 +0200
++++ jugglemaster-0.4/src/jmdlx/print.cpp 2014-05-27 21:17:33.000000000 +0200
@@ -34,7 +34,7 @@
END_EVENT_TABLE()
More information about the Pkg-games-commits
mailing list