Warnint 64to32 6186 v19.5 #11247
Warnint 64to32 6186 v19.5 #11247
Conversation
Ticket: 6186 Warnings about downcast from 64 to 32 bits Generic fixes required to get app-layer clean
Ticket: OISF#6186 Warnings about downcast from 64 to 32 bits
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## master #11247 +/- ##
==========================================
- Coverage 82.99% 82.98% -0.01%
==========================================
Files 942 942
Lines 249358 249377 +19
==========================================
- Hits 206951 206946 -5
- Misses 42407 42431 +24
Flags with carried forward coverage won't be shown. Click here to find out more. |
| @@ -368,7 +368,9 @@ static int FrameSlide(const char *ds, Frames *frames, const TcpStream *stream, c | |||
| } | |||
| frames->cnt = x; | |||
| uint64_t o = STREAM_BASE_OFFSET(stream) + slide; | |||
| frames->left_edge_rel = le - (STREAM_BASE_OFFSET(stream) + slide); | |||
| BUG_ON(o > le); | |||
There was a problem hiding this comment.
should these be DEBUG_VALIDATE_BUG_ON?
| @@ -790,15 +791,16 @@ static void FramePrune(Frames *frames, const TcpStream *stream, const bool eof) | |||
| } | |||
| } | |||
| frames->cnt = x; | |||
| frames->left_edge_rel = le - STREAM_BASE_OFFSET(stream); | |||
| BUG_ON(le < STREAM_BASE_OFFSET(stream)); | |||
There was a problem hiding this comment.
This one was your code :
git blame -v src/app-layer-frames.c | grep BUG_ON
1556e86c7db (Victor Julien 2021-12-03 07:40:56 +0100 801) BUG_ON(le < STREAM_BASE_OFFSET(stream));
| @@ -40,7 +40,7 @@ typedef struct HttpRangeContainerBuffer { | |||
| /** offset of bytes written in buffer (relative to the start of the range) */ | |||
| uint64_t offset; | |||
| /** number of gaped bytes */ | |||
| uint64_t gap; | |||
| uint32_t gap; | |||
There was a problem hiding this comment.
a file can be larger than 4GiB, so a gap in it's data could also exceed 4GiB
There was a problem hiding this comment.
ok, will saturate it...
| @@ -63,7 +63,7 @@ typedef struct HttpRangeContainerFile { | |||
| /** key length */ | |||
| uint32_t len; | |||
| /** expire time in epoch */ | |||
| uint32_t expire; | |||
| uint64_t expire; | |||
|
Information: QA ran without warnings. Pipeline 20970 |
|
Continued in #11257 |
[Link to redmine ticket:
https://redmine.openinfosecfoundation.org/issues/6186
Describe changes:
-Wshorten-64-to-32warnings for some files (a*)First commit of #9840
#10899 with needed rebase
There must be some stuff to review more carefully