commands: Safer type coercion when choosing marshaller

33ad56e6 · Matt Bell · Juan Batiz-Benet · 0149f65c · 33ad56e6
Commit 33ad56e6 authored Nov 03, 2014 by Matt Bell Committed by Juan Batiz-Benet Nov 04, 2014
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 3 deletions

commands/response.go commands/response.go +4 -3

No files found.
--- a/commands/response.go
+++ b/commands/response.go
@@ -120,11 +120,12 @@ func (r *response) Marshal() ([]byte, error) {
 		return []byte{}, nil
 	}

-	enc, ok := r.req.Option(EncShort)
-	if !ok || enc.(string) == "" {
+	enc, found := r.req.Option(EncShort)
+	encStr, ok := enc.(string)
+	if !found || !ok || encStr == "" {
 		return nil, fmt.Errorf("No encoding type was specified")
 	}
-	encType := EncodingType(strings.ToLower(enc.(string)))
+	encType := EncodingType(strings.ToLower(encStr))

 	marshaller, ok := marshallers[encType]
 	if !ok {