Fix https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=64110 #1236
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
Codecov Report
@@ Coverage Diff @@
## dev #1236 +/- ##
==========================================
- Coverage 82.74% 82.73% -0.01%
==========================================
Files 159 159
Lines 20302 20310 +8
Branches 7679 7681 +2
==========================================
+ Hits 16798 16803 +5
- Misses 2882 2885 +3
Partials 622 622
Flags with carried forward coverage won't be shown. Click here to find out more.
|
seladb
reviewed
Nov 13, 2023
Packet++/src/IPv4Layer.cpp
Outdated
Comment on lines
293
to
301
| { | ||
| if (GREv0Layer::isDataValid(payload, payloadLen)) | ||
| m_NextLayer = new GREv0Layer(payload, payloadLen, this, m_Packet); | ||
| } | ||
| else if (greVer == GREv1) | ||
| m_NextLayer = new GREv1Layer(payload, payloadLen, this, m_Packet); | ||
| { | ||
| if (GREv1Layer::isDataValid(payload, payloadLen)) | ||
| m_NextLayer = new GREv1Layer(payload, payloadLen, this, m_Packet); | ||
| } |
There was a problem hiding this comment.
It's a bit nicer to do:
if (greVer == GREv0 && GREv0Layer::isDataValid(payload, payloadLen))
m_NextLayer = new GREv0Layer(payload, payloadLen, this, m_Packet);
else if (greVer == GREv1 && GREv1Layer::isDataValid(payload, payloadLen))
m_NextLayer = new GREv1Layer(payload, payloadLen, this, m_Packet);
else
m_NextLayer = new PayloadLayer(payload, payloadLen, this, m_Packet);There was a problem hiding this comment.
But it means if it is GREv0 and invalid, it will go to new PayloadLayer.
There was a problem hiding this comment.
yes, we always want to have a next layer... the default is PayloadLayer if there is no better option...
Packet++/src/IPv6Layer.cpp
Outdated
Comment on lines
245
to
253
| { | ||
| if (GREv0Layer::isDataValid(payload, payloadLen)) | ||
| m_NextLayer = new GREv0Layer(payload, payloadLen, this, m_Packet); | ||
| } | ||
| else if (greVer == GREv1) | ||
| m_NextLayer = new GREv1Layer(payload, payloadLen, this, m_Packet); | ||
| { | ||
| if (GREv1Layer::isDataValid(payload, payloadLen)) | ||
| m_NextLayer = new GREv1Layer(payload, payloadLen, this, m_Packet); | ||
| } |
seladb
approved these changes
Nov 14, 2023
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.
No description provided.