adding some bounds checking to the cursor location based on the expected results

1 files changed, 15 insertions, 4 deletions

diff --git a/system/db/content.go b/system/db/content.go
index 03e6a41..9aa86d8 100644
--- a/system/db/content.go
+++ b/system/db/content.go
@@ -217,17 +217,28 @@ func Query(namespace string, opts QueryOptions) [][]byte {
 		c := b.Cursor()
 		n := b.Stats().KeyN
 
+		var start, end int
+		switch opts.Count {
+		case -1:
+			start = 0
+			end = n
+
+		default:
+			start = opts.Count * opts.Offset
+			end = start + opts.Count
+		}
+
 		i := 0   // count of num posts added
 		cur := 0 // count of where cursor is
 		switch opts.Order {
 		case "asc":
 			for k, v := c.Last(); k != nil; c.Prev() {
-				if cur < opts.Offset*opts.Count {
+				if start < cur && cur < end {
 					cur++
 					continue
 				}
 
-				if i >= opts.Count || cur > n {
+				if i >= opts.Count {
 					break
 				}
 
@@ -237,12 +248,12 @@ func Query(namespace string, opts QueryOptions) [][]byte {
 
 		case "desc":
 			for k, v := c.First(); k != nil; c.Next() {
-				if cur < opts.Offset*opts.Count {
+				if start < cur && cur < end {
 					cur++
 					continue
 				}
 
-				if i >= opts.Count || cur > n {
+				if i >= opts.Count {
 					break
 				}