Skip to content

N
nx-libs
Unverified Commit 0e2b7479 authored by Mike Gabriel's avatar Mike Gabriel
Browse files
Options

Merge branch 'uli42-pr/simplify_nxrender' into 3.6.x

Attributes GH PR #862: https://github.com/ArcticaProject/nx-libs/pull/862
parents 60e0566d 3bc01d1b
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 22 additions and 7 deletions
nx-X11/programs/Xserver/render/render.c
View file @ 0e2b7479
...@@ -126,6 +126,11 @@ static int SProcRenderCreateConicalGradient (ClientPtr pClient); ...@@ -126,6 +126,11 @@ static int SProcRenderCreateConicalGradient (ClientPtr pClient);
static int SProcRenderDispatch (ClientPtr pClient); static int SProcRenderDispatch (ClientPtr pClient);
#ifdef NXAGENT_SERVER
static int xorg_ProcRenderDispatch (ClientPtr pClient);
static int xorg_SProcRenderDispatch (ClientPtr pClient);
#endif
int (*ProcRenderVector[RenderNumberRequests])(ClientPtr) = { int (*ProcRenderVector[RenderNumberRequests])(ClientPtr) = {
ProcRenderQueryVersion, ProcRenderQueryVersion,
ProcRenderQueryPictFormats, ProcRenderQueryPictFormats,
...@@ -1347,9 +1352,8 @@ ProcRenderCompositeGlyphs (ClientPtr client) ...@@ -1347,9 +1352,8 @@ ProcRenderCompositeGlyphs (ClientPtr client)
listsBase = (GlyphListPtr) malloc (nlist * sizeof (GlyphListRec)); listsBase = (GlyphListPtr) malloc (nlist * sizeof (GlyphListRec));
if (!listsBase) if (!listsBase)
{ {
free(glyphsBase); if (glyphsBase != glyphsLocal)
free(listsBase); free(glyphsBase);
return BadAlloc; return BadAlloc;
} }
} }
...@@ -1417,8 +1421,13 @@ ProcRenderCompositeGlyphs (ClientPtr client) ...@@ -1417,8 +1421,13 @@ ProcRenderCompositeGlyphs (ClientPtr client)
} }
} }
if (buffer > end) if (buffer > end)
{
if (glyphsBase != glyphsLocal)
free(glyphsBase);
if (listsBase != listsLocal)
free(listsBase);
return BadLength; return BadLength;
}
CompositeGlyphs (stuff->op, CompositeGlyphs (stuff->op,
pSrc, pSrc,
pDst, pDst,
...@@ -2018,10 +2027,15 @@ static int ProcRenderCreateConicalGradient (ClientPtr client) ...@@ -2018,10 +2027,15 @@ static int ProcRenderCreateConicalGradient (ClientPtr client)
return BadAlloc; return BadAlloc;
return Success; return Success;
} }
#endif /* NXAGENT_SERVER */
static int static int
#ifdef NXAGENT_SERVER
xorg_ProcRenderDispatch (ClientPtr client)
#else
ProcRenderDispatch (ClientPtr client) ProcRenderDispatch (ClientPtr client)
#endif
{ {
REQUEST(xReq); REQUEST(xReq);
...@@ -2030,7 +2044,6 @@ ProcRenderDispatch (ClientPtr client) ...@@ -2030,7 +2044,6 @@ ProcRenderDispatch (ClientPtr client)
else else
return BadRequest; return BadRequest;
} }
#endif /* NXAGENT_SERVER */
static int static int
SProcRenderQueryVersion (ClientPtr client) SProcRenderQueryVersion (ClientPtr client)
...@@ -2602,9 +2615,12 @@ SProcRenderCreateConicalGradient (ClientPtr client) ...@@ -2602,9 +2615,12 @@ SProcRenderCreateConicalGradient (ClientPtr client)
return (*ProcRenderVector[stuff->renderReqType]) (client); return (*ProcRenderVector[stuff->renderReqType]) (client);
} }
#ifndef NXAGENT_SERVER #ifdef NXAGENT_SERVER
static int static int
xorg_SProcRenderDispatch (ClientPtr client)
#else
SProcRenderDispatch (ClientPtr client) SProcRenderDispatch (ClientPtr client)
#endif
{ {
REQUEST(xReq); REQUEST(xReq);
...@@ -2613,7 +2629,6 @@ SProcRenderDispatch (ClientPtr client) ...@@ -2613,7 +2629,6 @@ SProcRenderDispatch (ClientPtr client)
else else
return BadRequest; return BadRequest;
} }
#endif /* NXAGENT_SERVER */
#ifdef PANORAMIX #ifdef PANORAMIX
#include "panoramiX.h" #include "panoramiX.h"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment