Attachment 42563 Details for Bug 33558 – workaround atof behing feed non localized data thus preventing glx 1.4 codepath use

[patch] workaround atof behing feed non localized data thus preventing glx 1.4 codepath use

0001-locale-to-C-for-atof-in-glxext.c.txt (text/plain), 1.44 KB, created by Alban Browaeys on 2011-01-26 14:48:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alban Browaeys

Created: 2011-01-26 14:48:56 UTC

Size: 1.44 KB

patch

obsolete

>From 8844cb029149403a04e4fb90d7c4d3aeb52d95f4 Mon Sep 17 00:00:00 2001
>From: Alban Browaeys <prahal@yahoo.com>
>Date: Wed, 26 Jan 2011 19:36:31 +0100
>Subject: [PATCH] locale to C for atof in glxext.c
>
>---
> src/glx/glxext.c |   13 ++++++++++++-
> 1 files changed, 12 insertions(+), 1 deletions(-)
>
>diff --git a/src/glx/glxext.c b/src/glx/glxext.c
>index c5e9d05..c388706 100644
>--- a/src/glx/glxext.c
>+++ b/src/glx/glxext.c
>@@ -39,6 +39,7 @@
> 
> #include <assert.h>
> #include "glxclient.h"
>+#include <locale.h>
> #include <X11/extensions/Xext.h>
> #include <X11/extensions/extutil.h>
> #ifdef GLX_USE_APPLEGL
>@@ -673,6 +674,8 @@ static GLboolean
>    xGLXVendorPrivateWithReplyReq *vpreq;
>    xGLXGetFBConfigsReply reply;
>    Display *dpy = priv->dpy;
>+   char *old_locale, *saved_locale;
>+   float version;
> 
>    psc->serverGLXexts =
>       __glXQueryServerString(dpy, priv->majorOpcode, screen, GLX_EXTENSIONS);
>@@ -680,7 +683,15 @@ static GLboolean
>    LockDisplay(dpy);
> 
>    psc->configs = NULL;
>-   if (atof(priv->serverGLXversion) >= 1.3) {
>+   old_locale = setlocale (LC_ALL, NULL);
>+   saved_locale = strdup (old_locale);
>+   setlocale(LC_ALL, "C");
>+   if (saved_locale == NULL)
>+      goto out;
>+   version = atof(priv->serverGLXversion);
>+   setlocale (LC_ALL, saved_locale);
>+   free (saved_locale);
>+   if (version >= 1.3) {
>       GetReq(GLXGetFBConfigs, fb_req);
>       fb_req->reqType = priv->majorOpcode;
>       fb_req->glxCode = X_GLXGetFBConfigs;
>-- 
>1.7.2.3
>

Actions: View | Splinter Review

Attachments on bug 33558: 42563 | 43013 | 43222

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.