Merge pull request tgstation#17682 from optimumtact/patch-1

Improve chatter regex to prevent infinite loop
warfighter8 · May 15, 2016 · c6cad13 · c6cad13
2 parents edad888 + 4a365ae
commit c6cad13
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/code/modules/chatter/chatter.dm b/code/modules/chatter/chatter.dm
@@ -10,8 +10,7 @@
 	var/list/punctuation = list(",",":",";",".","?","!","\'","-")
 	var/regex/R = regex("(\[\\l\\d]*)(\[^\\l\\d\\s])?", "g")
 	var/list/letter_count = list()
-	while(R.next <= length(message))
-		R.Find(message)
+	while(R.Find(message) != 0)
 		if(R.group[1])
 			letter_count += length(R.group[1])
 		if(R.group[2])