Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 06:38:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge remote-tracking branch 'origin/topic/timw/to-int-zam'

Browse source
This commit is contained in:
Benjamin Bannier 2025-02-21 12:24:21 +01:00
commit 0bc0104eb2
5 changed files with 23 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CHANGES
View file

@ -1,3 +1,7 @@
7.2.0-dev.214 | 2025-02-21 12:24:21 +0100
* Fix bifs.to_count and bifs.to_int btests under ZAM (Tim Wojtulewicz, Corelight)
7.2.0-dev.212 | 2025-02-20 16:40:19 -0700 7.2.0-dev.212 | 2025-02-20 16:40:19 -0700
* Set original/outer packet flags to reflect inner packet results (mnhsrj) * Set original/outer packet flags to reflect inner packet results (mnhsrj)

2
VERSION
View file

@ -1 +1 @@
7.2.0-dev.212 7.2.0-dev.214

2
src/script_opt/FuncInfo.cc
View file

@ -471,7 +471,7 @@ static std::unordered_map<std::string, unsigned int> func_attrs = {
{"to_addr", ATTR_IDEMPOTENT}, // can error {"to_addr", ATTR_IDEMPOTENT}, // can error
{"to_count", ATTR_IDEMPOTENT}, // can error {"to_count", ATTR_IDEMPOTENT}, // can error
{"to_double", ATTR_IDEMPOTENT}, // can error {"to_double", ATTR_IDEMPOTENT}, // can error
{"to_int", ATTR_FOLDABLE}, {"to_int", ATTR_IDEMPOTENT}, // can error
{"to_json", ATTR_FOLDABLE}, {"to_json", ATTR_FOLDABLE},
{"to_lower", ATTR_FOLDABLE}, {"to_lower", ATTR_FOLDABLE},
{"to_port", ATTR_IDEMPOTENT}, // can error {"to_port", ATTR_IDEMPOTENT}, // can error

4
testing/btest/Baseline.zam/bifs.to_count/err Normal file
View file

@ -0,0 +1,4 @@
### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
error in <...>/to_count.zeek, line 8: bad conversion to count (int_to_count(-2) and -2)
error in <...>/to_count.zeek, line 20: bad conversion to count (to_count() and )
error in <...>/to_count.zeek, line 25: bad conversion to count (to_count(not a count) and not a count)

13
testing/btest/Baseline.zam/bifs.to_count/out Normal file
View file

@ -0,0 +1,13 @@
### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
0
2
3
4
7
0
18446744073709551611
205
206
0
123
9223372036854775808 and 9223372036854775808 are the same