Merge pull request #53 from boomlinde/missing-language-tag

make the StatusError language tag optional
pkg · Oct 31, 2015 · e09e01e · e09e01e
2 parents a80be15 + 57048f3
commit e09e01e
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/client.go b/client.go
@@ -1115,7 +1115,7 @@ func unmarshalStatus(id uint32, data []byte) error {
 	}
 	code, data := unmarshalUint32(data)
 	msg, data := unmarshalString(data)
-	lang, _ := unmarshalString(data)
+	lang, _, _ := unmarshalStringSafe(data)
 	return &StatusError{
 		Code: code,
 		msg:  msg,

diff --git a/client_test.go b/client_test.go
@@ -73,3 +73,14 @@ func TestFlags(t *testing.T) {
 		}
 	}
 }
+
+func TestMissingLangTag(t *testing.T) {
+	defer func() {
+		if r := recover(); r != nil {
+			t.Fail()
+		}
+	}()
+	buf := marshalUint32([]byte{}, 0)
+	buf = marshalStatus(buf, StatusError{})
+	_ = unmarshalStatus(0, buf[:len(buf)-4])
+}