Limit amount read when slurping message into memory.

This commit is contained in:
Bill Thiede 2014-03-27 21:37:25 -07:00
parent 6e9423bdb1
commit 56db982878

View File

@ -7,6 +7,7 @@ import (
"expvar" "expvar"
"flag" "flag"
"fmt" "fmt"
"io"
"io/ioutil" "io/ioutil"
"os" "os"
"path/filepath" "path/filepath"
@ -36,7 +37,12 @@ var (
dupCnt = expvar.NewInt("duplicates-found") dupCnt = expvar.NewInt("duplicates-found")
) )
var CRCR = []byte("\n\n") var (
CRCR = []byte("\n\n")
// Maximum bytes we parse when decoding
// email message, 50MB.
maxMessageSize int64 = 50 << 20
)
func Load(db *sql.DB, uid int, root string, skip *set.StringSet) error { func Load(db *sql.DB, uid int, root string, skip *set.StringSet) error {
dup := set.NewStrings() dup := set.NewStrings()
@ -89,7 +95,7 @@ func Load(db *sql.DB, uid int, root string, skip *set.StringSet) error {
} }
defer r.Close() defer r.Close()
b, err := ioutil.ReadAll(r) b, err := ioutil.ReadAll(&io.LimitedReader{R: r, N: maxMessageSize})
if err != nil { if err != nil {
return err return err
} }