memcpy & qsort with null ptr

BZFlag-Dev · May 21, 2024 · 850b643 · 850b643
1 parent 3f3d875
commit 850b643
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/scene/Octree.cxx b/src/scene/Octree.cxx
@@ -349,7 +349,8 @@ OctreeNode::OctreeNode(unsigned char _depth, const Extents& exts,
  // copy the incoming list
  const int listBytes = _listSize * sizeof(SceneNode*);
  list = (SceneNode**)malloc(listBytes);
- memcpy(list, _list, listBytes);
+ if (listBytes)
+ memcpy(list, _list, listBytes);
 
  // copy the extents, and make a slighty puffed up version
  extents = exts;

diff --git a/src/scene/ZSceneDatabase.cxx b/src/scene/ZSceneDatabase.cxx
@@ -206,7 +206,8 @@ void ZSceneDatabase::makeCuller()
  TimeKeeper startTime = TimeKeeper::getCurrent();
 
  // sorted from lowest to highest
- qsort(staticList, staticCount, sizeof(SceneNode*), compareZExtents);
+ if (staticCount)
+ qsort(staticList, staticCount, sizeof(SceneNode*), compareZExtents);
 
  // make the tree
  octree->addNodes (staticList, staticCount, cullDepth, cullElements);