walkero
/
openjpeg
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Remove OPJ_NOSANITIZE in opj_bio_read() and opj_bio_write() (#761) 

Commit 29313eb5 introduced those flags to avoid issues with
-fsanitize=unsigned-integer-overflow
However it is better just to rewrite the loop to avoid such condition
to occur.
This commit is contained in:
Even Rouault 2017-06-17 19:15:00 +02:00
parent 32b20b93e0
commit 8df2521a60
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/lib/openjp2/bio.c
View File

@ -162,21 +162,19 @@ void opj_bio_init_dec(opj_bio_t *bio, OPJ_BYTE *bp, OPJ_UINT32 len)
bio->ct = 0; bio->ct = 0;
} }
OPJ_NOSANITIZE("unsigned-integer-overflow")
void opj_bio_write(opj_bio_t *bio, OPJ_UINT32 v, OPJ_UINT32 n) void opj_bio_write(opj_bio_t *bio, OPJ_UINT32 v, OPJ_UINT32 n)
{ {
OPJ_UINT32 i; OPJ_INT32 i;
assert((n > 0U) && (n <= 32U)); assert((n > 0U) && (n <= 32U));
for (i = n - 1; i < n; i--) { /* overflow used for end-loop condition */ for (i = (OPJ_INT32)n - 1; i >= 0; i--) {
opj_bio_putbit(bio, (v >> i) & 1); opj_bio_putbit(bio, (v >> i) & 1);
} }
} }
OPJ_NOSANITIZE("unsigned-integer-overflow")
OPJ_UINT32 opj_bio_read(opj_bio_t *bio, OPJ_UINT32 n) OPJ_UINT32 opj_bio_read(opj_bio_t *bio, OPJ_UINT32 n)
{ {
OPJ_UINT32 i; OPJ_INT32 i;
OPJ_UINT32 v; OPJ_UINT32 v;
assert((n > 0U) /* && (n <= 32U)*/); assert((n > 0U) /* && (n <= 32U)*/);
@ -187,7 +185,7 @@ OPJ_UINT32 opj_bio_read(opj_bio_t *bio, OPJ_UINT32 n)
assert(n <= 32U); assert(n <= 32U);
#endif #endif
v = 0U; v = 0U;
for (i = n - 1; i < n; i--) { /* overflow used for end-loop condition */ for (i = (OPJ_INT32)n - 1; i >= 0; i--) {
v |= opj_bio_getbit(bio) << v |= opj_bio_getbit(bio) <<
i; /* can't overflow, opj_bio_getbit returns 0 or 1 */ i; /* can't overflow, opj_bio_getbit returns 0 or 1 */
} }