X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fcookie_conversion.c;h=27c4830d214cc2d5b24ac70d3920abd32db3f003;hb=abeb8adc38f9d55fcb6cb3d076f57239b0a9a4d5;hp=644dbfc32a3b84259d9c71f7818a689b072346ac;hpb=d96f96eef3dfd036a06a52740b69ba10cede6d30;p=citadel.git

diff --git a/webcit/cookie_conversion.c b/webcit/cookie_conversion.c
index 644dbfc32..27c4830d2 100644
--- a/webcit/cookie_conversion.c
+++ b/webcit/cookie_conversion.c
@@ -64,7 +64,10 @@ int xtoi(char *in, size_t len)
 /*
  * Extract all that fun stuff out of the cookie.
  */
-void cookie_to_stuff(char *cookie, int *session, char *user, char *pass, char *room)
+void cookie_to_stuff(char *cookie, int *session,
+		char *user, size_t user_len,
+		char *pass, size_t pass_len,
+		char *room, size_t room_len)
 {
 	char buf[SIZ];
 	int i, len;
@@ -79,9 +82,9 @@ void cookie_to_stuff(char *cookie, int *session, char *user, char *pass, char *r
 	if (session != NULL)
 		*session = extract_int(buf, 0);
 	if (user != NULL)
-		extract(user, buf, 1);
+		extract_token(user, buf, 1, '|', user_len);
 	if (pass != NULL)
-		extract(pass, buf, 2);
+		extract_token(pass, buf, 2, '|', pass_len);
 	if (room != NULL)
-		extract(room, buf, 3);
+		extract_token(room, buf, 3, '|', room_len);
 }