Skip to content

Commit

Permalink
Merge pull request btcsuite#2233 from jharveyb/txid_string_check
Browse files Browse the repository at this point in the history
wire: check TXID length before creating outpoint
  • Loading branch information
Roasbeef authored Aug 15, 2024
2 parents bda7977 + ee7cf5e commit 029e5a3
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 0 deletions.
5 changes: 5 additions & 0 deletions wire/msgtx.go
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,11 @@ func NewOutPointFromString(outpoint string) (*OutPoint, error) {
if len(parts) != 2 {
return nil, errors.New("outpoint should be of the form txid:index")
}

if len(parts[0]) != chainhash.MaxHashStringSize {
return nil, errors.New("outpoint txid should be 64 hex chars")
}

hash, err := chainhash.NewHashFromStr(parts[0])
if err != nil {
return nil, err
Expand Down
9 changes: 9 additions & 0 deletions wire/msgtx_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -849,6 +849,15 @@ func TestTxOutPointFromString(t *testing.T) {
},
err: false,
},
{
name: "normal outpoint 2 with 31-byte txid",
input: "c7762a68ff164352bd31fd95fa875204e811c09acef40ba781787eb28e3b55:42",
result: &OutPoint{
Hash: hashFromStr("c7762a68ff164352bd31fd95fa875204e811c09acef40ba781787eb28e3b55"),
Index: 42,
},
err: true,
},
{
name: "bad string",
input: "not_outpoint_not_outpoint_not_outpoint",
Expand Down

0 comments on commit 029e5a3

Please sign in to comment.