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

Fix bugzilla 24478 - std.csv array out of bounds when row size exceeds header

Browse source
This commit is contained in:
Dennis Korpel 2024-04-02 15:46:44 +02:00 • committed by Dennis Korpel
parent 8729740e32
commit 08b6dd3f7a
1 changed files with 14 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

15
std/csv.d
View file

@ -175,6 +175,16 @@ class CSVException : Exception
assert(ex.toString == "(Row: 1, Col: 2) Unexpected 'b' when converting from type string to type int");
}
// https://issues.dlang.org/show_bug.cgi?id=24478
@safe unittest
{
import std.exception : collectException;
import std.algorithm.searching : count;
string text = "A, B\n1, 2, 3";
auto ex = collectException!CSVException(csvReader!(string[string])(text, null).count);
assert(ex.toString == "(Row: 1, Col: 3) row contains more values than header");
}
@safe pure unittest
{
import std.string;
@ -1179,7 +1189,10 @@ public:
{
for (; !recordRange.empty; recordRange.popFront())
{
aa[header[_input.col-1]] = recordRange.front;
const i = _input.col - 1;
if (i >= header.length)
throw new CSVException("row contains more values than header", _input.row, _input.col);
aa[header[i]] = recordRange.front;
}
}
catch (ConvException e)