External/fmt
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Workaround bogus coverity warnings

Browse Source
This commit is contained in:
vitaut 2015-10-21 06:16:55 -07:00
parent adee0dfc39
commit cd097d334e
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
format.cc
View File

@ -780,9 +780,11 @@ void fmt::BasicWriter<Char>::write_str(
const StrChar *str_value = s.value; const StrChar *str_value = s.value;
std::size_t str_size = s.size; std::size_t str_size = s.size;
if (str_size == 0) { if (str_size == 0) {
if (!str_value) if (!str_value) {
FMT_THROW(FormatError("string pointer is null")); FMT_THROW(FormatError("string pointer is null"));
else if (*str_value) return;
}
if (*str_value)
str_size = std::char_traits<StrChar>::length(str_value); str_size = std::char_traits<StrChar>::length(str_value);
} }
std::size_t precision = spec.precision_; std::size_t precision = spec.precision_;

5
test/printf-test.cc
View File

@ -337,10 +337,9 @@ void TestLength(const char *length_spec) {
TestLength<T>(length_spec, min); TestLength<T>(length_spec, min);
TestLength<T>(length_spec, max); TestLength<T>(length_spec, max);
using fmt::internal::check; using fmt::internal::check;
if (check(min >= 0 || static_cast<fmt::LongLong>(min) > fmt::LongLong long_long_min = std::numeric_limits<fmt::LongLong>::min();
std::numeric_limits<fmt::LongLong>::min())) { if (check(min >= 0) || check(static_cast<fmt::LongLong>(min) > long_long_min))
TestLength<T>(length_spec, fmt::LongLong(min) - 1); TestLength<T>(length_spec, fmt::LongLong(min) - 1);
}
fmt::ULongLong long_long_max = std::numeric_limits<fmt::LongLong>::max(); fmt::ULongLong long_long_max = std::numeric_limits<fmt::LongLong>::max();
if (check(max < 0 || static_cast<fmt::ULongLong>(max) < long_long_max)) if (check(max < 0 || static_cast<fmt::ULongLong>(max) < long_long_max))
TestLength<T>(length_spec, fmt::LongLong(max) + 1); TestLength<T>(length_spec, fmt::LongLong(max) + 1);