To avoid zero-vector begin iterator dereference (this is undefined be…

…haviour as zero-vector begin==end).
OpenXRay · Dec 8, 2017 · 7c45ae8 · 7c45ae8
1 parent 45f50b9
commit 7c45ae8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/xrEngine/pure.h b/src/xrEngine/pure.h
@@ -114,7 +114,8 @@ class CRegistrator // the registrator itself
     };
     void Resort(void)
     {
-        qsort(&*R.begin(), R.size(), sizeof(_REG_INFO), _REG_Compare);
+        if (R.size())
+            qsort(&*R.begin(), R.size(), sizeof(_REG_INFO), _REG_Compare);
         while ((R.size()) && (R[R.size() - 1].Prio == REG_PRIORITY_INVALID))
             R.pop_back();
         if (R.empty())

diff --git a/src/xrGame/NET_Queue.h b/src/xrGame/NET_Queue.h
@@ -65,7 +65,8 @@ class NET_Event
     }
     void implication(NET_Packet& P) const
     {
-        CopyMemory(P.B.data, &*data.begin(), (u32)data.size());
+        if (data.size())
+            CopyMemory(P.B.data, &*data.begin(), (u32)data.size());
         P.B.count = (u32)data.size();
         P.r_pos = 0;
     }