Re: [RP] Re: window numbering bug/race?

[Joshua Neuheisel]

Ted Walther wrote:
> On Sat, Nov 26, 2005 at 08:33:04PM -0500, Joshua Neuheisel wrote:
>
> >   I'll certainly change it in my JN patch, but it's up to Shawn to
> >   change in the mainline.
>
>
> Not sure if I still have commit access; what needs to be committed?
> Patch, please.  If nothing else, I'll apply it in Debian.

It's attached to this email.

Index: ChangeLog
===================================================================
RCS file: /cvsroot/ratpoison/ratpoison/ChangeLog,v
retrieving revision 1.412
diff -u -r1.412 ChangeLog
--- ChangeLog   5 Nov 2005 17:26:07 -0000       1.412
+++ ChangeLog   30 Nov 2005 13:23:12 -0000
@@ -1,3 +1,8 @@
+2005-11-30  Joshua Neuheisel <address@hidden>
+
+       * src/number.c (numset_add_num): added necessary sequence point after
+       numset_find_empty_cell
+
 2005-11-05  Shawn Betts  <address@hidden>
 
        * src/manage.h (unhide_all_windows): new prototype
Index: src/number.c
===================================================================
RCS file: /cvsroot/ratpoison/ratpoison/src/number.c,v
retrieving revision 1.13
diff -u -r1.13 number.c
--- src/number.c        4 Dec 2004 03:33:24 -0000       1.13
+++ src/number.c        30 Nov 2005 13:23:12 -0000
@@ -71,12 +71,15 @@
 int
 numset_add_num (struct numset *ns, int n)
 {
+  int ec;
+
   PRINT_DEBUG(("ns=%p add_num %d\n", ns, n));
 
   if (numset_num_is_taken (ns, n)) 
     return 0; /* failed. */
   
-  ns->numbers_taken[numset_find_empty_cell(ns)] = n;
+  ec = numset_find_empty_cell (ns);
+  ns->numbers_taken[ec] = n;
   return 1; /* success! */
 }