Mercurial > nomad

changeset 828:e9addd3bf94b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
objstore: don't read past EOF in obj_read Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
author Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
date Wed, 15 Apr 2020 10:19:32 -0400
parents a1fd85c42d83
children 69df794fd719
files src/objstore/obj_txn.c
diffstat 1 files changed, 4 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/objstore/obj_txn.c	Wed Apr 15 10:19:00 2020 -0400
+++ b/src/objstore/obj_txn.c	Wed Apr 15 10:19:32 2020 -0400
@@ -65,6 +65,10 @@
 	size_t orig_len;
 	int ret;
 
+	if (offset >= ver->attrs.size)
+		return 0;
+
+	len = MIN(len, ver->attrs.size - offset);
 	orig_len = len;
 
 	if (ver->obj->ops->read)