From 53e525c4f3a6b0bfdc346b4563c6c8fc0e1b5b11 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Thu, 13 Oct 2011 16:25:21 -0500 Subject: Fix some strict 32-bit gcc warnings Signed-off-by: Dan McGee --- lib/libalpm/util.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'lib/libalpm') diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index 43f6cd52..0d499ad4 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -960,7 +960,9 @@ int _alpm_archive_fgets(struct archive *a, struct archive_read_buffer *b) b->line_size = b->block_size + 1; b->line_offset = b->line; } else { - size_t new = eol ? (eol - b->block_offset) : block_remaining; + /* note: we know eol > b->block_offset and b->line_offset > b->line, + * so we know the result is unsigned and can fit in size_t */ + size_t new = eol ? (size_t)(eol - b->block_offset) : block_remaining; size_t needed = (size_t)((b->line_offset - b->line) + new + 1); if(needed > b->max_line_size) { b->ret = -ERANGE; -- cgit v1.2.3