Fix cprintf bug, plus minor cleanup & better error messages.

base/cprintf.cc:
    Fix bug where a call with a format string with no specifiers
    but one or more arguments would crash.  Old code tried to print
    extra args using last available format, but in this case there
    was no format, hence the problem.  Now we just print "<extra arg>"
    for each extra arg.

    Also reorganized code a bit to make scope of fmt variable
    match the scope in which you can be confident it's meaningful.
base/cprintf.hh:
    Print specific error message instead of calling format_invalid().
base/cprintf_formats.hh:
    Clear Format object in constructor.
    Use specific error messages instead of format_invalid() function.

--HG--
extra : convert_revision : 87d5e902174e3eb2583131d056742af166540db0

1 files changed, 20 insertions, 19 deletions

diff --git a/base/cprintf.cc b/base/cprintf.cc
index af3b26a57..5796a712b 100644
--- a/base/cprintf.cc
+++ b/base/cprintf.cc
@@ -45,8 +45,6 @@ ArgList::dump(const string &format)
     stream->fill(' ');
     stream->flags((ios::fmtflags)0);
 
-    Format fmt;
-
     while (*p) {
         switch (*p) {
           case '%': {
@@ -56,12 +54,7 @@ ArgList::dump(const string &format)
                   continue;
               }
 
-              if (objects.empty())
-                  format_invalid(*stream);
-
-              Base *data = objects.front();
-
-              fmt.clear();
+              Format fmt;
               bool done = false;
               bool end_number = false;
               bool have_precision = false;
@@ -205,18 +198,26 @@ ArgList::dump(const string &format)
                   }
               }
 
-              ios::fmtflags saved_flags = stream->flags();
-              char old_fill = stream->fill();
-              int old_precision = stream->precision();
+              if (!objects.empty())
+              {
+                  Base *data = objects.front();
+                  objects.pop_front();
+
+                  ios::fmtflags saved_flags = stream->flags();
+                  char old_fill = stream->fill();
+                  int old_precision = stream->precision();
 
-              data->process(*stream, fmt);
+                  data->process(*stream, fmt);
 
-              stream->flags(saved_flags);
-              stream->fill(old_fill);
-              stream->precision(old_precision);
+                  stream->flags(saved_flags);
+                  stream->fill(old_fill);
+                  stream->precision(old_precision);
+
+                  delete data;
+              } else {
+                  *stream << "<missing arg for format>";
+              }
 
-              delete data;
-              objects.pop_front();
               ++p;
           }
             break;
@@ -241,10 +242,10 @@ ArgList::dump(const string &format)
     }
 
     while (!objects.empty()) {
+        *stream << "<extra arg>";
         Base *data = objects.front();
-        data->process(*stream, fmt);
-        delete data;
         objects.pop_front();
+        delete data;
     }
 }