Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add proper LOCK & missing UNLOCK at early exit for rbus_element #235

Merged
merged 1 commit into from
Nov 19, 2024
+5 −8
Merged

Add proper LOCK & missing UNLOCK at early exit for rbus_element #235

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 5 additions & 8 deletions src/rbus/rbus_element.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -392,17 +392,14 @@ elementNode* retrieveElement(elementNode* root, const char* elmentName)
char* saveptr = NULL;
elementNode* currentNode = root;
elementNode* nextNode = NULL;
int tokenFound = 0;

LOCK();
int tokenFound = 0;
RBUSLOG_DEBUG("Request to retrieve element [%s]", elmentName);
if(currentNode == NULL)
{
return NULL;
}

LOCK();
name = strdup(elmentName);

nextNode = currentNode->child;

/*TODO if name is a table row with an alias containing a dot, this will break (e.g. "Foo.[alias.1]")*/
Expand Down Expand Up @@ -496,14 +493,13 @@ elementNode* retrieveInstanceElementEx(rbusHandle_t handle, elementNode* root, c
bool isWildcard = false;

RBUSLOG_DEBUG("Request to retrieve element [%s]", elmentName);
LOCK();

if(currentNode == NULL)
{
return NULL;
}

LOCK();
name = strdup(elmentName);

nextNode = currentNode->child;

/*TODO if name is a table row with an alias containing a dot, this will break (e.g. "Foo.[alias.1]")*/
Expand Down Expand Up @@ -1024,6 +1020,7 @@ elementNode* instantiateTableRow(elementNode* tableNode, uint32_t instNum, char

if(!rowTemplate)
{
UNLOCK();
assert(false);
RBUSLOG_ERROR("ERROR: row template not found for table %s", tableNode->fullName);
return NULL;
Expand Down
Loading