KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

st/omx: keep the name, (name|role)_specific strings dynamically allocated 

... as it's caller (the external program omxregister-bellagio) is the one
who frees all of the allocated memory.

Reported-by: Pedretti Fabio <pedretti.fabio@gmail.com>
Tested-by: Fabio Pedretti <pedretti.fabio@gmail.com>
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
This commit is contained in:
Emil Velikov 2014-06-26 17:43:46 +01:00
parent ed66312426
commit a001ca98e1
2 changed files with 52 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/gallium/state_trackers/omx/vid_dec.c
View File

@ -72,6 +72,10 @@ OMX_ERRORTYPE vid_dec_LoaderComponent(stLoaderComponentType *comp)
comp->componentVersion.s.nStep = 1;
comp->name_specific_length = 2;
comp->name = CALLOC(1, OMX_MAX_STRINGNAME_SIZE);
if (comp->name == NULL)
goto error;
comp->name_specific = CALLOC(comp->name_specific_length, sizeof(char *));
if (comp->name_specific == NULL)
goto error;
@ -80,21 +84,44 @@ OMX_ERRORTYPE vid_dec_LoaderComponent(stLoaderComponentType *comp)
if (comp->role_specific == NULL)
goto error;
comp->name = OMX_VID_DEC_BASE_NAME;
comp->name_specific[0] = OMX_VID_DEC_MPEG2_NAME;
comp->name_specific[1] = OMX_VID_DEC_AVC_NAME;
comp->name_specific[0] = CALLOC(1, OMX_MAX_STRINGNAME_SIZE);
if (comp->name_specific[0] == NULL)
goto error_specific;
comp->role_specific[0] = OMX_VID_DEC_MPEG2_ROLE;
comp->role_specific[1] = OMX_VID_DEC_AVC_ROLE;
comp->name_specific[1] = CALLOC(1, OMX_MAX_STRINGNAME_SIZE);
if (comp->name_specific[1] == NULL)
goto error_specific;
comp->role_specific[0] = CALLOC(1, OMX_MAX_STRINGNAME_SIZE);
if (comp->role_specific[0] == NULL)
goto error_specific;
comp->role_specific[1] = CALLOC(1, OMX_MAX_STRINGNAME_SIZE);
if (comp->role_specific[1] == NULL)
goto error_specific;
strcpy(comp->name, OMX_VID_DEC_BASE_NAME);
strcpy(comp->name_specific[0], OMX_VID_DEC_MPEG2_NAME);
strcpy(comp->name_specific[1], OMX_VID_DEC_AVC_NAME);
strcpy(comp->role_specific[0], OMX_VID_DEC_MPEG2_ROLE);
strcpy(comp->role_specific[1], OMX_VID_DEC_AVC_ROLE);
comp->constructor = vid_dec_Constructor;
return OMX_ErrorNone;
error:
error_specific:
FREE(comp->role_specific[1]);
FREE(comp->role_specific[0]);
FREE(comp->name_specific[1]);
FREE(comp->name_specific[0]);
FREE(comp->name_specific);
error:
FREE(comp->role_specific);
FREE(comp->name_specific);
FREE(comp->name);
return OMX_ErrorInsufficientResources;
}

20
src/gallium/state_trackers/omx/vid_enc.c
View File

@ -105,7 +105,9 @@ OMX_ERRORTYPE vid_enc_LoaderComponent(stLoaderComponentType *comp)
comp->name_specific_length = 1;
comp->constructor = vid_enc_Constructor;
comp->name = OMX_VID_ENC_BASE_NAME;
comp->name = CALLOC(1, OMX_MAX_STRINGNAME_SIZE);
if (!comp->name)
return OMX_ErrorInsufficientResources;
comp->name_specific = CALLOC(1, sizeof(char *));
if (!comp->name_specific)
@ -115,16 +117,30 @@ OMX_ERRORTYPE vid_enc_LoaderComponent(stLoaderComponentType *comp)
if (!comp->role_specific)
goto error_arrays;
comp->name_specific[0] = OMX_VID_ENC_AVC_NAME;
comp->name_specific[0] = CALLOC(1, OMX_MAX_STRINGNAME_SIZE);
if (comp->name_specific[0] == NULL)
goto error_specific;
comp->role_specific[0] = CALLOC(1, OMX_MAX_STRINGNAME_SIZE);
if (comp->role_specific[0] == NULL)
goto error_specific;
comp->name = OMX_VID_ENC_BASE_NAME;
comp->name_specific[0] = OMX_VID_ENC_AVC_NAME;
comp->role_specific[0] = OMX_VID_ENC_AVC_ROLE;
return OMX_ErrorNone;
error_specific:
FREE(comp->role_specific[0]);
FREE(comp->name_specific[0]);
error_arrays:
FREE(comp->role_specific);
FREE(comp->name_specific);
FREE(comp->name);
return OMX_ErrorInsufficientResources;
}