commit 87cc7ec9390936869d46d8d74280b750336aed1c
author Lingfeng Yang <lfy@google.com> Fri Sep 23 19:06:37 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Sep 23 19:06:37 2016 +0000
tree 752bd9552fc0c5ea1d630e78017c8f9d6e1eb1f9
parent 7c001a8762d9a1eb755bc01f01745821ab95c783
parent 30e1c241dba43b558333968e5c9415fdaae6d935

Merge "Fix dEQP-EGL.functional.negative_api.choose_config"

system/egl/egl.cpp

diff --git a/system/egl/egl.cpp b/system/egl/egl.cpp
index 888b733..5744698 100644
--- a/system/egl/egl.cpp
+++ b/system/egl/egl.cpp
@@ -723,6 +723,10 @@
 {
     VALIDATE_DISPLAY_INIT(dpy, EGL_FALSE);
 
+    if (!num_config) {
+        setErrorReturn(EGL_BAD_PARAMETER, EGL_FALSE);
+    }
+
     int attribs_size = 0;
     if (attrib_list) {
         const EGLint * attrib_p = attrib_list;
@@ -736,6 +740,18 @@
     uint32_t* tempConfigs[config_size];
     DEFINE_AND_VALIDATE_HOST_CONNECTION(EGL_FALSE);
     *num_config = rcEnc->rcChooseConfig(rcEnc, (EGLint*)attrib_list, attribs_size * sizeof(EGLint), (uint32_t*)tempConfigs, config_size);
+
+    if (*num_config <= 0) {
+        EGLint err = -(*num_config);
+        *num_config = 0;
+        switch (err) {
+            case EGL_BAD_ATTRIBUTE:
+                setErrorReturn(EGL_BAD_ATTRIBUTE, EGL_FALSE);
+            default:
+                return EGL_FALSE;
+        }
+    }
+
     if (configs!=NULL) {
         EGLint i=0;
         for (i=0;i<(*num_config);i++) {
@@ -743,8 +759,6 @@
         }
     }
 
-    if (*num_config <= 0)
-        return EGL_FALSE;
     return EGL_TRUE;
 }