* fixed bug in dotgoto() causing free() to segfault

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index 8878cad325eac36926f50903eb3250ec10f749f1..360bafd3d065e31a04feb8da3ed8c5cf28515d34 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,4 +1,7 @@
  $Log$
+ Revision 591.57  2002/06/25 15:38:52  error
+ * fixed bug in dotgoto() causing free() to segfault
+
  Revision 591.56  2002/06/25 15:13:27  error
  * gotonext() now uses new IPC code to retrieve room listing
 
@@ -3776,3 +3779,4 @@ Sat Jul 11 00:20:48 EDT 1998 Nathan Bryant <bryant@cs.usm.maine.edu>
 
 Fri Jul 10 1998 Art Cancro <ajc@uncensored.citadel.org>
        * Initial CVS import
+

diff --git a/citadel/citadel.c b/citadel/citadel.c
index 743bbcded59fdd623ff856d83ab3b2d06cbe6e17..b226398bfe7bd366893719f545486775e31c98fa 100644 (file)
--- a/citadel/citadel.c
+++ b/citadel/citadel.c
@@ -335,7 +335,7 @@ void dotgoto(char *towhere, int display_name, int fromungoto)
        char from_floor;
        int ugpos = uglistsize;
        int r;                          /* IPC result code */
-       static struct ctdlipcroom *roomrec = NULL;
+       struct ctdlipcroom *roomrec = NULL;
 
        /* store ungoto information */
        if (fromungoto == 0) {
@@ -356,11 +356,6 @@ void dotgoto(char *towhere, int display_name, int fromungoto)
                uglistlsn[ugpos] = ls;
        }
       
-       if (roomrec) {
-               free(roomrec);
-               roomrec = NULL;
-       }
-
        /* first try an exact match */
        r = CtdlIPCGotoRoom(towhere, "", &roomrec, aaa);
        if (r / 10 == 54) {