From: Matt Joiner <anacrolix@gmail.com>
Date: Wed, 27 Aug 2014 22:09:41 +0000 (+1000)
Subject: Fix crashes in torrentfs.fileNode.Read
X-Git-Tag: v1.0.0~1587
X-Git-Url: http://www.git.stargrave.org/?a=commitdiff_plain;h=5668582c8ed63c0533baa55051198bd065e6c01b;p=btrtrc.git

Fix crashes in torrentfs.fileNode.Read
---

diff --git a/fs/torrentfs.go b/fs/torrentfs.go
index 3d712a19..a8d18cf1 100644
--- a/fs/torrentfs.go
+++ b/fs/torrentfs.go
@@ -87,6 +87,9 @@ func (fn fileNode) Read(req *fuse.ReadRequest, resp *fuse.ReadResponse, intr fus
 	}()
 	size := req.Size
 	fileLeft := int64(fn.size) - req.Offset
+	if fileLeft < 0 {
+		fileLeft = 0
+	}
 	if fileLeft < int64(size) {
 		size = int(fileLeft)
 	}
@@ -98,7 +101,7 @@ func (fn fileNode) Read(req *fuse.ReadRequest, resp *fuse.ReadResponse, intr fus
 	torrentOff := fn.TorrentOffset + req.Offset
 	go func() {
 		if err := fn.FS.Client.PrioritizeDataRegion(infoHash, torrentOff, int64(size)); err != nil {
-			panic(err)
+			log.Printf("error prioritizing %s: %s", fn.fsPath(), err)
 		}
 	}()
 	delayed := false