Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ecc0c9aa authored by Nicolas Capens's avatar Nicolas Capens
Browse files

Fix parsing the EGL extension string. 

The EGL extension string does not necessarily have a space before the
terminating null. The previous code would skip the last extension name
when there's no extra space. The new code also works for empty strings.

Change-Id: Ib272cf05a7ebcc0de417f91966489ed4db33c283
parent 6eaede6a

opengl/libs/EGL/egl_display.cpp

+12 −16
Original line number Diff line number Diff line
@@ -178,25 +178,21 @@ EGLBoolean egl_display_t::initialize(EGLint *major, EGLint *minor) { 


        mExtensionString.setTo(gBuiltinExtensionString);

        char const* start = gExtensionString;

        char const* end;

        do {

            // find the space separating this extension for the next one

            end = strchr(start, ' ');

            if (end) {

                // length of the extension string

                const size_t len = end - start;

            // length of the extension name

            size_t len = strcspn(start, " ");

            if (len) {

                // NOTE: we could avoid the copy if we had strnstr.

                const String8 ext(start, len);

                if (findExtension(disp.queryString.extensions, ext.string(),

                        len)) {

                        mExtensionString.append(start, len+1);

                    mExtensionString.append(ext + " ");

                }

                // advance to the next extension name, skipping the space.

                start += len;

                start += (*start == ' ') ? 1 : 0;

            }

                // process the next extension string, and skip the space.

                start = end + 1;

            }

        } while (end);

        } while (*start != '\0');



        egl_cache_t::get()->initialize(this);