[tarantool-patches] Re: [PATCH] Fix csv crash with ending space and empty field

[Vladislav Shpilevoy <v.shpilevoy@tarantool.org>]

Hi! Are you sure that I should review it?

On 18/07/2018 13:51, Alexander Turenko wrote:
> Fixes #3489.
> ---
> branch: Totktonada/gh-3489-fix-csv-crash
> travis-ci: https://travis-ci.org/tarantool/tarantool/builds/405298528
> 
>   src/lib/csv/csv.c         | 1 +
>   test/app-tap/csv.test.lua | 7 ++++++-
>   2 files changed, 7 insertions(+), 1 deletion(-)
> 
> diff --git a/src/lib/csv/csv.c b/src/lib/csv/csv.c
> index 5f4ff9a9c..0a2f7b4d0 100644
> --- a/src/lib/csv/csv.c
> +++ b/src/lib/csv/csv.c
> @@ -192,6 +192,7 @@ csv_parse_impl(struct csv *csv, const char *s, const char *end, bool firstonly)
>   				/* end of field */
>   				csv->state = CSV_LEADING_SPACES;
>   				csv->bufp -= csv->ending_spaces;
> +				csv->ending_spaces = 0;
>   				if (firstonly) {
>   					csv->state = CSV_NEWFIELD;
>   					return p;
> diff --git a/test/app-tap/csv.test.lua b/test/app-tap/csv.test.lua
> index 472a8d23e..0a656aaa3 100755
> --- a/test/app-tap/csv.test.lua
> +++ b/test/app-tap/csv.test.lua
> @@ -36,7 +36,7 @@ local test6_ans = "|23|\t|456|\t|abcac|\t|'multiword field 4'|\t\n|none|" ..
>                     "lag[ flag ])|\t\n||\t||\t||\t\n"
>   
>   test = tap.test("csv")
> -test:plan(11)
> +test:plan(12)
>   
>   readable = {}
>   readable.read = myread
> @@ -128,4 +128,9 @@ fio.unlink(file3)
>   fio.unlink(file4)
>   fio.rmdir(tmpdir)
>   
> +-- gh-3489: crash with ending space and empty field
> +local res = csv.load('929,N1XDN ,,"Enfield, CT",')
> +local exp = {{'929', 'N1XDN', '', 'Enfield, CT', ''}}
> +test:is_deeply(res, exp, 'gh-3489')
> +
>   test:check()
>