Skip to content

rbus: fixup reverse null check in rbusEvent_SubscribeEx #419

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

Open
svc-rdkeportal01 wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

rbus: fixup reverse null check in rbusEvent_SubscribeEx #419

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1ec10bb
rbus: fixup reverse null check in rbusEvent_SubscribeEx
Dec 2, 2025
a448a4b
Fix compilation errors: use correct function and constant names
Dec 2, 2025
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
46 changes: 40 additions & 6 deletions src/rbus/rbus.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5168,18 +5168,52 @@ static rbusError_t rbusEvent_SubscribeWithRetries(
subInternal->rawData = rawData;
rtVector_PushBack(handleInfo->eventSubs, subInternal);
HANDLE_EVENTSUBS_MUTEX_UNLOCK(handle);

/* Validate response pointer before any dereference operations */
if(!response)
{
RBUSLOG_ERROR("%s subscribe failed: null response received from provider", eventName);

/* Cleanup: Remove the subscription entry that was just added */
HANDLE_EVENTSUBS_MUTEX_LOCK(handle);
rtVector_RemoveItem(handleInfo->eventSubs, subInternal, rbusEventSubscriptionInternal_free);
HANDLE_EVENTSUBS_MUTEX_UNLOCK(handle);

return RBUS_ERROR_INVALID_RESPONSE_FROM_DESTINATION;
}

/* Safe to dereference response now */
if(publishOnSubscribe)
{
rbusMessage_GetInt32(response, &initial_value);
if(initial_value)
int result = rbusMessage_GetInt32(response, &initial_value);
if(result == RBUS_ERROR_SUCCESS && initial_value)
{
_master_event_callback_handler(NULL, eventName, response, userData);
}
else if(result != RBUS_ERROR_SUCCESS)
{
RBUSLOG_WARN("%s subscribe: failed to get initial value from response (error=%d)",
eventName, result);
}
}
rbusMessage_GetInt32(response, &subscriptionId);
subInternal->subscriptionId = subscriptionId;
if(response)
rbusMessage_Release(response);

/* Extract subscription ID from response */
int result = rbusMessage_GetInt32(response, &subscriptionId);
if(result == RBUS_ERROR_SUCCESS)
{
subInternal->subscriptionId = subscriptionId;
RBUSLOG_DEBUG("%s subscribe: assigned subscriptionId=%d", eventName, subscriptionId);
}
else
{
RBUSLOG_WARN("%s subscribe: failed to get subscription ID from response (error=%d), using default",
eventName, result);
subInternal->subscriptionId = 0;
}

/* Release response message */
rbusMessage_Release(response);

RBUSLOG_INFO("%s subscribe retries succeeded", eventName);
return RBUS_ERROR_SUCCESS;
}
Expand Down