Merge pull request #6713 from FeepingCreature/fix/avoid-ludicrous-ove…

…rallocation Fix issue 19252: avoid ludicrous format length overestimate
dlang · Sep 20, 2018 · f12924e · f12924e
2 parents e80038b + c156f4a
commit f12924e
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/std/format.d b/std/format.d
@@ -6321,8 +6321,11 @@ private size_t guessLength(Char, S)(S fmtString)
 
         if (spec.width == spec.precision)
             len += spec.width;
-        else if (spec.width > 0 && (spec.precision == spec.UNSPECIFIED || spec.width > spec.precision))
+        else if (spec.width > 0 && spec.width != spec.DYNAMIC &&
+                 (spec.precision == spec.UNSPECIFIED || spec.width > spec.precision))
+        {
             len += spec.width;
+        }
         else if (spec.precision != spec.UNSPECIFIED && spec.precision > spec.width)
             len += spec.precision;
     }
@@ -6345,6 +6348,7 @@ unittest
     assert(guessLength!char("%2.4f") == 4);
     assert(guessLength!char("%02d:%02d:%02d") == 8);
     assert(guessLength!char("%0.2f") == 7);
+    assert(guessLength!char("%0*d") == 0);
 }
 
 /// ditto