Skip to content

FIT: fix undefined behaviour in LookUpTable #8415

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ktf merged 1 commit into from
Mar 22, 2022
Merged

FIT: fix undefined behaviour in LookUpTable #8415

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions DataFormats/Detectors/FIT/common/include/DataFormatsFIT/LookUpTable.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,7 @@ struct HasherCRU {
struct ComparerCRU {
bool operator()(const EntryCRU& entry1, const EntryCRU& entry2) const
{
return true;
// return entry1.mLinkID<entry2.mLinkID || entry1.mEndPointID<entry2.mEndPointID;
return ((entry1.mLinkID << 4) | entry1.mEndPointID) == ((entry2.mLinkID << 4) | entry2.mEndPointID);
}
};

Expand Down Expand Up @@ -106,7 +105,7 @@ struct ComparerPM {
//Always true due to perfect hasher
bool operator()(const EntryPM& entry1, const EntryPM& entry2) const
{
return true;
return ((entry1.mEntryCRU.mLinkID << 8) | (entry1.mLocalChannelID << 4) | (entry1.mEntryCRU.mEndPointID)) == ((entry2.mEntryCRU.mLinkID << 8) | (entry2.mLocalChannelID << 4) | (entry2.mEntryCRU.mEndPointID));
}
};

Expand Down