move check for large precision values closer to where needed

pauldreik · Jun 29, 2019 · 40a17be · 40a17be
1 parent ef6e23e
commit 40a17be
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/include/fmt/format-inl.h b/include/fmt/format-inl.h
@@ -244,6 +244,11 @@ template <> FMT_FUNC int count_digits<4>(internal::fallback_uintptr n) {
 template <typename T>
 int format_float(char* buf, std::size_t size, const char* format, int precision,
                  T value) {
+#ifdef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
+  if (precision > 100000) {
+    throw std::runtime_error("fuzz mode - avoid large allocation inside snprintf");
+  }
+#endif
   // Suppress the warning about nonliteral format string.
   auto snprintf_ptr = FMT_SNPRINTF;
   return precision < 0 ? snprintf_ptr(buf, size, format, value)
@@ -772,12 +777,6 @@ void sprintf_format(Double value, internal::buffer<char>& buf,
   *format_ptr++ = type;
   *format_ptr = '\0';
 
-#ifdef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
-  if (spec.precision > 1000) {
-    throw std::runtime_error("fuzz mode - avoiding large precision");
-  }
-#endif
-
   // Format using snprintf.
   char* start = nullptr;
   for (;;) {