Skip to content

RDKEMW-16593: Fix for Increase in "dispatchThread mfr_util launched" pdri version #58

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

Merged
apatel859 merged 4 commits into from
Apr 3, 2026
Merged

RDKEMW-16593: Fix for Increase in "dispatchThread mfr_util launched" pdri version #58

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e3da19b
RDKEMW-16593: Fix for Increase in "dispatchThread mfr_util launched" …
yuvaramachandran-gurusamy Apr 2, 2026
91b827c
RDKEMW-16593: Handle malloc failure and fix memory leak on dup2 failu…
Copilot Apr 3, 2026
61bda8d
Update sys_mfr_utils.c
yuvaramachandran-gurusamy Apr 3, 2026
2d4c27e
Apply suggestion from @Copilot
yuvaramachandran-gurusamy Apr 3, 2026
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
61 changes: 28 additions & 33 deletions mfr-utils/sys_mfr_utils.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,9 @@ int validateParams(const char* param) {

int main(int argc, char *argv[])
{

int paramIndex = 0;
char *mfrReadBuf = NULL;
int oom_error = 0;

if (argc != 2) {
displayHelp();
Expand Down Expand Up @@ -111,49 +112,26 @@ int main(int argc, char *argv[])
IARM_Bus_Connect();
IARM_Malloc(IARM_MEMTYPE_PROCESSLOCAL, sizeof(IARM_Bus_MFRLib_GetSerializedData_Param_t), (void**)&param);

fflush(stdout); // ensure buffer is flushed
// restore original stdout
if (dup2(fp_old, fileno(stdout)) == -1) {
printf("dup2() failed to restore stdout\n");
close(fp_old);
IARM_Free(IARM_MEMTYPE_PROCESSLOCAL, param);
return -1;
}
close(fp_old);

param->type = mfr_args[paramIndex];;

ret = IARM_Bus_Call(IARM_BUS_MFRLIB_NAME,
IARM_BUS_MFRLIB_API_GetSerializedData,
(void *)param,
sizeof(IARM_Bus_MFRLib_GetSerializedData_Param_t));

if(ret != IARM_RESULT_SUCCESS)
{
printf("Call failed for %s: error code:%d\n", mfr_args_str[paramIndex], ret);
}
else
if(IARM_RESULT_SUCCESS == ret)
{
int len = param->bufLen + 1;
char *pTmpStr = (char *)malloc(len);
memset(pTmpStr,0,len);
memcpy(pTmpStr,param->buffer,param->bufLen);
printf("%s\n", pTmpStr);
free(pTmpStr);
mfrReadBuf = (char *)malloc(len);
if(NULL != mfrReadBuf) {
memset(mfrReadBuf,0,len);
memcpy(mfrReadBuf,param->buffer,param->bufLen);
} else {
oom_error = 1;
}
Comment thread
yuvaramachandran-gurusamy marked this conversation as resolved.
}
IARM_Free(IARM_MEMTYPE_PROCESSLOCAL,param);

fp_old = dup(1); // preserve the original stdout
if(fp_old == -1) {
printf("dup() failed to preserve stdout\n");
return -1;
}
if(freopen ("/dev/null", "w", stdout) == NULL){
printf("freopen() failed to redirect stdout\n");
close(fp_old);
return -1;
}

IARM_Bus_Disconnect();
IARM_Bus_Term();

Expand All @@ -162,10 +140,27 @@ int main(int argc, char *argv[])
if (dup2(fp_old, fileno(stdout)) == -1) {
printf("dup2() failed to restore stdout\n");
Comment thread
yuvaramachandran-gurusamy marked this conversation as resolved.
close(fp_old);
if (mfrReadBuf) {
free(mfrReadBuf);
}
return -1;
}
close(fp_old);

if (oom_error) {
printf("malloc() failed: out of memory\n");
return -1;
}

if ( NULL == mfrReadBuf) {
printf("Call failed for %s: error code:%d\n", mfr_args_str[paramIndex], ret);
Comment thread
yuvaramachandran-gurusamy marked this conversation as resolved.
return -1;
Comment thread
yuvaramachandran-gurusamy marked this conversation as resolved.
}
Comment thread
yuvaramachandran-gurusamy marked this conversation as resolved.
else {
printf("%s\n", mfrReadBuf);
free(mfrReadBuf);
mfrReadBuf = NULL;
}

return 0;
}

Loading