mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

codec/nsc: initialize elements with NULL

Browse Source 
bmpdata and plane_buf[i] are checked agains NULL before using/freeing them
but they were not initialized to NULL. This caused segfaults in
the sample server.
This commit is contained in:
Bernhard Miklautz 2013-01-23 14:30:31 +01:00
parent 683e395bf8
commit 1b16ed49f1
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libfreerdp/codec/nsc.c
View File

@ -247,7 +247,10 @@ void nsc_context_free(NSC_CONTEXT* context)
for (i = 0; i < 4; i++) for (i = 0; i < 4; i++)
{ {
if (context->priv->plane_buf[i]) if (context->priv->plane_buf[i])
{
free(context->priv->plane_buf[i]); free(context->priv->plane_buf[i]);
context->priv->plane_buf[i] = NULL;
}
} }
if (context->bmpdata) if (context->bmpdata)
free(context->bmpdata); free(context->bmpdata);
@ -260,14 +263,21 @@ void nsc_context_free(NSC_CONTEXT* context)
free(context->priv); free(context->priv);
free(context); free(context);
context = NULL;
} }
NSC_CONTEXT* nsc_context_new(void) NSC_CONTEXT* nsc_context_new(void)
{ {
NSC_CONTEXT* nsc_context; NSC_CONTEXT* nsc_context;
UINT8 i;
nsc_context = (NSC_CONTEXT*) malloc(sizeof(NSC_CONTEXT)); nsc_context = (NSC_CONTEXT*) malloc(sizeof(NSC_CONTEXT));
nsc_context->priv = (NSC_CONTEXT_PRIV*) malloc(sizeof(NSC_CONTEXT_PRIV)); nsc_context->priv = (NSC_CONTEXT_PRIV*) malloc(sizeof(NSC_CONTEXT_PRIV));
for (i=0; i < 5; ++i)
{
nsc_context->priv->plane_buf[i] = NULL;
}
nsc_context->bmpdata = NULL;
nsc_context->decode = nsc_decode; nsc_context->decode = nsc_decode;
nsc_context->encode = nsc_encode; nsc_context->encode = nsc_encode;