aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2012-01-30 23:24:43 +0000
committerUlrich Müller <ulm@gentoo.org>2012-01-30 23:24:43 +0000
commit4c054ae3e7b22ffa346b4efaed0eb638c0936362 (patch)
treea841b0a27782c2ca0ec8b51fa66f00d36535d4b1
parentInitial patchset for Emacs 23.4 (diff)
downloademacs-patches-emacs-23.4-patches-2.tar.gz
emacs-patches-emacs-23.4-patches-2.tar.bz2
emacs-patches-emacs-23.4-patches-2.zip
Fix infinite loop in xg_select() with glib >= 2.31, bug 401199.emacs-23.4-patches-2
-rw-r--r--emacs/23.4/09_all_xgselect-infloop.patch15
1 files changed, 15 insertions, 0 deletions
diff --git a/emacs/23.4/09_all_xgselect-infloop.patch b/emacs/23.4/09_all_xgselect-infloop.patch
new file mode 100644
index 0000000..89c4dcd
--- /dev/null
+++ b/emacs/23.4/09_all_xgselect-infloop.patch
@@ -0,0 +1,15 @@
+http://debbugs.gnu.org/cgi/bugreport.cgi?bug=9754
+https://bugs.gentoo.org/401199
+Fix infinite loop in xg_select() with glib >= 2.31.
+
+--- emacs-23.4-orig/src/xgselect.c
++++ emacs-23.4/src/xgselect.c
+@@ -55,6 +55,8 @@ xg_select (max_fds, rfds, wfds, efds, ti
+ do {
+ if (n_gfds > gfds_size)
+ {
++ if (gfds_size == 0)
++ gfds_size = 128;
+ while (n_gfds > gfds_size)
+ gfds_size *= 2;
+ xfree (gfds);