Skip to content

Commit 3b7e4ee

Browse files
authored
Fix Potential Out-of-Bounds Access in rtcore.cpp (#652)
Fix issue #648 We were accidently casting to RayHit types instead of Ray
1 parent bc3327f commit 3b7e4ee

1 file changed

Lines changed: 7 additions & 7 deletions

File tree

‎kernels/common/rtcore.cpp‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1017,12 +1017,12 @@ RTC_NAMESPACE_BEGIN;
10171017
scene->intersectors.occluded4(valid,*ray,&context);
10181018

10191019
else {
1020-
RayHit4* ray4 = (RayHit4*) ray;
1020+
Ray4* ray4 = (Ray4*) ray;
10211021
for (size_t i=0; i<4; i++) {
10221022
if (!valid[i]) continue;
1023-
RayHit ray1; ray4->get(i,ray1);
1023+
Ray ray1; ray4->get(i,ray1);
10241024
scene->intersectors.occluded((RTCRay&)ray1,&context);
1025-
ray4->geomID[i] = ray1.geomID;
1025+
ray4->set(i,ray1);
10261026
}
10271027
}
10281028

@@ -1123,10 +1123,10 @@ RTC_NAMESPACE_BEGIN;
11231123
scene->intersectors.occluded8(valid,*ray,&context);
11241124

11251125
else {
1126-
RayHit8* ray8 = (RayHit8*) ray;
1126+
Ray8* ray8 = (Ray8*) ray;
11271127
for (size_t i=0; i<8; i++) {
11281128
if (!valid[i]) continue;
1129-
RayHit ray1; ray8->get(i,ray1);
1129+
Ray ray1; ray8->get(i,ray1);
11301130
scene->intersectors.occluded((RTCRay&)ray1,&context);
11311131
ray8->set(i,ray1);
11321132
}
@@ -1183,10 +1183,10 @@ RTC_NAMESPACE_BEGIN;
11831183
scene->intersectors.occluded16(valid,*ray,&context);
11841184

11851185
else {
1186-
RayHit16* ray16 = (RayHit16*) ray;
1186+
Ray16* ray16 = (Ray16*) ray;
11871187
for (size_t i=0; i<16; i++) {
11881188
if (!valid[i]) continue;
1189-
RayHit ray1; ray16->get(i,ray1);
1189+
Ray ray1; ray16->get(i,ray1);
11901190
scene->intersectors.occluded((RTCRay&)ray1,&context);
11911191
ray16->set(i,ray1);
11921192
}

0 commit comments

Comments
 (0)