Skip to content

Fix behavior of --slurp --stream when input has no trailing newline character #3279

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 21, 2025
Merged

Fix behavior of --slurp --stream when input has no trailing newline character #3279

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 4 additions & 12 deletions src/util.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,12 +271,11 @@ static int jq_util_input_read_more(jq_util_input_state *state) {
fclose(state->current_input);
}
state->current_input = NULL;
jv_free(state->current_filename);
state->current_filename = jv_invalid();
state->current_line = 0 ;
}
const char *f = next_file(state);
if (f != NULL) {
jv_free(state->current_filename);
state->current_line = 0;
if (!strcmp(f, "-")) {
state->current_input = stdin;
state->current_filename = jv_string("<stdin>");
Expand All @@ -288,7 +287,6 @@ static int jq_util_input_read_more(jq_util_input_state *state) {
state->failures++;
}
}
state->current_line = 0;
}
}

Expand Down Expand Up @@ -344,8 +342,7 @@ static int jq_util_input_read_more(jq_util_input_state *state) {
}
}
}
return state->curr_file == state->nfiles &&
(!state->current_input || feof(state->current_input) || ferror(state->current_input));
return state->curr_file == state->nfiles && !state->current_input;
}

jv jq_util_input_next_input_cb(jq_state *jq, void *data) {
Expand Down Expand Up @@ -399,7 +396,6 @@ jv jq_util_input_get_current_line(jq_state* jq) {
// When slurping, it returns just one value
jv jq_util_input_next_input(jq_util_input_state *state) {
int is_last = 0;
int has_more = 0;
jv value = jv_invalid(); // need more input
do {
if (state->parser == NULL) {
Expand Down Expand Up @@ -429,10 +425,6 @@ jv jq_util_input_next_input(jq_util_input_state *state) {
}
value = jv_parser_next(state->parser);
if (jv_is_valid(state->slurped)) {
// When slurping an input that doesn't have a trailing newline,
// we might have more than one value on the same line, so let's check
// to see if we have more data to parse.
has_more = jv_parser_remaining(state->parser);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

jv_parser_remaining somehow ended up returning > 0 when there was nothing remaning but 0 if there was 1 or more trailing whitespace characters?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The problem of using remaining byte count for detecting more value existing to slurp is that it does not work for --stream where it sometimes has array/object closing value. E.g., printf '[1]' | jq --stream --slurp, jv_parser_next emits [[0],1] and has_more is 0, even if there is another remaining value [0]. I fixed the issue by changing is_last value so that it works both for non-stream and stream inputs.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah now i see 👍

if (jv_is_valid(value)) {
state->slurped = jv_array_append(state->slurped, value);
value = jv_invalid();
Expand All @@ -442,7 +434,7 @@ jv jq_util_input_next_input(jq_util_input_state *state) {
return value;
}
}
} while (!is_last || has_more);
} while (!is_last);

if (jv_is_valid(state->slurped)) {
value = state->slurped;
Expand Down
7 changes: 7 additions & 0 deletions tests/shtest
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,13 @@ cmp $d/out $d/expected
printf "[1,2][3,4]\n" | $JQ -cs add > $d/out 2>&1
cmp $d/out $d/expected

# Regression test for #3273
echo "[[[0],1],[[0]],[[0],2],[[0]]]" > $d/expected
printf "[1][2]" | $JQ -c -s --stream . > $d/out 2>&1
cmp $d/out $d/expected
printf "[1][2]\n" | $JQ -c -s --stream . > $d/out 2>&1
cmp $d/out $d/expected

# Regression test for --raw-output0
printf "a\0b\0" > $d/expected
printf '["a", "b"]' | $VALGRIND $Q $JQ --raw-output0 '.[]' > $d/out
Expand Down