Page MenuHome
Files F2302

bsp_csgmesh_cfiterator.h.diff
Public
Actions

bsp_csgmesh_cfiterator.h.diff
View Options

Index: BSP_CSGMesh_CFIterator.h
===================================================================
RCS file: /cvsroot/bf-blender/blender/intern/bsp/intern/BSP_CSGMesh_CFIterator.h,v
retrieving revision 1.13
diff -u -i -r1.13 BSP_CSGMesh_CFIterator.h
--- BSP_CSGMesh_CFIterator.h 29 Jan 2006 15:15:31 -0000 1.13
+++ BSP_CSGMesh_CFIterator.h 15 May 2006 23:31:09 -0000
@@ -69,7 +69,8 @@
// assume CSG_IteratorPtr is of the correct type.
BSP_CSGMesh_VertexIt * vertex_it = (BSP_CSGMesh_VertexIt *)it;
- if (vertex_it->pos < &(*vertex_it->mesh->VertexSet().end())) return 0;
+ /* dereferencing iterator::end() is illegal, so we dereference 1 before it */
+ if (vertex_it->pos <= &(*(vertex_it->mesh->VertexSet().end() -1) )) return 0;
return 1;
};
@@ -161,7 +162,8 @@
// assume CSG_IteratorPtr is of the correct type.
BSP_CSGMesh_FaceIt * face_it = (BSP_CSGMesh_FaceIt *)it;
- if (face_it->pos < &(*face_it->mesh->FaceSet().end())) {
+ /* dereferencing iterator::end() is illegal, so we dereference 1 before it */
+ if (face_it->pos <= &(*(face_it->mesh->FaceSet().end() -1))) {
if (face_it->face_triangle + 3 <= face_it->pos->m_verts.size()) {
return 0;
}
@@ -253,8 +255,8 @@
// assume CSG_IteratorPtr is of the correct type.
BSP_CSGMesh_FaceIt * face_it = (BSP_CSGMesh_FaceIt *)it;
- // safety guard
- if (face_it->pos < &(*face_it->mesh->FaceSet().end())) {
+ /* dereferencing iterator::end() is illegal, so we dereference 1 before it */
+ if (face_it->pos <= &(*(face_it->mesh->FaceSet().end() -1))) {
//if (face_it->face_triangle + 3 < face_it->pos->m_verts.size()) {
// (face_it->face_triangle)++;

File Metadata

Mime Type
text/x-diff
Storage Engine
local-disk
Storage Format
Raw Data
Storage Handle
4b/74/d07e0d671ce4c9a52d61c44a7e0c

Event Timeline