oss/FrankerFaceZ
oss/FrankerFaceZ
1
0
Fork 0
mirror of https://github.com/FrankerFaceZ/FrankerFaceZ.git synced 2025-09-15 17:46:55 +00:00
Code Wiki Activity

handle null clientid in ArgumetnsAsTwoStrings

Browse source
This commit is contained in:
Kane York 2015-10-28 16:07:51 -07:00
parent 59ba6d52f6
commit 43d596ad07
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
socketserver/internal/server/handlecore.go
View file

@ -96,8 +96,6 @@ func SetupServerAndHandle(config *ConfigFile, serveMux *http.ServeMux) {
} }
func ServeWebsocketOrCatbag(w http.ResponseWriter, r *http.Request) { func ServeWebsocketOrCatbag(w http.ResponseWriter, r *http.Request) {
fmt.Println("hi")
fmt.Println(r.Header)
if r.Header.Get("Connection") == "Upgrade" { if r.Header.Get("Connection") == "Upgrade" {
conn, err := SocketUpgrader.Upgrade(w, r, nil) conn, err := SocketUpgrader.Upgrade(w, r, nil)
if err != nil { if err != nil {
@ -397,6 +395,10 @@ func (cm *ClientMessage) ArgumentsAsTwoStrings() (string1, string2 string, err e
err = ExpectedTwoStrings err = ExpectedTwoStrings
return return
} }
// clientID can be null
if ary[1] == nil {
return string1, "", nil
}
string2, ok = ary[1].(string) string2, ok = ary[1].(string)
if !ok { if !ok {
err = ExpectedTwoStrings err = ExpectedTwoStrings