use xmallocz to avoid size arithmetic

diff --git a/vcs-svn/sliding_window.c b/vcs-svn/sliding_window.c
index c6c2effd305381b23e63ca632b4dff0302d9b8ba..f11d490995ee7e3367c1d18e1058f2e322cfa177 100644 (file)
--- a/vcs-svn/sliding_window.c
+++ b/vcs-svn/sliding_window.c
@@ -31,15 +31,15 @@ static int read_to_fill_or_whine(struct line_buffer *file,
        return 0;
 }
 
-static int check_offset_overflow(off_t offset, size_t len)
+static int check_offset_overflow(off_t offset, uintmax_t len)
 {
        if (len > maximum_signed_value_of_type(off_t))
                return error("unrepresentable length in delta: "
-                               "%"PRIuMAX" > OFF_MAX", (uintmax_t) len);
+                               "%"PRIuMAX" > OFF_MAX", len);
        if (signed_add_overflows(offset, (off_t) len))
                return error("unrepresentable offset in delta: "
                                "%"PRIuMAX" + %"PRIuMAX" > OFF_MAX",
-                               (uintmax_t) offset, (uintmax_t) len);
+                               (uintmax_t) offset, len);
        return 0;
 }
 
@@ -54,7 +54,7 @@ int move_window(struct sliding_view *view, off_t off, size_t width)
                return -1;
        if (off < view->off || off + width < view->off + view->width)
                return error("invalid delta: window slides left");
-       if (view->max_off >= 0 && view->max_off < off + width)
+       if (view->max_off >= 0 && view->max_off < off + (off_t) width)
                return error("delta preimage ends early");
 
        file_offset = view->off + view->buf.len;