Check for null string pointer.

2012-12-17 16:39:49 -08:00
parent f8c9106d67
commit 1b3c197bff
2 changed files with 10 additions and 2 deletions
--- a/format.cc
+++ b/format.cc
@@ -408,8 +408,12 @@ void Formatter::DoFormat() {
        ReportUnknownType(type, "string");
      const char *str = arg.string.value;
      size_t size = arg.string.size;
-      if (size == 0 && *str)
-        size = std::strlen(str);
+      if (size == 0) {
+        if (!str)
+          throw FormatError("string pointer is null");
+        if (*str)
+          size = std::strlen(str);
+      }
      char *out = GrowBuffer(std::max<size_t>(width, size));
      out = std::copy(str, str + size, out);
      if (static_cast<unsigned>(width) > size)