Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Return error if writer is nil #8

Merged
merged 2 commits into from
Jan 25, 2024
Merged

Return error if writer is nil #8

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5c3a05e
Only write buffer if it is not nil
boecklim Jan 22, 2024
6dd2720
Writer must not be nil
boecklim Jan 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions wire/message.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ package wire

import (
"bytes"
"errors"
"fmt"
"io"
"unicode/utf8"
Expand Down Expand Up @@ -286,14 +287,14 @@ func discardInput(r io.Reader, n uint64) {
}

// WriteMessageN writes a bitcoin Message to w including the necessary header
// information and returns the number of bytes written. This function is the
// information and returns the number of bytes written. This function is the
// same as WriteMessage except it also returns the number of bytes written.
func WriteMessageN(w io.Writer, msg Message, pver uint32, bsvnet BitcoinNet) (int, error) {
return WriteMessageWithEncodingN(w, msg, pver, bsvnet, BaseEncoding)
}

// WriteMessage writes a bitcoin Message to w including the necessary header
// information. This function is the same as WriteMessageN except it doesn't
// information. This function is the same as WriteMessageN except it
// doesn't return the number of bytes written. This function is mainly provided
// for backwards compatibility with the original API, but it's also useful for
// callers that don't care about byte counts.
Expand All @@ -310,6 +311,10 @@ func WriteMessage(w io.Writer, msg Message, pver uint32, bsvnet BitcoinNet) erro
func WriteMessageWithEncodingN(w io.Writer, msg Message, pver uint32,
bsvnet BitcoinNet, encoding MessageEncoding) (int, error) {

if w == nil {
return 0, errors.New("writer must not be nil")
}

totalBytes := 0

// Enforce max command size.
Expand Down Expand Up @@ -376,7 +381,7 @@ func WriteMessageWithEncodingN(w io.Writer, msg Message, pver uint32,
// from r for the provided protocol version and bitcoin network. It returns the
// number of bytes read in addition to the parsed Message and raw bytes which
// comprise the message. This function is the same as ReadMessageN except it
// allows the caller to specify which message encoding is to to consult when
// allows the caller to specify which message encoding is to consult when
// decoding wire messages.
func ReadMessageWithEncodingN(r io.Reader, pver uint32, bsvnet BitcoinNet, enc MessageEncoding) (int, Message, []byte, error) {

Expand Down