Mercurial > hg

changeset 10449:7c8266c1d15a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
parsers: fix some signed comparison issues (spotted by Steve Borho)
author Matt Mackall <mpm@selenic.com>
date Sat, 13 Feb 2010 17:37:44 -0600
parents 6e5a47398fc5
children b4fd900569b1
files mercurial/parsers.c
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/parsers.c	Sat Feb 13 22:10:31 2010 +0100
+++ b/mercurial/parsers.c	Sat Feb 13 17:37:44 2010 -0600
@@ -194,7 +194,7 @@
 		mtime = ntohl(*(uint32_t *)(decode + 8));
 		flen = ntohl(*(uint32_t *)(decode + 12));
 		cur += 17;
-		if (flen > end - cur) {
+		if (cur + flen > end || cur + flen < cur) {
 			PyErr_SetString(PyExc_ValueError, "overflow in dirstate");
 			goto quit;
 		}
@@ -332,7 +332,7 @@
 
 		n++;
 		step = 64 + (inlined ? comp_len : 0);
-		if (end - data < step)
+		if (data + step > end || data + step < data)
 			break;
 		data += step;
 	}