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

OP-423: Make sure to unlock semaphore before returning from error condition

Browse Source
This commit is contained in:
James Cotton 2011-06-05 08:41:21 -05:00
parent 31a06a5ae7
commit 56faad594e
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
flight/UAVObjects/uavobjectmanager.c
View File

@ -1114,8 +1114,11 @@ int32_t UAVObjSetInstanceDataField(UAVObjHandle obj, uint16_t instId, const void
}
// return if we set too much of what we have
if ( (size + offset) > objEntry->numBytes)
if ( (size + offset) > objEntry->numBytes) {
// Error, unlock and return
xSemaphoreGiveRecursive(mutex);
return -1;
}
// Set data
memcpy(instEntry->data + offset, dataIn, size);
@ -1190,9 +1193,13 @@ int32_t UAVObjGetInstanceDataField(UAVObjHandle obj, uint16_t instId, void* data
}
// return if we request too much of what we can give
if ( (size + offset) > objEntry->numBytes)
if ( (size + offset) > objEntry->numBytes)
{
// Error, unlock and return
xSemaphoreGiveRecursive(mutex);
return -1;
}
// Set data
memcpy(dataOut, instEntry->data + offset, size);