Merge cb8c1ee into 8bc7854

OpenLightingProject · Nov 28, 2014 · 72ccb08 · 72ccb08
2 parents 8bc7854 + cb8c1ee
commit 72ccb08
Show file tree

Hide file tree

Showing 42 changed files with 2,258 additions and 2,106 deletions.
diff --git a/common/utils/DmxBuffer.cpp b/common/utils/DmxBuffer.cpp
@@ -261,6 +261,11 @@ void DmxBuffer::Get(uint8_t *data, unsigned int *length) const {
 
 void DmxBuffer::GetRange(unsigned int slot, uint8_t *data,
                          unsigned int *length) const {
+  if (slot >= m_length) {
+    *length = 0;
+    return;
+  }
+
   if (m_data) {
     *length = min(*length, m_length - slot);
     memcpy(data, m_data + slot, *length);

diff --git a/plugins/usbdmx/AnymaDevice.cpp b/plugins/usbdmx/AnymaDevice.cpp
diff --git a/plugins/usbdmx/AnymaOutputPort.cpp b/plugins/usbdmx/AnymaOutputPort.cpp
diff --git a/plugins/usbdmx/AnymaOutputPort.h b/plugins/usbdmx/AnymaOutputPort.h