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/jsiwek/fix-hexdump-warning'

Browse source 
* origin/topic/jsiwek/fix-hexdump-warning:
  Fix snprintf compiler warning in hexdump BIF
This commit is contained in:
Tim Wojtulewicz 2020-01-06 14:16:29 -07:00
commit 71e6893441
5 changed files with 13 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
CHANGES
View file

@ -1,4 +1,13 @@
3.1.0-dev.354 | 2020-01-06 14:16:29 -0700
* Fix snprintf compiler warning in hexdump BIF (Jon Siwek, Corelight)
* Updating submodule(s).
[nomail] (Jon Siwek, Corelight)
3.1.0-dev.351 | 2020-01-06 11:20:09 -0800
* Increase a timeout for a btest (Jon Siwek, Corelight)

2
VERSION
View file

@ -1 +1 @@
3.1.0-dev.351
3.1.0-dev.354

2
src/strings.bif
View file

@ -1097,7 +1097,7 @@ function hexdump%(data_str: string%) : string
{
char offset[5];
snprintf(offset, sizeof(offset),
"%.4x", data_ptr - data);
"%.4tx", data_ptr - data);
memcpy(hex_data_ptr, offset, 4);
hex_data_ptr += 6;
ascii_ptr = hex_data_ptr + 50;

2
testing/external/commit-hash.zeek-testing vendored
View file

@ -1 +1 @@
da47ae786562da18910d994b7868530929db6271
8be265e13e9ddb2dda704bf1574b1307fc17eea9

2
testing/external/commit-hash.zeek-testing-private vendored
View file

@ -1 +1 @@
931f49917a86a260c69e091c2f66b693e74b33bf
2f6f3b9211f5f5b04a2ede17835d0a4a523888f1