Browse Source

Merge pull request #2719 from Chocobo1/dev6

Fix potential out-of-bound access in misc::friendlyUnit()
adaptive-webui-19844
sledgehammer999 10 years ago
parent
commit
cf1a62cec3
  1. 4
      src/core/utils/misc.cpp

4
src/core/utils/misc.cpp

@ -258,8 +258,10 @@ QString Utils::Misc::friendlyUnit(qreal val, bool is_speed) @@ -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);

Loading…
Cancel
Save