added VALID_STR() debug macro for testing memory allocated by STRDUP()

validate_user() and validate_channel() should call list_validate() instead
of just checking the first entry in the list

Author: drscholl

buffer.c

@@ -393,9 +393,7 @@ send_queued_data (CONNECTION * con)
     Bytes_Out += n;
 
     /* check to make sure the queue hasn't gotten too big */
-    n =
-	(con->class ==
-	 CLASS_SERVER) ? Server_Queue_Length : Client_Queue_Length;
+    n = (ISSERVER (con)) ? Server_Queue_Length : Client_Queue_Length;
 
     if (buffer_size (con->sendbuf) > n)
     {

debug.h

@@ -29,6 +29,7 @@
 #define CLEANUP debug_cleanup
 #define VALID(p) debug_valid(p,1)
 #define VALID_LEN debug_valid
+#define VALID_STR(p) debug_valid(p,strlen(p)+1)
 #define MEMORY_USED debug_usage()
 
 /* internal functions, DO NOT CALL DIRECTLY -- use the above macros */

join.c

@@ -119,7 +119,7 @@ HANDLER (join)
 		      "You are already a member of channel %s", chan->name);
 	return;
     }
-	/* check to make sure the user has privilege to join */
+    /* check to make sure the user has privilege to join */
     else if (user->level < chan->level)
     {
 	log ("join(): channel %s is set to level %s", chan->name,

util.c

@@ -336,7 +336,7 @@ validate_connection (CONNECTION * con)
     ASSERT_RETURN_IF_FAIL (VALID_LEN (con, sizeof (CONNECTION)), 0);
     ASSERT_RETURN_IF_FAIL (con->magic == MAGIC_CONNECTION, 0);
     ASSERT_RETURN_IF_FAIL ((con->class == CLASS_USER) ^ (con->user == 0), 0);
-    ASSERT_RETURN_IF_FAIL (VALID (con->host), 0);
+    ASSERT_RETURN_IF_FAIL (VALID_STR (con->host), 0);
     if (con->sendbuf)
 	ASSERT_RETURN_IF_FAIL (buffer_validate (con->sendbuf), 0);
     if (con->recvbuf)
@@ -351,24 +351,22 @@ validate_user (USER * user)
 {
     ASSERT_RETURN_IF_FAIL (VALID_LEN (user, sizeof (USER)), 0);
     ASSERT_RETURN_IF_FAIL (user->magic == MAGIC_USER, 0);
-    ASSERT_RETURN_IF_FAIL (VALID (user->nick), 0);
-    ASSERT_RETURN_IF_FAIL (VALID (user->clientinfo), 0);
+    ASSERT_RETURN_IF_FAIL (VALID_STR (user->nick), 0);
+    ASSERT_RETURN_IF_FAIL (VALID_STR (user->clientinfo), 0);
     ASSERT_RETURN_IF_FAIL (user->con == 0
 			   || VALID_LEN (user->con, sizeof (CONNECTION)), 0);
-    ASSERT_RETURN_IF_FAIL (user->email == 0 || VALID (user->email), 0);
-    ASSERT_RETURN_IF_FAIL (user->channels == 0
-			   || VALID_LEN (user->channels, sizeof (LIST)), 0);
+    ASSERT_RETURN_IF_FAIL (user->email == 0 || VALID_STR (user->email), 0);
+    ASSERT_RETURN_IF_FAIL (list_validate (user->channels), 0);
     return 1;
 }
 
 int
 validate_channel (CHANNEL * chan)
 {
     ASSERT_RETURN_IF_FAIL (VALID_LEN (chan, sizeof (CHANNEL)), 0);
-    ASSERT_RETURN_IF_FAIL (chan->magic == MAGIC_CHANNEL, 0)
-	ASSERT_RETURN_IF_FAIL (VALID (chan->name), 0);
-    ASSERT_RETURN_IF_FAIL (chan->users == 0
-			   || VALID_LEN (chan->users, sizeof (LIST)), 0);
+    ASSERT_RETURN_IF_FAIL (chan->magic == MAGIC_CHANNEL, 0);
+    ASSERT_RETURN_IF_FAIL (VALID_STR (chan->name), 0);
+    ASSERT_RETURN_IF_FAIL (list_validate (chan->users), 0);
     return 1;
 }
 
@@ -377,7 +375,7 @@ validate_hotlist (HOTLIST * h)
 {
     ASSERT_RETURN_IF_FAIL (VALID_LEN (h, sizeof (HOTLIST)), 0);
     ASSERT_RETURN_IF_FAIL (h->magic == MAGIC_HOTLIST, 0);
-    ASSERT_RETURN_IF_FAIL (VALID (h->nick), 0);
+    ASSERT_RETURN_IF_FAIL (VALID_STR (h->nick), 0);
     ASSERT_RETURN_IF_FAIL (list_validate (h->users), 0);
     return 1;
 }