feedc0de/fmt
1
0
Fork 0
forked from fmtlib/fmt
Code Pull Requests Activity

Fix an issue with allocation of a zero-size array.

Browse Source
This commit is contained in:
Victor Zverovich
2014-06-06 08:01:10 -07:00
parent d9f5089a18
commit b88d261282
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
format.h
View File

@ -539,6 +539,17 @@ template <typename Char>
int ParseNonnegativeInt( int ParseNonnegativeInt(
const Char *&s, const char *&error) FMT_NOEXCEPT(true); const Char *&s, const char *&error) FMT_NOEXCEPT(true);
// Computes max(Arg, 1) at compile time. It is used to avoid errors about
// allocating an array of 0 size.
template <unsigned Arg>
struct NonZero {
enum { VALUE = Arg };
};
template <>
struct NonZero<0> {
enum { VALUE = 1 };
};
} // namespace internal } // namespace internal
/** /**
@ -926,6 +937,7 @@ class BasicWriter {
public: public:
using ArgInfo::type; using ArgInfo::type;
BasicArg() {}
BasicArg(short value) { type = INT; this->int_value = value; } BasicArg(short value) { type = INT; this->int_value = value; }
BasicArg(unsigned short value) { type = UINT; this->int_value = value; } BasicArg(unsigned short value) { type = UINT; this->int_value = value; }
BasicArg(int value) { type = INT; this->int_value = value; } BasicArg(int value) { type = INT; this->int_value = value; }
@ -1151,7 +1163,7 @@ class BasicWriter {
template<typename... Args> template<typename... Args>
void printf(BasicStringRef<Char> format, const Args & ... args) { void printf(BasicStringRef<Char> format, const Args & ... args) {
Arg arg_array[] = {args...}; Arg arg_array[internal::NonZero<sizeof...(Args)>::VALUE] = {args...};
vprintf(format, sizeof...(Args), arg_array); vprintf(format, sizeof...(Args), arg_array);
} }
#endif #endif