ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

BLE: Fix relationnal operator of SafeEnum 

The relationnal operators were targeting the base class which defines an implicit constructor to an integral value. This is wrong as it allows SafeEnum instances to be compared against integers.

The fix is simple: define relationnal operators for the derived class. The derived class is known as it is passed as a template parameter of the base class.

For extra safety the SafeEnum constructor is now explicit and protected.
pull/9393/head
Vincent Coubard 2019-01-16 11:28:07 +00:00
parent f8ef143ed7
commit 79bd3ea982
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
features/FEATURE_BLE/ble/SafeEnum.h
View File

@ -112,13 +112,15 @@ struct SafeEnum {
*/
typedef LayoutType representation_t;
protected:
/**
* Construction of an enumeration value.
*/
SafeEnum(LayoutType value) : _value(value) { }
explicit SafeEnum(LayoutType value) : _value(value) { }
public:
/**
* Equal to operator for SafeEnum instances.
* Equal to operator for Target instances.
*
* @param lhs left hand side of the comparison
* @param rhs right hand side of the comparison
@ -126,12 +128,12 @@ struct SafeEnum {
* @return true if the inner value of lhs and rhs are equal and false
* otherwise.
*/
friend bool operator==(SafeEnum lhs, SafeEnum rhs) {
friend bool operator==(Target lhs, Target rhs) {
return lhs._value == rhs._value;
}
/**
* Not equal to operator for SafeEnum instances.
* Not equal to operator for Target instances.
*
* @param lhs left hand side of the comparison
* @param rhs right hand side of the comparison
@ -139,24 +141,24 @@ struct SafeEnum {
* @return true if the inner value of lhs and rhs are not equal and false
* otherwise.
*/
friend bool operator!=(SafeEnum lhs, SafeEnum rhs) {
friend bool operator!=(Target lhs, Target rhs) {
return !(lhs == rhs);
}
/**
* Less than operator for SafeEnum instances.
* Less than operator for Target instances.
*
* @param lhs left hand side of the comparison
* @param rhs right hand side of the comparison
*
* @return true if the inner value of lhs is less than rhs and false otherwise.
*/
friend bool operator<(SafeEnum lhs, SafeEnum rhs) {
friend bool operator<(Target lhs, Target rhs) {
return lhs.value() < rhs.value();
}
/**
* Less than or equal to operator for SafeEnum instances.
* Less than or equal to operator for Target instances.
*
* @param lhs left hand side of the comparison
* @param rhs right hand side of the comparison
@ -164,12 +166,12 @@ struct SafeEnum {
* @return true if the inner value of lhs is less than or equal to rhs and
* false otherwise.
*/
friend bool operator<=(SafeEnum lhs, SafeEnum rhs) {
friend bool operator<=(Target lhs, Target rhs) {
return lhs.value() < rhs.value() || lhs == rhs;
}
/**
* Greater than operator for SafeEnum instances.
* Greater than operator for Target instances.
*
* @param lhs left hand side of the comparison
* @param rhs right hand side of the comparison
@ -177,12 +179,12 @@ struct SafeEnum {
* @return true if the inner value of lhs is greater than rhs; false
* otherwise.
*/
friend bool operator>(SafeEnum lhs, SafeEnum rhs) {
friend bool operator>(Target lhs, Target rhs) {
return !(lhs <= rhs);
}
/**
* Greater than or equal to operator for SafeEnum instances.
* Greater than or equal to operator for Target instances.
*
* @param lhs left hand side of the comparison
* @param rhs right hand side of the comparison
@ -190,7 +192,7 @@ struct SafeEnum {
* @return true if the inner value of lhs is greater than or equal to rhs;
* false otherwise.
*/
friend bool operator>=(SafeEnum lhs, SafeEnum rhs) {
friend bool operator>=(Target lhs, Target rhs) {
return !(lhs < rhs);
}