Fix bug #1435 (data loss when dumping payloads to JSON) v3 #1464
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
gozzy
changed the title
| unsigned char encoded[len]; | ||
| Base64Encode(packet_buf, offset, encoded, &len); | ||
| Base64Encode(p->payload, p->payload_len, encoded, &len); |
There was a problem hiding this comment.
output-json-alert.c: In function ‘AlertJson’:
output-json-alert.c:301:21: error: passing argument 4 of ‘Base64Encode’ from incompatible pointer type [-Werror]
util-crypt.h:82:5: note: expected ‘long unsigned int *’ but argument is of type ‘size_t *’
cc1: all warnings being treated as errors
There was a problem hiding this comment.
It's a bit strange - my compiler doesn't see anything suspicious.
Maybe we should return unsigned long here? For instance, LogTlsLogPem() uses unsigned long when calling Base64Encode.
There was a problem hiding this comment.
Probably yeah. size_t is 4 bytes for 32bit args, 8bytes for 64bit args.
|
Replaced with #1468 |
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.
Fixed #1455 - use MemBufferWriteRaw() wrapper instead of memcpy. Also fixed MemBufferWriteRaw() - there was unneeded return stetement.