Merge pull request #2719 from Chocobo1/dev6

Fix potential out-of-bound access in misc::friendlyUnit()
This commit is contained in:
sledgehammer999 2015-06-20 02:46:47 +03:00
commit cf1a62cec3

View File

@ -258,8 +258,10 @@ QString Utils::Misc::friendlyUnit(qreal val, bool is_speed)
if (val < 0)
return QCoreApplication::translate("misc", "Unknown", "Unknown (size)");
int i = 0;
while(val >= 1024. && i++<6)
while(val >= 1024. && i < 4) {
val /= 1024.;
++i;
}
QString ret;
if (i == 0)
ret = QString::number((long)val) + " " + QCoreApplication::translate("misc", units[0].source, units[0].comment);