sergiotarxz/libvips
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

revise cast asserts

Browse Source 
since we allow casting between formats ofthe same size with shift enabled

fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=45016&q=libvips&can=2
This commit is contained in:
John Cupitt 2022-04-03 15:32:25 +01:00
parent 9228e50f46
commit 55b857d446
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libvips/conversion/cast.c
View File

@ -130,20 +130,23 @@ G_DEFINE_TYPE( VipsCast, vips_cast, VIPS_TYPE_CONVERSION );
#define CAST_UINT( X ) VIPS_CLIP( 0, (X), UINT_MAX ) #define CAST_UINT( X ) VIPS_CLIP( 0, (X), UINT_MAX )
#define CAST_INT( X ) VIPS_CLIP( INT_MIN, (X), INT_MAX ) #define CAST_INT( X ) VIPS_CLIP( INT_MIN, (X), INT_MAX )
/* Rightshift an integer type, ie. sizeof(ITYPE) > sizeof(OTYPE). /* Rightshift an integer type, ie. sizeof(ITYPE) >= sizeof(OTYPE).
*
* If we're casting between two formats of the same size (eg. ushort to
* short), sizes can be equal.
*/ */
#define SHIFT_RIGHT( ITYPE, OTYPE ) { \ #define SHIFT_RIGHT( ITYPE, OTYPE ) { \
ITYPE * restrict p = (ITYPE *) in; \ ITYPE * restrict p = (ITYPE *) in; \
OTYPE * restrict q = (OTYPE *) out; \ OTYPE * restrict q = (OTYPE *) out; \
int n = ((int) sizeof( ITYPE ) << 3) - ((int) sizeof( OTYPE ) << 3); \ int n = ((int) sizeof( ITYPE ) << 3) - ((int) sizeof( OTYPE ) << 3); \
\ \
g_assert( sizeof( ITYPE ) > sizeof( OTYPE ) ); \ g_assert( sizeof( ITYPE ) >= sizeof( OTYPE ) ); \
\ \
for( x = 0; x < sz; x++ ) \ for( x = 0; x < sz; x++ ) \
q[x] = p[x] >> n; \ q[x] = p[x] >> n; \
} }
/* Leftshift an integer type, ie. sizeof(ITYPE) < sizeof(OTYPE). We need to /* Leftshift an integer type, ie. sizeof(ITYPE) <= sizeof(OTYPE). We need to
* copy the bottom bit up into the fresh new bits. * copy the bottom bit up into the fresh new bits.
*/ */
#define SHIFT_LEFT( ITYPE, OTYPE ) { \ #define SHIFT_LEFT( ITYPE, OTYPE ) { \
@ -151,7 +154,7 @@ G_DEFINE_TYPE( VipsCast, vips_cast, VIPS_TYPE_CONVERSION );
OTYPE * restrict q = (OTYPE *) out; \ OTYPE * restrict q = (OTYPE *) out; \
int n = ((int) sizeof( OTYPE ) << 3) - ((int) sizeof( ITYPE ) << 3); \ int n = ((int) sizeof( OTYPE ) << 3) - ((int) sizeof( ITYPE ) << 3); \
\ \
g_assert( sizeof( ITYPE ) < sizeof( OTYPE ) ); \ g_assert( sizeof( ITYPE ) <= sizeof( OTYPE ) ); \
\ \
for( x = 0; x < sz; x++ ) \ for( x = 0; x < sz; x++ ) \
q[x] = (p[x] << n) | (((p[x] & 1) << n) - (p[x] & 1)); \ q[x] = (p[x] << n) | (((p[x] & 1) << n) - (p[x] & 1)); \
@ -162,7 +165,7 @@ G_DEFINE_TYPE( VipsCast, vips_cast, VIPS_TYPE_CONVERSION );
OTYPE * restrict q = (OTYPE *) out; \ OTYPE * restrict q = (OTYPE *) out; \
int n = ((int) sizeof( OTYPE ) << 3) - ((int) sizeof( ITYPE ) << 3); \ int n = ((int) sizeof( OTYPE ) << 3) - ((int) sizeof( ITYPE ) << 3); \
\ \
g_assert( sizeof( ITYPE ) < sizeof( OTYPE ) ); \ g_assert( sizeof( ITYPE ) <= sizeof( OTYPE ) ); \
\ \
for( x = 0; x < sz; x++ ) \ for( x = 0; x < sz; x++ ) \
q[x] = VIPS_LSHIFT_INT( p[x], n ) | \ q[x] = VIPS_LSHIFT_INT( p[x], n ) | \