stream.go: Finishing up Sum()

stream.go

@@ -3,6 +3,7 @@ package merkle
 import (
 	"hash"
 	"log"
+	"runtime"
 )
 
 // NewHash provides a hash.Hash to generate a merkle.Tree checksum, given a
@@ -39,23 +40,62 @@ type merkleHash struct {
 //
 // if that last block was complete, then no worries. start the next node.
 func (mh *merkleHash) Sum(b []byte) []byte {
-	if b != nil && (len(b)+mh.lastBlockLen) > mh.blockSize {
+	var (
-		// write a full node
+		curBlock     = []byte{}
+		offset   int = 0
+	)
+	if mh.partialLastNode {
+		// if this is true, then we need to pop the last node
+		mh.tree.Nodes = mh.tree.Nodes[:len(mh.tree.Nodes)-1]
+		mh.partialLastNode = false
 	}
 
-	n, err := NewNodeHashBlock(mh.hm, curBlock)
+	if mh.lastBlockLen > 0 {
-	if err != nil {
+		curBlock = append(curBlock[:], mh.lastBlock[:mh.lastBlockLen]...)
-		// XXX might need to stash again the prior lastBlock and first little chunk
+		mh.lastBlockLen = 0
-		return numWritten, err
+	}
+
+	if b != nil && len(b) > 0 {
+		curBlock = append(curBlock, b...)
+	}
+
+	for i := 0; i < len(curBlock)/mh.blockSize; i++ {
+		n, err := NewNodeHashBlock(mh.hm, curBlock[offset:(offset+mh.blockSize)])
+		if err != nil {
+			// XXX i hate to swallow an error here, but the `Sum() []byte` signature
+			// :-\
+			sBuf := make([]byte, 1024)
+			runtime.Stack(sBuf, false)
+			log.Printf("[ERROR]: %s %q", err, string(sBuf))
+			return nil
+		}
+		mh.tree.Nodes = append(mh.tree.Nodes, n)
+		offset = offset + mh.blockSize
+	}
+
+	// If there is remainder, we'll need to make a partial node and stash it
+	if m := (len(curBlock) % mh.blockSize); m != 0 {
+		mh.lastBlockLen = copy(mh.lastBlock, curBlock[offset:])
+
+		n, err := NewNodeHashBlock(mh.hm, curBlock[offset:])
+		if err != nil {
+			sBuf := make([]byte, 1024)
+			runtime.Stack(sBuf, false)
+			log.Printf("[ERROR]: %s %q", err, string(sBuf))
+			return nil
+		}
+		mh.tree.Nodes = append(mh.tree.Nodes, n)
+		mh.partialLastNode = true
 	}
-	mh.tree.Nodes = append(mh.tree.Nodes, n)
-	numWritten += offset
 
-	// TODO check if len(mh.lastBlock) < blockSize
 	sum, err := mh.tree.Root().Checksum()
 	if err != nil {
-		// XXX i hate to swallow an error here, but the `Sum() []byte` signature :-\
+		// XXX i hate to swallow an error here, but the `Sum() []byte` signature
-		log.Printf("[ERROR]: %s", err)
+		// :-\
+		sBuf := make([]byte, 1024)
+		runtime.Stack(sBuf, false)
+		log.Printf("[ERROR]: %s %q", err, string(sBuf))
+		return nil
 	}
 	return sum
 }