King_DuckZ/Loki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fixed bugs 2792371 and 2694060 by adding checks for end of format.

Browse source 
git-svn-id: svn://svn.code.sf.net/p/loki-lib/code/trunk@1135 7ec92016-0320-0410-acc4-a06ded1c099a
This commit is contained in:
rich_sposato 2011-10-04 00:50:00 +00:00
parent 9fe637bf8b
commit 5fdebe2bf7
1 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
include/loki/SafeFormat.h
View file

@ -135,6 +135,11 @@ namespace Loki
// Print (or gobble in case of the "*" specifier) an int
PrintfState& operator()(LOKI_SAFEFORMAT_UNSIGNED_LONG i) {
if ( '\0' == *format_ )
{
::std::logic_error ex( "invalid number of parameters for Loki::SafeFormat!" );
throw ex;
}
if (result_ == -1) return *this; // don't even bother
// % [flags] [width] [.prec] [modifier] type_char
// Fetch the flags
@ -208,6 +213,11 @@ namespace Loki
}
PrintfState& operator()(const char *const s) {
if ( '\0' == *format_ )
{
::std::logic_error ex( "invalid number of parameters for Loki::SafeFormat!" );
throw ex;
}
if (result_ == -1) return *this;
ReadLeaders();
const char fmt = *format_;
@ -219,7 +229,7 @@ namespace Loki
result_ = -1;
return *this;
}
const size_t len = std::min(std::strlen(s), prec_);
const size_t len = std::min(std::strlen(s), prec_);
if (width_ > len) {
if (LeftJustify()) {
Write(s, s + len);
@ -359,6 +369,11 @@ namespace Loki
template <class Value>
void PrintUsing_snprintf(Value n, const char* check_fmt_char) {
if ( '\0' == *format_ )
{
::std::logic_error ex( "invalid number of parameters for Loki::SafeFormat!" );
throw ex;
}
const Char *const fmt = format_ - 1;
assert(*fmt == '%');
// enforce format string validity