fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-22 13:30:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

egl: Return the correct array size in _eglFlattenArray.

Browse source 
The function is used by _eglGetConfigs and _eglGetScreens.  The array
size should not be limited by the buffer size when the buffer is NULL.

This fixes fdo bug #29052.
This commit is contained in:
Chia-I Wu 2010-07-15 00:31:39 +08:00
parent 2f4ce25645
commit d7284b45e2
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/egl/main/eglarray.c
View file

@ -166,8 +166,11 @@ _eglFlattenArray(_EGLArray *array, void *buffer, EGLint elem_size, EGLint size,
if (!array) if (!array)
return 0; return 0;
count = (size < array->Size) ? size : array->Size; count = array->Size;
if (buffer) { if (buffer) {
/* do not exceed buffer size */
if (count > size)
count = size;
for (i = 0; i < count; i++) for (i = 0; i < count; i++)
flatten(array->Elements[i], flatten(array->Elements[i],
(void *) ((char *) buffer + elem_size * i)); (void *) ((char *) buffer + elem_size * i));