Skip to content

Fix OOB access in case the ROF bin has no tracks #15345

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

Open
ktf wants to merge 1 commit into
base: dev
Choose a base branch
from
+8 −3
Open

Fix OOB access in case the ROF bin has no tracks #15345

Show file tree
Hide file tree
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
3 changes: 3 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ cmake_minimum_required(VERSION 3.27.1 FATAL_ERROR)
# C++ as we _do_ have some C files to compile explicitely as C (e.g. gl3w.c)
project(O2 LANGUAGES C CXX VERSION 1.2.0)

add_compile_options(-fsanitize=address -fno-omit-frame-pointer)
add_link_options(-fsanitize=address)

include(CTest)

# Project wide setup
Expand Down
6 changes: 5 additions & 1 deletion Detectors/GlobalTracking/src/MatchTPCITS.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -880,7 +880,6 @@ void MatchTPCITS::doMatching(int sec)
int idxMinTPC = timeStartTPC[minROFITS]; // index of 1st cached TPC track within cached ITS ROFrames
auto t2nbs = tpcTimeBin2MUS(mZ2TPCBin * mParams->tpcTimeICMatchingNSigma);
bool checkInteractionCandidates = mUseFT0 && mParams->validateMatchByFIT != MatchTPCITSParams::Disable;

int itsROBin = 0;
for (int itpc = idxMinTPC; itpc < nTracksTPC; itpc++) {
auto& trefTPC = mTPCWork[cacheTPC[itpc]];
Expand All @@ -893,6 +892,11 @@ void MatchTPCITS::doMatching(int sec)
break;
}
int iits0 = timeStartITS[itsROBin];
if (iits0 < 0) {
LOGP(alarm, "doMatching sec={} itpc={} itsROBin={} timeStartITS.size={} iits0={} tmn={} triggered={}",
sec, itpc, itsROBin, timeStartITS.size(), iits0, tmn, mITSTriggered);
continue; // no ITS tracks start at this ROF bin
}
nCheckTPCControl++;
for (auto iits = iits0; iits < nTracksITS; iits++) {
auto& trefITS = mITSWork[cacheITS[iits]];
Expand Down
2 changes: 0 additions & 2 deletions Detectors/GlobalTrackingWorkflow/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@

# FIXME: do we actually need a library here, or is the executable enough ?

#add_compile_options(-O0 -g -fPIC -fno-omit-frame-pointer)

o2_add_library(GlobalTrackingWorkflow
SOURCES src/TrackWriterTPCITSSpec.cxx
src/TPCITSMatchingSpec.cxx
Expand Down