mirrors/phobos
1
0
Fork 0
mirror of https://github.com/dlang/phobos.git synced 2025-04-28 14:10:30 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix Issue 21875 - std.format: wrong number of format specifiers in

Browse source 
nested format string of associative arrays should be detected
This commit is contained in:
berni44 2021-04-29 08:01:38 +02:00 • committed by The Dlang Bot
parent 2fac584959
commit dbfb742ccd
1 changed files with 24 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

24
std/format/internal/write.d
View file

@ -1755,6 +1755,17 @@ if (is(AssocArrayTypeOf!T) && !is(T == enum) && !hasToString!(T, Char))
enum const(Char)[] defSpec = "%s" ~ f.keySeparator ~ "%s" ~ f.seqSeparator; enum const(Char)[] defSpec = "%s" ~ f.keySeparator ~ "%s" ~ f.seqSeparator;
auto fmtSpec = spec == '(' ? f.nested : defSpec; auto fmtSpec = spec == '(' ? f.nested : defSpec;
// testing correct nested format spec
import std.format : NoOpSink;
auto noop = NoOpSink();
auto test = FormatSpec!Char(fmtSpec);
enforceFmt(test.writeUpToNextSpec(noop),
"nested format string for associative array contains no format specifier");
enforceFmt(test.writeUpToNextSpec(noop),
"nested format string for associative array contains only one format specifier");
enforceFmt(!test.writeUpToNextSpec(noop),
"nested format string for associative array contains more than two format specifiers");
size_t i = 0; size_t i = 0;
immutable end = val.length; immutable end = val.length;
@ -1863,6 +1874,19 @@ if (is(AssocArrayTypeOf!T) && !is(T == enum) && !hasToString!(T, Char))
formatTest(S2(['c':1, 'd':2]), "S"); formatTest(S2(['c':1, 'd':2]), "S");
} }
// https://issues.dlang.org/show_bug.cgi?id=21875
@system unittest
{
import std.exception : assertThrown;
import std.format : FormatException;
auto aa = [ 1 : "x", 2 : "y", 3 : "z" ];
assertThrown!FormatException(format("%(%)", aa));
assertThrown!FormatException(format("%(%s%)", aa));
assertThrown!FormatException(format("%(%s%s%s%)", aa));
}
enum HasToStringResult enum HasToStringResult
{ {
none, none,