peranger/qskinny
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bugs found by the clang sanitizer

Browse Source
This commit is contained in:
Uwe Rathmann 2017-12-07 11:54:06 +01:00
parent 47a8df5214
commit a41d78be4f
3 changed files with 41 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/common/QskAspect.h
View File

@ -179,6 +179,10 @@ namespace QskAspect
constexpr Aspect( uint subControl, uint type, bool isAnimator,
uint primitive, uint placement, uint states );
union
{
struct
{
uint m_subControl : 12;
uint m_type : 3;
@ -190,8 +194,11 @@ namespace QskAspect
uint m_states : 16;
uint m_reserved2 : 16;
};
} Q_PACKED;
quint64 m_value;
};
};
inline constexpr Aspect::Aspect():
Aspect( Control, Flag, Preserved )
@ -233,17 +240,17 @@ namespace QskAspect
inline bool Aspect::operator==( const Aspect& other ) const
{
return value() == other.value();
return m_value == other.m_value;
}
inline bool Aspect::operator!=( const Aspect& other ) const
{
return value() != other.value();
return m_value != other.m_value;
}
inline bool Aspect::operator<( const Aspect& other ) const
{
return value() < other.value();
return m_value < other.m_value;
}
inline constexpr Aspect Aspect::operator|( Subcontrol subControl ) const
@ -288,7 +295,7 @@ namespace QskAspect
inline constexpr quint64 Aspect::value() const
{
return *( const quint64* ) this;
return m_value;
}
inline bool Aspect::isAnimator() const

7
src/controls/QskControl.cpp
View File

@ -561,9 +561,12 @@ void QskControl::updateControlFlags( Flags flags )
if ( oldFlags != newFlags )
{
for ( uint i = 0; i <= LastFlag; ++i )
const auto numBits = qCountTrailingZeroBits(
static_cast< quint32 >( LastFlag ) );
for ( quint32 i = 0; i <= numBits; ++i )
{
const uint flag = ( 1 << i );
const quint32 flag = ( 1 << i );
updateControlFlag( flag, flags & flag );
}

17
src/controls/QskVariantAnimator.cpp
View File

@ -33,9 +33,22 @@ static void qskRegisterInterpolator()
Q_CONSTRUCTOR_FUNCTION( qskRegisterInterpolator )
#endif
static inline QVariant qskInterpolate( void( *interpolator )(),
const QVariant& from, const QVariant& to, qreal progress )
#if defined(Q_CC_CLANG)
#if __has_feature(address_sanitizer)
#define QSK_DECL_INSANE __attribute__ ( ( no_sanitize ("undefined") ) )
#endif
#endif
QSK_DECL_INSANE static inline QVariant qskInterpolate (
void( *interpolator )(), const QVariant& from, const QVariant& to, qreal progress )
{
#if 1
/*
how to get rid of the reported runtime error from the clang sanitizer,
when calling F( const T&, ... ) as G( const void* ... ); TODO ...
*/
#endif
auto f = reinterpret_cast< QVariantAnimation::Interpolator >( interpolator );
return f( from.constData(), to.constData(), progress );
}