remove undefined behavior sanitizer warning

This commit is contained in:
Lev Walkin 2017-09-18 00:38:43 -07:00
parent 0368c628ee
commit a75b247f72
6 changed files with 6 additions and 11 deletions

View File

@ -189,8 +189,7 @@ load_object_from(const char *fname, enum expectation expectation, unsigned char
fbuf_left, fbuf_offset, size);
assert(fbuf_offset == (ssize_t)size);
} else {
assert(fbuf_offset - size < 2
|| (fbuf_offset + 1 /* "\n" */ == (ssize_t)size
assert((fbuf_offset + 1 /* "\n" */ == (ssize_t)size
&& fbuf[size - 1] == '\n')
|| (fbuf_offset + 2 /* "\r\n" */ == (ssize_t)size
&& fbuf[size - 2] == '\r'

View File

@ -189,8 +189,7 @@ load_object_from(const char *fname, enum expectation expectation, unsigned char
fbuf_left, fbuf_offset, size);
assert(fbuf_offset == (ssize_t)size);
} else {
assert(fbuf_offset - size < 2
|| (fbuf_offset + 1 /* "\n" */ == (ssize_t)size
assert((fbuf_offset + 1 /* "\n" */ == (ssize_t)size
&& fbuf[size - 1] == '\n')
|| (fbuf_offset + 2 /* "\r\n" */ == (ssize_t)size
&& fbuf[size - 2] == '\r'

View File

@ -190,8 +190,7 @@ load_object_from(const char *fname, unsigned char *fbuf, size_t size, enum encty
fbuf_left, fbuf_offset, size);
assert(fbuf_offset == (ssize_t)size);
} else {
assert(fbuf_offset - size < 2
|| (fbuf_offset + 1 /* "\n" */ == (ssize_t)size
assert((fbuf_offset + 1 /* "\n" */ == (ssize_t)size
&& fbuf[size - 1] == '\n')
|| (fbuf_offset + 2 /* "\r\n" */ == (ssize_t)size
&& fbuf[size - 2] == '\r'

View File

@ -25,7 +25,7 @@ main() {
printf("Checking uper_open_type_put():\n");
assert(0 == uper_open_type_put(&asn_DEF_T, 0, &t, &po));
assert(po.nbits == (-1 + sizeof(po.tmpspace)) * 8);
assert(po.nbits == (-1 + (int)sizeof(po.tmpspace)) * 8);
printf("po{nboff=%zd; nbits=%zd; buffer=%p; tmpspace=%p}\n",
po.nboff, po.nbits, po.buffer, po.tmpspace);
/* One byte length and one byte 0x00 */

View File

@ -154,8 +154,7 @@ load_object_from(enum expectation expectation, unsigned char *fbuf, size_t size,
if(how == AS_DER) {
assert(fbuf_offset == (ssize_t)size);
} else {
assert(fbuf_offset - size < 2
|| (fbuf_offset + 1 /* "\n" */ == (ssize_t)size
assert((fbuf_offset + 1 /* "\n" */ == (ssize_t)size
&& fbuf[size - 1] == '\n')
|| (fbuf_offset + 2 /* "\r\n" */ == (ssize_t)size
&& fbuf[size - 2] == '\r'

View File

@ -143,8 +143,7 @@ load_object_from(enum expectation expectation, unsigned char *fbuf, size_t size,
if(how == AS_DER) {
assert(fbuf_offset == (ssize_t)size);
} else {
assert(fbuf_offset - size < 2
|| (fbuf_offset + 1 /* "\n" */ == (ssize_t)size
assert((fbuf_offset + 1 /* "\n" */ == (ssize_t)size
&& fbuf[size - 1] == '\n')
|| (fbuf_offset + 2 /* "\r\n" */ == (ssize_t)size
&& fbuf[size - 2] == '\r'