repositories
/
deb_xorg-server.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ODROID-U3 xorg-server debian package fork :
[deb_xorg-server.git]
/
debian
/
patches
/
CVE-2014-8xxx
/
0030-glx-Length-checking-for-non-generated-vendor-private.patch
diff --git
a/debian/patches/CVE-2014-8xxx/0030-glx-Length-checking-for-non-generated-vendor-private.patch
b/debian/patches/CVE-2014-8xxx/0030-glx-Length-checking-for-non-generated-vendor-private.patch
index c91b25c2f1a6158501585b4b8a9b5ff557af00a8..9d1dd142ca425a5632b6e6aae00bebdb1a646df7 100644
(file)
--- a/
debian/patches/CVE-2014-8xxx/0030-glx-Length-checking-for-non-generated-vendor-private.patch
+++ b/
debian/patches/CVE-2014-8xxx/0030-glx-Length-checking-for-non-generated-vendor-private.patch
@@
-14,11
+14,9
@@
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
glx/swap_interval.c | 2 ++
2 files changed, 4 insertions(+)
glx/swap_interval.c | 2 ++
2 files changed, 4 insertions(+)
-diff --git a/glx/indirect_program.c b/glx/indirect_program.c
-index cda139e..5caee7b 100644
--- a/glx/indirect_program.c
+++ b/glx/indirect_program.c
--- a/glx/indirect_program.c
+++ b/glx/indirect_program.c
-@@ -56,6 +56,8 @@ DoGetProgramString(struct __GLXclientSta
teRec *cl, GLbyte * pc,
+@@ -56,6 +56,8 @@ DoGetProgramString(struct __GLXclientSta
__GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error);
ClientPtr client = cl->client;
__GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error);
ClientPtr client = cl->client;
@@
-27,11
+25,9
@@
index cda139e..5caee7b 100644
pc += __GLX_VENDPRIV_HDR_SIZE;
if (cx != NULL) {
GLenum target;
pc += __GLX_VENDPRIV_HDR_SIZE;
if (cx != NULL) {
GLenum target;
-diff --git a/glx/swap_interval.c b/glx/swap_interval.c
-index 17bc992..2320550 100644
--- a/glx/swap_interval.c
+++ b/glx/swap_interval.c
--- a/glx/swap_interval.c
+++ b/glx/swap_interval.c
-@@ -46,6 +46,8 @@ DoSwapInterval(__GLXclientState * cl, GL
byte * pc, int do_swap)
+@@ -46,6 +46,8 @@ DoSwapInterval(__GLXclientState * cl, GL
__GLXcontext *cx;
GLint interval;
__GLXcontext *cx;
GLint interval;
@@
-40,6
+36,3
@@
index 17bc992..2320550 100644
cx = __glXLookupContextByTag(cl, tag);
if ((cx == NULL) || (cx->pGlxScreen == NULL)) {
cx = __glXLookupContextByTag(cl, tag);
if ((cx == NULL) || (cx->pGlxScreen == NULL)) {
---
-1.7.9.2
-