X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Ftools.c;h=b1e95fcc46c8cb4899863852d3c54b245413bb16;hb=119f5ee3d14919e18afc159074295c51e5f911ba;hp=aa78e3544be39c931c30aaa02f83ad3ee4ffe99d;hpb=63cb2f4bcd0510c1c5052d477095c25e034a960e;p=citadel.git

diff --git a/citadel/tools.c b/citadel/tools.c
index aa78e3544..b1e95fcc4 100644
--- a/citadel/tools.c
+++ b/citadel/tools.c
@@ -94,11 +94,12 @@ int num_tokens(const char *source, char tok) {
 /*
  * extract_token() - a string tokenizer
  */
-void extract_token(char *dest, const char *source, int parmnum, char separator)
+void extract_token(char *dest, const char *source, int parmnum, char separator, int maxlen)
 {
 	char *d;		/* dest */
 	const char *s;		/* source */
 	int count = 0;
+	int len = 0;
 
 	strcpy(dest, "");
 
@@ -117,7 +118,7 @@ void extract_token(char *dest, const char *source, int parmnum, char separator)
 	}
 	if (!s) return;		/* Parameter not found */
 
-	for (d = dest; *s && *s != separator; s++, d++) {
+	for (d = dest; *s && *s != separator && ++len<maxlen; s++, d++) {
 		*d = *s;
 	}
 	*d = 0;
@@ -174,9 +175,9 @@ void remove_token(char *source, int parmnum, char separator)
  */
 int extract_int(const char *source, int parmnum)
 {
-	char buf[SIZ];
+	char buf[32];
 	
-	extract_token(buf, source, parmnum, '|');
+	extract_token(buf, source, parmnum, '|', sizeof buf);
 	return(atoi(buf));
 }
 
@@ -185,9 +186,9 @@ int extract_int(const char *source, int parmnum)
  */
 long extract_long(const char *source, int parmnum)
 {
-	char buf[SIZ];
+	char buf[32];
 	
-	extract_token(buf, source, parmnum, '|');
+	extract_token(buf, source, parmnum, '|', sizeof buf);
 	return(atol(buf));
 }
 
@@ -197,9 +198,9 @@ long extract_long(const char *source, int parmnum)
  */
 unsigned long extract_unsigned_long(const char *source, int parmnum)
 {
-	char buf[SIZ];
+	char buf[32];
 
-	extract_token(buf, source, parmnum, '|');
+	extract_token(buf, source, parmnum, '|', sizeof buf);
 	return strtoul(buf, NULL, 10);
 }
 
@@ -421,11 +422,11 @@ int is_msg_in_mset(char *mset, long msgnum) {
 	 */
 	num_sets = num_tokens(mset, ',');
 	for (s=0; s<num_sets; ++s) {
-		extract_token(setstr, mset, s, ',');
+		extract_token(setstr, mset, s, ',', sizeof setstr);
 
-		extract_token(lostr, setstr, 0, ':');
+		extract_token(lostr, setstr, 0, ':', sizeof lostr);
 		if (num_tokens(setstr, ':') >= 2) {
-			extract_token(histr, setstr, 1, ':');
+			extract_token(histr, setstr, 1, ':', sizeof histr);
 			if (!strcmp(histr, "*")) {
 				snprintf(histr, sizeof histr, "%ld", LONG_MAX);
 			}