rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-02 10:24:11 +01:00
Code Issues Releases Activity

Ground/UAVObjectField: Explicitly handle case of bad enum values to avoid crashes. Still shouldn't occur.

Browse Source 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@1703 ebee16cc-31ac-478f-84a7-5cbb03baadba
This commit is contained in:
peabody124 2010-09-21 16:36:04 +00:00 committed by peabody124
parent 862e35def1
commit 7a8424e98e
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ground/src/plugins/uavobjects/uavobjectfield.cpp
View File

@ -27,6 +27,7 @@
*/ */
#include "uavobjectfield.h" #include "uavobjectfield.h"
#include <QtEndian> #include <QtEndian>
#include <QDebug>
UAVObjectField::UAVObjectField(const QString& name, const QString& units, FieldType type, quint32 numElements, const QStringList& options) UAVObjectField::UAVObjectField(const QString& name, const QString& units, FieldType type, quint32 numElements, const QStringList& options)
{ {
@ -444,6 +445,11 @@ QVariant UAVObjectField::getValue(quint32 index)
{ {
quint8 tmpenum; quint8 tmpenum;
memcpy(&tmpenum, &data[offset + numBytesPerElement*index], numBytesPerElement); memcpy(&tmpenum, &data[offset + numBytesPerElement*index], numBytesPerElement);
// Q_ASSERT((tmpenum < options.length()) && (tmpenum >= 0)); // catch bad enum settings
if(tmpenum >= options.length()) {
qDebug() << "Invalid value for" << name;
return QVariant( QString("Bad Value") );
}
return QVariant( options[tmpenum] ); return QVariant( options[tmpenum] );
break; break;
} }