napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1220 from a-wai/prevent-int-overflow

Browse Source 
Prevent integer overflow when parsing configuration
This commit is contained in:
Adriaan de Groot 2019-08-13 16:21:35 +02:00 committed by GitHub
commit 1d047839c7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/libcalamares/PythonHelper.cpp
View File

@ -52,6 +52,9 @@ variantToPyObject( const QVariant& variant )
case QVariant::Int:
return bp::object( variant.toInt() );
case QVariant::LongLong:
return bp::object( variant.toLongLong() );
case QVariant::Double:
return bp::object( variant.toDouble() );

2
src/libcalamares/partition/PartitionSize.cpp
View File

@ -50,7 +50,7 @@ PartitionSize::PartitionSize( const QString& s )
if ( m_unit == SizeUnit::None )
{
m_value = s.toInt();
m_value = s.toLongLong();
if ( m_value > 0 )
{
m_unit = SizeUnit::Byte;

8
src/libcalamares/utils/NamedSuffix.h
View File

@ -58,7 +58,7 @@ public:
}
/** @brief Specific value and unit. */
NamedSuffix( int value, unit_t unit )
NamedSuffix( qint64 value, unit_t unit )
: m_value( value )
, m_unit( unit )
{
@ -75,7 +75,7 @@ public:
for ( const auto& suffix : table.table )
if ( s.endsWith( suffix.first ) )
{
m_value = s.left( s.length() - suffix.first.length() ).toInt();
m_value = s.left( s.length() - suffix.first.length() ).toLongLong();
m_unit = suffix.second;
break;
}
@ -89,7 +89,7 @@ public:
*/
NamedSuffix( const QString& s );
int value() const { return m_value; }
qint64 value() const { return m_value; }
unit_t unit() const { return m_unit; }
/** @brief Check that a value-unit combination is valid.
@ -100,7 +100,7 @@ public:
bool isValid() const;
protected:
int m_value;
qint64 m_value;
unit_t m_unit;
};

10
src/libcalamares/utils/Variant.cpp
View File

@ -61,10 +61,10 @@ getString( const QVariantMap& map, const QString& key )
return QString();
}
int
getInteger( const QVariantMap& map, const QString& key, int d )
qint64
getInteger( const QVariantMap& map, const QString& key, qint64 d )
{
int result = d;
qint64 result = d;
if ( map.contains( key ) )
{
auto v = map.value( key );
@ -72,6 +72,10 @@ getInteger( const QVariantMap& map, const QString& key, int d )
{
result = v.toInt();
}
else if ( v.type() == QVariant::LongLong )
{
result = v.toLongLong();
}
}
return result;

2
src/libcalamares/utils/Variant.h
View File

@ -41,7 +41,7 @@ DLLEXPORT QString getString( const QVariantMap& map, const QString& key );
/**
* Get an integer value from a mapping; returns @p d if no value.
*/
DLLEXPORT int getInteger( const QVariantMap& map, const QString& key, int d );
DLLEXPORT qint64 getInteger( const QVariantMap& map, const QString& key, qint64 d );
/**
* Get a double value from a mapping (integers are converted); returns @p d if no value.

2
src/libcalamares/utils/Yaml.cpp
View File

@ -79,7 +79,7 @@ yamlScalarToVariant( const YAML::Node& scalarNode )
}
if ( QRegExp( "[-+]?\\d+" ).exactMatch( scalarString ) )
{
return QVariant( scalarString.toInt() );
return QVariant( scalarString.toLongLong() );
}
if ( QRegExp( "[-+]?\\d*\\.?\\d+" ).exactMatch( scalarString ) )
{

4
src/modules/welcome/checker/GeneralRequirements.cpp
View File

@ -206,7 +206,7 @@ GeneralRequirements::setConfigurationMap( const QVariantMap& configurationMap )
if ( configurationMap.contains( "requiredStorage" ) &&
( configurationMap.value( "requiredStorage" ).type() == QVariant::Double ||
configurationMap.value( "requiredStorage" ).type() == QVariant::Int ) )
configurationMap.value( "requiredStorage" ).type() == QVariant::LongLong ) )
{
bool ok = false;
m_requiredStorageGiB = configurationMap.value( "requiredStorage" ).toDouble( &ok );
@ -227,7 +227,7 @@ GeneralRequirements::setConfigurationMap( const QVariantMap& configurationMap )
if ( configurationMap.contains( "requiredRam" ) &&
( configurationMap.value( "requiredRam" ).type() == QVariant::Double ||
configurationMap.value( "requiredRam" ).type() == QVariant::Int ) )
configurationMap.value( "requiredRam" ).type() == QVariant::LongLong ) )
{
bool ok = false;
m_requiredRamGiB = configurationMap.value( "requiredRam" ).toDouble( &ok );