From 840330f271f25b093c7a86b41e7cddaec0cb6d7f Mon Sep 17 00:00:00 2001 From: Kaz Kylheku Date: Tue, 6 Jun 2017 06:25:58 -0700 Subject: c++ maintenance: signed/unsigned comparisons. * ffi.c (ffi_sbit_put, make_ffi_type_struct): Fix signed/unsigned comparison warning from g++. (pad_retval): Likewise. * stream.c (stdio_put_buf, stdio_fill_buf): Likewise. --- stream.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'stream.c') diff --git a/stream.c b/stream.c index a4560f05..64ca8888 100644 --- a/stream.c +++ b/stream.c @@ -860,9 +860,9 @@ static val stdio_put_buf(val stream, val buf, cnum pos) ucnum len = c_unum(length_buf(buf)); mem_t *ptr = buf_get(buf, self); struct stdio_handle *h = coerce(struct stdio_handle *, stream->co.handle); - if ((size_t) len != len) + if ((size_t) len != len || len > INT_PTR_MAX) uw_throwf(error_s, lit("~a: buffer too large"), self, nao); - if (pos >= len) + if (convert(ucnum, pos) >= len) return num(len); errno = 0; if (h->f != 0) { @@ -880,9 +880,9 @@ static val stdio_fill_buf(val stream, val buf, cnum pos) ucnum len = c_unum(length_buf(buf)); mem_t *ptr = buf_get(buf, self); struct stdio_handle *h = coerce(struct stdio_handle *, stream->co.handle); - if ((size_t) len != len) + if ((size_t) len != len || len > INT_PTR_MAX) uw_throwf(error_s, lit("~a: buffer too large"), self, nao); - if (pos >= len) + if (convert(ucnum, pos) >= len) return num(len); errno = 0; if (h->f != 0) { -- cgit v1.2.3