Don't allocate space for a mode name unless the nameLength is greater

than 0.

Signed-off-by: Chris Michael <devilhorns@comcast.net>
This commit is contained in:
Chris Michael 2013-05-24 18:25:03 +01:00
parent 16cbbb202f
commit 1d58f5ff1d
1 changed files with 9 additions and 4 deletions

View File

@ -713,10 +713,15 @@ ecore_x_randr_modes_info_get(Ecore_X_Window root, int *num)
ret[i]->vSyncStart = res->modes[i].vSyncStart;
ret[i]->vSyncEnd = res->modes[i].vSyncEnd;
ret[i]->vTotal = res->modes[i].vTotal;
if ((ret[i]->name =
(malloc(res->modes[i].nameLength + 1))))
strncpy(ret[i]->name, res->modes[i].name,
(res->modes[i].nameLength + 1));
if (res->modes[i].nameLength > 0)
{
if ((ret[i]->name =
(malloc(res->modes[i].nameLength + 1))))
strncpy(ret[i]->name, res->modes[i].name,
(res->modes[i].nameLength + 1));
else
ret[i]->name = NULL;
}
else
ret[i]->name = NULL;