aboutsummaryrefslogtreecommitdiff
path: root/src/encoding
diff options
context:
space:
mode:
Diffstat (limited to 'src/encoding')
-rw-r--r--src/encoding/asn1/marshal.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/encoding/asn1/marshal.go b/src/encoding/asn1/marshal.go
index 67a019db2d..c901963186 100644
--- a/src/encoding/asn1/marshal.go
+++ b/src/encoding/asn1/marshal.go
@@ -627,7 +627,7 @@ func marshalField(out *forkableWriter, v reflect.Value, params fieldParameters)
})
}
- return nil
+ return err
}
// Marshal returns the ASN.1 encoding of val.
@@ -648,5 +648,5 @@ func Marshal(val interface{}) ([]byte, error) {
return nil, err
}
_, err = f.writeTo(&out)
- return out.Bytes(), nil
+ return out.Bytes(), err
}