summaryrefslogtreecommitdiff
path: root/src/glx/glxext.c
diff options
context:
space:
mode:
authorAaron Plattner <aplattner@nvidia.com>2010-04-22 09:30:42 -0700
committerIan Romanick <ian.d.romanick@intel.com>2010-04-23 11:48:11 -0700
commitad7d36e91933a49ce3f6ed2c14ae585a8a84fdf5 (patch)
tree4bc38bf765d46db268381c10702968a1c12ecbc6 /src/glx/glxext.c
parenteb4dc547885994cc7961f7996c33ff484f664964 (diff)
Fix __glXInitializeVisualConfigFromTags's handling of unrecognized fbconfig tags.7.8-branchpoint
__glXInitializeVisualConfigFromTags doesn't skip the payload of unrecognized tags. Instead, it treats the value as if it were the next tag, which can happen if the server's GLX extension is not Mesa's. For example, this falls down when NVIDIA sends a GLX_FLOAT_COMPONENTS_NV = 0 pair, causing __glXInitializeVisualConfigFromTags to bail out early. Signed-off-by: Aaron Plattner <aplattner@nvidia.com> Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Diffstat (limited to 'src/glx/glxext.c')
-rw-r--r--src/glx/glxext.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/glx/glxext.c b/src/glx/glxext.c
index 5289354a521..6d6f89e79a2 100644
--- a/src/glx/glxext.c
+++ b/src/glx/glxext.c
@@ -539,6 +539,8 @@ __glXInitializeVisualConfigFromTags(__GLcontextModes * config, int count,
i = count;
break;
default:
+ /* Ignore the unrecognized tag's value */
+ bp++;
break;
}
}