[PATCH] glxproxy: Fix an obvious thinko in QueryExtensionsString
Adam Jackson
ajax at redhat.com
Wed Jul 29 08:36:07 PDT 2015
gcc 5.1 throws a rather amusing warning here:
glxcmdsswap.c: In function ‘__glXSwapQueryExtensionsString’:
glxcmdsswap.c:439:1: warning: function might be candidate for attribute
‘noreturn’ [-Wsuggest-attribute=noreturn]
__glXSwapQueryExtensionsString(__GLXclientState * cl, GLbyte * pc)
This is entirely accurate, albeit curiously phrased: swapping some bits
hanging off the end of a null pointer will make Xdmx crash, so from the
perspective of code generation the function will indeed not return.
Signed-off-by: Adam Jackson <ajax at redhat.com>
---
hw/dmx/glxProxy/glxcmdsswap.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hw/dmx/glxProxy/glxcmdsswap.c b/hw/dmx/glxProxy/glxcmdsswap.c
index 600a6e1..5b1722d 100644
--- a/hw/dmx/glxProxy/glxcmdsswap.c
+++ b/hw/dmx/glxProxy/glxcmdsswap.c
@@ -438,7 +438,7 @@ __glXSwapUseXFont(__GLXclientState * cl, GLbyte * pc)
int
__glXSwapQueryExtensionsString(__GLXclientState * cl, GLbyte * pc)
{
- xGLXQueryExtensionsStringReq *req = NULL;
+ xGLXQueryExtensionsStringReq *req = (xGLXQueryExtensionsStringReq *) pc;
__GLX_DECLARE_SWAP_VARIABLES;
--
2.4.3
More information about the xorg-devel
mailing list