diff options
| author | Dmitry Golovin <dima@golovin.in> | 2017-08-22 17:28:21 +0300 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2017-08-23 08:56:44 +0300 |
| commit | 16336ba2655db7f1df78437deb6de84d16c7c3c1 (patch) | |
| tree | 557d7aaf407953b431f0d4cc4146afff6ffd336f /src | |
| parent | 04003569c54d3cfce7ae7d06199c2ca1e510f38a (diff) | |
| download | apk-tools-16336ba2655db7f1df78437deb6de84d16c7c3c1.tar.gz apk-tools-16336ba2655db7f1df78437deb6de84d16c7c3c1.tar.bz2 apk-tools-16336ba2655db7f1df78437deb6de84d16c7c3c1.tar.xz apk-tools-16336ba2655db7f1df78437deb6de84d16c7c3c1.zip | |
fix comparison of unsigned expression < 0 is always false
found by clang
Diffstat (limited to 'src')
| -rw-r--r-- | src/archive.c | 3 | ||||
| -rw-r--r-- | src/io.c | 8 |
2 files changed, 7 insertions, 4 deletions
diff --git a/src/archive.c b/src/archive.c index b1f9c30..9196cb2 100644 --- a/src/archive.c +++ b/src/archive.c @@ -159,8 +159,9 @@ static void handle_extended_header(struct apk_file_info *fi, apk_blob_t hdr) unsigned int len = apk_blob_pull_uint(&hdr, 10); apk_blob_pull_char(&hdr, ' '); if (!apk_blob_split(hdr, APK_BLOB_STR("="), &name, &hdr)) break; + if (len < hdr.ptr - start + 1) break; len -= hdr.ptr - start + 1; - if (len < 0 || hdr.len < len) break; + if (hdr.len < len) break; value = APK_BLOB_PTR_LEN(hdr.ptr, len); hdr = APK_BLOB_PTR_LEN(hdr.ptr+len, hdr.len-len); apk_blob_pull_char(&hdr, '\n'); @@ -151,7 +151,8 @@ struct apk_istream *apk_istream_from_file(int atfd, const char *file) size_t apk_istream_skip(struct apk_istream *is, size_t size) { unsigned char buf[2048]; - size_t done = 0, r, togo; + size_t done = 0, togo; + ssize_t r; while (done < size) { togo = size - done; @@ -173,7 +174,8 @@ size_t apk_istream_splice(void *stream, int fd, size_t size, static void *splice_buffer = NULL; struct apk_istream *is = (struct apk_istream *) stream; unsigned char *buf, *mmapbase = MAP_FAILED; - size_t bufsz, done = 0, r, togo; + size_t bufsz, done = 0, togo; + ssize_t r; bufsz = size; if (size > 128 * 1024) { @@ -536,7 +538,7 @@ struct apk_bstream *apk_bstream_tee(struct apk_bstream *from, int atfd, const ch apk_blob_t apk_blob_from_istream(struct apk_istream *is, size_t size) { void *ptr; - size_t rsize; + ssize_t rsize; ptr = malloc(size); if (ptr == NULL) |