[srvx-commits] CVS: services/src parse.c,1.129,1.129.2.1 hash.c,1.159.2.3,1.159.2.4

[Zoot <zo...@us...>]

Update of /cvsroot/srvx/services/src
In directory sc8-pr-cvs1:/tmp/cvs-serv32000/src

Modified Files:
      Tag: rel-1_1-branch
	parse.c hash.c 
Log Message:
Fix a crash caused when a CREATE and a KILL crossed.


Index: parse.c
===================================================================
RCS file: /cvsroot/srvx/services/src/Attic/parse.c,v
retrieving revision 1.129
retrieving revision 1.129.2.1
diff -C2 -r1.129 -r1.129.2.1
*** parse.c	23 Jun 2002 14:26:12 -0000	1.129
--- parse.c	12 Dec 2002 02:27:59 -0000	1.129.2.1
***************
*** 297,303 ****
  static CMD_FUNC(cmd_create)
  {
      struct create_desc cd;
      if (argc < 4) return 0;
!     cd.user = GetUser(argv[0]);
      cd.when = atoi(argv[3]);
      parse_foreach(argv[2], NULL, create_helper, NULL, NULL, &cd);
--- 297,313 ----
  static CMD_FUNC(cmd_create)
  {
+     struct userNode *user;
      struct create_desc cd;
+ 
      if (argc < 4) return 0;
! 
!     user = GetUser(argv[0]);
!     if(!user) {
!         /* The CREATE from this user probably crossed a KILL
!            for the very same user. Bail. */
!         return 0;
!     }
! 
!     cd.user = user;
      cd.when = atoi(argv[3]);
      parse_foreach(argv[2], NULL, create_helper, NULL, NULL, &cd);

Index: hash.c
===================================================================
RCS file: /cvsroot/srvx/services/src/hash.c,v
retrieving revision 1.159.2.3
retrieving revision 1.159.2.4
diff -C2 -r1.159.2.3 -r1.159.2.4
*** hash.c	29 Oct 2002 20:52:16 -0000	1.159.2.3
--- hash.c	12 Dec 2002 02:27:59 -0000	1.159.2.4
***************
*** 755,758 ****
--- 755,762 ----
              }
          }
+ 
+         /* If the people on the members list didn't make it
+            into the channel alive, we should kill the channel
+            off -- for now, we don't. */
      }