cheng/libpng
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix undefined behavior in pngvalid.c

Browse Source 
Undefined because (png_byte) << shift is undefined if it changes the signed bit
(because png_byte is promoted to int).  The libpng exported functions
png_get_uint_32 and png_get_uint_16 handle this.

Bug reported by David Drysdale as a result of reports from UBSAN in clang 3.8.

This changes pngvalid to use BE random numbers; this used to produce errors but
these should not be fixed as a result of the previous changes.

Signed-off-by: John Bowler <jbowler@acm.org>
This commit is contained in:
John Bowler 2015-12-17 12:53:08 -08:00
parent 4aa590288b
commit 18765d0032
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/libtests/pngvalid.c
View File

@ -305,7 +305,7 @@ static void r16(png_uint_16p p16, size_t count)
{ {
unsigned char b2[2]; unsigned char b2[2];
randomize(b2, sizeof b2); randomize(b2, sizeof b2);
*p16++ = 0xFFFFU & ((b2[1] << 8) + b2[0]); *p16++ = png_get_uint_16(b2);
} }
} }
@ -322,7 +322,7 @@ static void r32(png_uint_32p p32, size_t count)
{ {
unsigned char b4[4]; unsigned char b4[4];
randomize(b4, sizeof b4); randomize(b4, sizeof b4);
*p32++ = (b4[3] << 24) + (b4[2] << 16) + (b4[1] << 8) + b4[0]; *p32++ = png_get_uint_32(b4);
} }
} }