X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Frooms.c;h=649b21a9909479b86d210feb2c5030b49c7fac87;hb=b425dda0a48b4a3e24a9f22d25e864d42679feee;hp=1226455c3afd25202991f9f98060dbba4870e8f4;hpb=8b8941a7c48dfcbec1f356150990da20093d6a16;p=citadel.git

diff --git a/citadel/rooms.c b/citadel/rooms.c
index 1226455c3..649b21a99 100644
--- a/citadel/rooms.c
+++ b/citadel/rooms.c
@@ -1057,7 +1057,7 @@ void entroom(CtdlIPC *ipc)
 	if (IsEmptyStr(new_room_name)) {
 		return;
 	}
-	for (a = 0; a < strlen(new_room_name); ++a) {
+	for (a = 0; !IsEmptyStr(&new_room_name[a]); ++a) {
 		if (new_room_name[a] == '|') {
 			new_room_name[a] = '_';
 		}
@@ -1084,7 +1084,7 @@ void entroom(CtdlIPC *ipc)
 	new_room_type = b - 1;
 	if (new_room_type == 2) {
 		newprompt("Enter a room password: ", new_room_pass, 9);
-		for (a = 0; a < strlen(new_room_pass); ++a)
+		for (a = 0; !IsEmptyStr(&new_room_pass[a]); ++a)
 			if (new_room_pass[a] == '|')
 				new_room_pass[a] = '_';
 	} else {