some boundary checks (prevents erroneous/bad clients from crashing the core)

[quassel.git] / src / common / bufferviewconfig.cpp

diff --git a/src/common/bufferviewconfig.cpp b/src/common/bufferviewconfig.cpp
index d54097d..1affaba 100644 (file)
--- a/src/common/bufferviewconfig.cpp
+++ b/src/common/bufferviewconfig.cpp
@@ -131,6 +131,11 @@ void BufferViewConfig::initSetBufferList(const QList<BufferId> &buffers) {
 void BufferViewConfig::addBuffer(const BufferId &bufferId, int pos) {
   if(_buffers.contains(bufferId))
     return;
+
+  if(pos < 0)
+    pos = 0;
+  if(pos > _buffers.count())
+    pos = _buffers.count();
   
   _buffers.insert(pos, bufferId);
   emit bufferAdded(bufferId, pos);
@@ -140,6 +145,11 @@ void BufferViewConfig::moveBuffer(const BufferId &bufferId, int pos) {
   if(!_buffers.contains(bufferId))
     return;
 
+  if(pos < 0)
+    pos = 0;
+  if(pos >= _buffers.count())
+    pos = _buffers.count() - 1;
+
   _buffers.move(_buffers.indexOf(bufferId), pos);
   emit bufferMoved(bufferId, pos);
 }