- Thu Aug 17 23:08:08 UTC 2000

   - More leak fixes (eric, eric, eric...)

diff --git a/CHANGES b/CHANGES
index 3d08a8ecc20be49fcab590c739044f5ce20db00c..ce712d59cc9311552204ae961837ce296a7fb880 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
 
 No release numbers
 ------------------
+ - Thu Aug 17 23:08:08 UTC 2000
+   - More leak fixes (eric, eric, eric...)
+
  - Thu Aug 17 22:53:03 UTC 2000
    - Change the SNAC cache to a hash instead of list
    - Fixed a few leaks relating to aim_gettlv_str()

diff --git a/aim_chatnav.c b/aim_chatnav.c
index 1bc8c33fa2067d693c9c5e6de38e658894fd155e..2a0a478bf3a94dcd39d2dc6f674fb0654b2dbc2e 100644 (file)
--- a/aim_chatnav.c
+++ b/aim_chatnav.c
@@ -215,7 +215,8 @@ int aim_chatnav_parse_info(struct aim_session_t *sess, struct command_rx_struct
                exchanges[curexchange-1].lang2 = aim_gettlv_str(innerlist, 0x00d9, 1);
              else
                exchanges[curexchange-1].lang2 = NULL;
-
+             
+             aim_freetlvchain(&innerlist);
            }
          
          /*
@@ -245,7 +246,6 @@ int aim_chatnav_parse_info(struct aim_session_t *sess, struct command_rx_struct
              curexchange--;
            }
          free(exchanges);
-         aim_freetlvchain(&innerlist);
          aim_freetlvchain(&tlvlist);
          return ret;
       }

diff --git a/aim_login.c b/aim_login.c
index 44ed08d38f10413e8d47fc7e9344589b734d264b..9adf21c391efcd471797472c5b5dd651eef4eeb2 100644 (file)
--- a/aim_login.c
+++ b/aim_login.c
@@ -311,10 +311,12 @@ int aim_authparse(struct aim_session_t *sess,
 
   aim_freetlvchain(&tlvlist);
 
-  /* These have been clobbered by the freetlvchain */
-  sess->logininfo.BOSIP = NULL;
-  sess->logininfo.email = NULL;
-  sess->logininfo.errorurl = NULL;
+  if (sess->logininfo.BOSIP)
+    free(sess->logininfo.BOSIP);
+  if (sess->logininfo.email)
+    free(sess->logininfo.email);
+  if (sess->logininfo.errorurl)
+    free(sess->logininfo.errorurl);
 
   return ret;
 }

diff --git a/faim/aim.h b/faim/aim.h
index 66b1ca0761854227436ff7a7f895dfd562f6002a..a35af362bd145c2d8343653479319bc059620fc6 100644 (file)
--- a/faim/aim.h
+++ b/faim/aim.h
@@ -532,7 +532,7 @@ u_long aim_seticbmparam(struct aim_session_t *, struct aim_conn_t *conn);
 int aim_parse_msgerror_middle(struct aim_session_t *, struct command_rx_struct *);
 int aim_negchan_middle(struct aim_session_t *sess, struct command_rx_struct *command);
 
-struct aim_conn_t * aim_directim_intiate(struct aim_session_t *, struct aim_conn_t *, struct aim_directim_priv *, char *);
+struct aim_conn_t * aim_directim_initiate(struct aim_session_t *, struct aim_conn_t *, struct aim_directim_priv *, char *);
 int aim_send_im_direct(struct aim_session_t *, struct aim_conn_t *, char *);
 struct aim_conn_t *aim_directim_connect(struct aim_session_t *, struct aim_conn_t *, struct aim_directim_priv *);