builtin.c: fix signed integer overflow in jv2tm #3070
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
emanuele6
force-pushed
the
fixjv2tm
branch
3 times, most recently
from
72ceb41
to
60e95a6
Compare
|
This does not solve the problem fully; it still underflows if you use |
emanuele6
commented
Mar 15, 2024
emanuele6
commented
Mar 15, 2024
src/builtin.c
Outdated
| offsetof(struct tm, tm_yday), | ||
| }; | ||
|
|
||
| jv_array_foreach(a, i, n) { |
There was a problem hiding this comment.
I replaced the TO_TM_FIELD macro repeated 8 times with a loop over offsets
emanuele6
commented
Mar 15, 2024
emanuele6
force-pushed
the
fixjv2tm
branch
3 times, most recently
from
bfd895c
to
5f61b1f
Compare
emanuele6
commented
Mar 15, 2024
Now, time functions accept array inputs even if they don't have all the elements, 0 will be assumed if a value is not present. Also, jv2tm now properly clamps large number values to a signed 32-bit integer and rejects nan. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=65885
wader
reviewed
Mar 18, 2024
wader
approved these changes
Mar 18, 2024
|
Why did you leave $ ./jq -n '[2024,7,20] | todate, mktime'
"2024-08-20T00:00:00Z"
jq: error (at <unknown>): mktime requires parsed datetime inputs |
|
I didn't touch if (jv_array_length(jv_copy(a)) < 6)
return ret_error(a, jv_string("mktime requires parsed datetime inputs"));That can be removed now |
emanuele6
added a commit
to emanuele6/jq-1
that referenced
this pull request
Aug 20, 2024
This check was redundant and useless since jv2tm() used to require 8 elements, and errored anyway if not enough elements were provided. After commit bc96146, this check also prevents mktime/0 from accepting now supported0 inputs with less than 8 elements. Ref: jqlang#3070 (comment) Reported-by: itchyny <itchyny@cybozu.co.jp>
emanuele6
added a commit
to emanuele6/jq-1
that referenced
this pull request
Aug 20, 2024
This check was redundant and useless since jv2tm() used to require 8 elements, and errored anyway if not enough elements were provided. After commit bc96146, this check also prevents mktime/0 from accepting now supported inputs with less than 8 elements. Ref: jqlang#3070 (comment) Reported-by: itchyny <itchyny@cybozu.co.jp>
itchyny
pushed a commit
that referenced
this pull request
Aug 21, 2024
This check was redundant and useless since jv2tm() used to require 8 elements, and errored anyway if not enough elements were provided. After commit bc96146, this check also prevents mktime/0 from accepting now supported inputs with less than 8 elements. Ref: #3070 (comment) Reported-by: itchyny <itchyny@cybozu.co.jp>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
jv2tmnow properly clamps large number values to a signed 32-bit integer and rejects nan.Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=65885