commit 6e41f21582fc50bcb2c5060af46b59c4140223e3
parent 9c88c1282e9576f04c1f7e27ac384aeeb79549eb
Author: Colin Leroy <colin@colino.net>
Date: Sat, 16 Feb 2013 11:59:55 +0000
2013-02-16 [colin] 3.9.0cvs71
* src/mainwindow.c
Fix use-after-free (introduced in cvs61)
Diffstat:
4 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+2013-02-16 [colin] 3.9.0cvs71
+
+ * src/mainwindow.c
+ Fix use-after-free (introduced in cvs61)
+
2013-02-16 [colin] 3.9.0cvs70
* src/main.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -4568,3 +4568,4 @@
( cvs diff -u -r 1.53.2.40 -r 1.53.2.41 po/POTFILES.in; cvs diff -u -r 1.21.2.10 -r 1.21.2.11 po/bg.po; cvs diff -u -r 1.1.2.20 -r 1.1.2.21 po/ca.po; cvs diff -u -r 1.9.2.27 -r 1.9.2.28 po/cs.po; cvs diff -u -r 1.58.2.53 -r 1.58.2.54 po/de.po; cvs diff -u -r 1.12.2.19 -r 1.12.2.20 po/en_GB.po; cvs diff -u -r 1.60.2.67 -r 1.60.2.68 po/es.po; cvs diff -u -r 1.1.2.30 -r 1.1.2.31 po/fi.po; cvs diff -u -r 1.42.2.60 -r 1.42.2.61 po/fr.po; cvs diff -u -r 1.5.2.24 -r 1.5.2.25 po/hu.po; cvs diff -u -r 1.1.2.3 -r 1.1.2.4 po/id_ID.po; cvs diff -u -r 1.34.2.31 -r 1.34.2.32 po/it.po; cvs diff -u -r 1.16.2.13 -r 1.16.2.14 po/ja.po; cvs diff -u -r 1.1.2.6 -r 1.1.2.7 po/lt.po; diff -u /dev/null po/merge-po-from-plugin.sh; cvs diff -u -r 1.28.2.16 -r 1.28.2.17 po/nl.po; cvs diff -u -r 1.10.2.19 -r 1.10.2.20 po/pl.po; cvs diff -u -r 1.50.2.46 -r 1.50.2.47 po/pt_BR.po; cvs diff -u -r 1.1.2.5 -r 1.1.2.6 po/pt_PT.po; cvs diff -u -r 1.17.2.23 -r 1.17.2.24 po/ru.po; cvs diff -u -r 1.2.2.38 -r 1.2.2.39 po/sk.po; cvs diff -u -r 1.17.2.29 -r 1.17.2.30 po/sr.po; cvs diff -u -r 1.4.2.14 -r 1.4.2.15 po/sv.po; cvs diff -u -r 1.1.2.7 -r 1.1.2.8 po/uk.po; cvs diff -u -r 1.5.2.32 -r 1.5.2.33 po/zh_CN.po; cvs diff -u -r 1.1.2.6 -r 1.1.2.7 po/zh_TW.po; ) > 3.9.0cvs68.patchset
( cvs diff -u -r 1.1.2.4 -r 1.1.2.5 po/id_ID.po; ) > 3.9.0cvs69.patchset
( cvs diff -u -r 1.115.2.267 -r 1.115.2.268 src/main.c; cvs diff -u -r 1.204.2.214 -r 1.204.2.215 src/prefs_common.c; cvs diff -u -r 1.103.2.143 -r 1.103.2.144 src/prefs_common.h; cvs diff -u -r 1.9.2.62 -r 1.9.2.63 src/common/defs.h; cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/common/w32_account.c; cvs diff -u -r 1.8.2.10 -r 1.8.2.11 src/plugins/Makefile.am; diff -u /dev/null src/plugins/rssyl/Makefile.am; diff -u /dev/null src/plugins/rssyl/claws.def; diff -u /dev/null src/plugins/rssyl/date.c; diff -u /dev/null src/plugins/rssyl/date.h; diff -u /dev/null src/plugins/rssyl/feed.c; diff -u /dev/null src/plugins/rssyl/feed.h; diff -u /dev/null src/plugins/rssyl/feedprops.c; diff -u /dev/null src/plugins/rssyl/feedprops.h; diff -u /dev/null src/plugins/rssyl/opml.c; diff -u /dev/null src/plugins/rssyl/opml.h; diff -u /dev/null src/plugins/rssyl/parsers.c; diff -u /dev/null src/plugins/rssyl/parsers.h; cvs diff -u -r -1.1.2.1 -r -1.1.2.2 src/plugins/rssyl/placeholder.txt; diff -u /dev/null src/plugins/rssyl/plugin.c; diff -u /dev/null src/plugins/rssyl/plugin.def; diff -u /dev/null src/plugins/rssyl/rssyl.c; diff -u /dev/null src/plugins/rssyl/rssyl.h; diff -u /dev/null src/plugins/rssyl/rssyl_cb_gtk.c; diff -u /dev/null src/plugins/rssyl/rssyl_cb_gtk.h; diff -u /dev/null src/plugins/rssyl/rssyl_cb_menu.c; diff -u /dev/null src/plugins/rssyl/rssyl_cb_menu.h; diff -u /dev/null src/plugins/rssyl/rssyl_gtk.c; diff -u /dev/null src/plugins/rssyl/rssyl_gtk.h; diff -u /dev/null src/plugins/rssyl/rssyl_prefs.c; diff -u /dev/null src/plugins/rssyl/rssyl_prefs.h; diff -u /dev/null src/plugins/rssyl/strreplace.c; diff -u /dev/null src/plugins/rssyl/strreplace.h; diff -u /dev/null src/plugins/rssyl/version.rc; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/vcalendar/Makefile.am; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/vcalendar/Makefile.in; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/vcalendar/plugin.c; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/vcalendar/libical/libical/icalversion.h; ) > 3.9.0cvs70.patchset
+( cvs diff -u -r 1.274.2.365 -r 1.274.2.366 src/mainwindow.c; ) > 3.9.0cvs71.patchset
diff --git a/configure.ac b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=9
MICRO_VERSION=0
INTERFACE_AGE=0
BINARY_AGE=0
-EXTRA_VERSION=70
+EXTRA_VERSION=71
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=
diff --git a/src/mainwindow.c b/src/mainwindow.c
@@ -1204,13 +1204,13 @@ static void mainwindow_colorlabel_menu_create(MainWindow *mainwin, gboolean refr
gtk_widget_show(item);
accel_path = g_strdup_printf("<ClawsColorLabels>/%d", i+1);
gtk_menu_item_set_accel_path(GTK_MENU_ITEM(item), accel_path);
- g_free(accel_path);
if (i < 9)
#if !GTK_CHECK_VERSION(2, 24, 0)
gtk_accel_map_add_entry(accel_path, GDK_1+i, GDK_CONTROL_MASK);
#else
gtk_accel_map_add_entry(accel_path, GDK_KEY_1+i, GDK_CONTROL_MASK);
#endif
+ g_free(accel_path);
g_signal_connect (gtk_ui_manager_get_accel_group(mainwin->ui_manager),
"accel-changed", G_CALLBACK (mainwin_accel_changed_cb), item);
