Small fixes.

diff --git a/aim_login.c b/aim_login.c
index 63b7b2fcab8d4f7776e88020e079419267a4b3d5..96bdcf84500d8e9c30d5c5fd07599eee5a0b767d 100644 (file)
--- a/aim_login.c
+++ b/aim_login.c
@@ -306,7 +306,7 @@ int aim_authkeyparse(struct aim_session_t *sess, struct command_rx_struct *comma
   rxcallback_t userfunc;
 
   keylen = aimutil_get16(command->data+10);
-  key = malloc(keylen);
+  key = malloc(keylen+1);
   memcpy(key, command->data+12, keylen);
   key[keylen] = '\0';
   

diff --git a/aim_snac.c b/aim_snac.c
index 6cea5d5e897356876fd5a3bed2783c9fd4ba2930..2a44674579a3929bb5ce389e5686f5b3ae9ef070 100644 (file)
--- a/aim_snac.c
+++ b/aim_snac.c
@@ -43,8 +43,7 @@ u_long aim_newsnac(struct aim_session_t *sess,
   if (!newsnac)
     return 0;
 
-  snac = calloc(1, sizeof(struct aim_snac_t));
-  if (!snac)
+  if (!(snac = calloc(1, sizeof(struct aim_snac_t))))
     return 0;
   memcpy(snac, newsnac, sizeof(struct aim_snac_t));
   snac->issuetime = time(&snac->issuetime);
@@ -53,12 +52,8 @@ u_long aim_newsnac(struct aim_session_t *sess,
   index = snac->id % FAIM_SNAC_HASH_SIZE;
 
   faim_mutex_lock(&sess->snac_hash_locks[index]);
-  if (!sess->snac_hash[index])
-    sess->snac_hash[index] = snac;
-  else {
-    snac->next = sess->snac_hash[index];
-    sess->snac_hash[index] = snac;
-  }
+  snac->next = sess->snac_hash[index];
+  sess->snac_hash[index] = snac;
   faim_mutex_unlock(&sess->snac_hash_locks[index]);
 
   return(snac->id);