fix parsing of "challenge" regarding NUL byte

diff --git a/server/rcon.pl b/server/rcon.pl
index 80b651a050dfa4207ed7f613f2e87bb98f8429c8..45952cb6b2b6b42679843994a0c4cc794f445ad6 100755 (executable)
--- a/server/rcon.pl
+++ b/server/rcon.pl
@@ -457,7 +457,7 @@ sub recvchallenge($)
                                        if not defined $s;
                                length $s
                                        or last;
-                               if($s =~ /^\377\377\377\377challenge (.*)$/s)
+                               if($s =~ /^\377\377\377\377challenge (.*?)(?:$|\0)/s)
                                {
                                        return $1;
                                }

diff --git a/server/rcon2irc/rcon2irc.pl b/server/rcon2irc/rcon2irc.pl
index b5d3c89e859405277dbfec3c27d9d60cf4e6e3b4..88a98ccc438c93dd4950f774248a8e99d34749b7 100755 (executable)
--- a/server/rcon2irc/rcon2irc.pl
+++ b/server/rcon2irc/rcon2irc.pl
@@ -514,7 +514,7 @@ sub recvchallenge($)
                                        if not defined $s;
                                length $s
                                        or last;
-                               if($s =~ /^\377\377\377\377challenge (.*)$/s)
+                               if($s =~ /^\377\377\377\377challenge (.*)(?:$|\0)/s)
                                {
                                        return $1;
                                }