Merge pull request xbmc#7724 from ace20022/oob

[coverity] Add an additional check to prevent an only theoretical out-of…
zzattack · Aug 12, 2015 · 3f1ce3b · 3f1ce3b
2 parents 62ad21a + 296a0c9
commit 3f1ce3b
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/xbmc/utils/StringUtils.cpp b/xbmc/utils/StringUtils.cpp
@@ -955,6 +955,13 @@ std::string StringUtils::SizeToString(int64_t size)
 
   if (!i)
     strLabel = StringUtils::Format("%.0lf B", s);
+  else if (i == ARRAY_SIZE(prefixes))
+  {
+    if (s >= 1000.0)
+      strLabel = StringUtils::Format(">999.99 %cB", prefixes[i - 1]);
+    else
+      strLabel = StringUtils::Format("%.2lf %cB", s, prefixes[i - 1]);
+  }
   else if (s >= 100.0)
     strLabel = StringUtils::Format("%.1lf %cB", s, prefixes[i]);
   else