fail early if incomplete

client/decoder.go

@@ -1,13 +1,22 @@
 package client
 
 import (
+ "fmt"
+
  "github.com/cosmos/cosmos-sdk/store/types"
+ sdk "github.com/cosmos/cosmos-sdk/types"
  "github.com/gogo/protobuf/proto"
 )
 
 func DecodeData(data []byte) (pairs []types.StoreKVPair, err error) {
- offset := 8
- for offset < len(data) {
+ const prefixLen = 8
+ offset := prefixLen
+ dataSize := sdk.BigEndianToUint64(data[:offset])
+ size := len(data)
+ if int(dataSize)+prefixLen != size {
+ return nil, fmt.Errorf("incomplete file: %v vs %v", dataSize, size)
+ }
+ for offset < size {
  size, n := proto.DecodeVarint(data[offset:])
  offset += n
  pair := new(types.StoreKVPair)

client/file/sync.go

@@ -96,11 +96,13 @@ func Sync(versionDB *tmdb.Store, remoteGrpcUrl, remoteUrl, remoteWsUrl, rootDir
  case data := <-chData:
  pairs, err := client.DecodeData(data.Data)
  fmt.Printf("mm-pairs: %+v, %+v\n", len(pairs), err)
- if err == nil {
- if err = versionDB.PutAtVersion(int64(data.BlockNum), pairs); err != nil {
- fmt.Println("mm-put-at-version-panic")
- panic(err)
- }
+ if err != nil {
+ fmt.Println("invalid decode")
+ panic(err)
+ }
+ if err = versionDB.PutAtVersion(int64(data.BlockNum), pairs); err != nil {
+ fmt.Println("mm-put-at-version-panic")
+ panic(err)
  }
  case err := <-chErr:
  // fail read