ODROID-U3 xorg-server debian package fork :

[deb_xorg-server.git] / debian / patches / CVE-2014-8xxx / 0022-glx-Additional-paranoia-in-__glXGetAnswerBuffer-__GL.patch

diff --git a/debian/patches/CVE-2014-8xxx/0022-glx-Additional-paranoia-in-__glXGetAnswerBuffer-__GL.patch b/debian/patches/CVE-2014-8xxx/0022-glx-Additional-paranoia-in-__glXGetAnswerBuffer-__GL.patch
index 3357e9b7e301d322233a1ef124cc8fc25fb353a5..7264aedf201b6b24b73908c066ebe5a624f3aec6 100644 (file)
--- a/debian/patches/CVE-2014-8xxx/0022-glx-Additional-paranoia-in-__glXGetAnswerBuffer-__GL.patch
+++ b/debian/patches/CVE-2014-8xxx/0022-glx-Additional-paranoia-in-__glXGetAnswerBuffer-__GL.patch
@@ -20,11 +20,9 @@ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
  glx/unpack.h        |    3 ++-
  2 files changed, 8 insertions(+), 2 deletions(-)
 
-diff --git a/glx/indirect_util.c b/glx/indirect_util.c
-index 926e57c..de81491 100644
 --- a/glx/indirect_util.c
 +++ b/glx/indirect_util.c
-@@ -76,9 +76,14 @@ __glXGetAnswerBuffer(__GLXclientState * cl, size_t required_size,
+@@ -76,9 +76,14 @@ __glXGetAnswerBuffer(__GLXclientState *
      const unsigned mask = alignment - 1;
  
      if (local_size < required_size) {
@@ -40,8 +38,6 @@ index 926e57c..de81491 100644
          if (cl->returnBufSize < worst_case_size) {
              void *temp = realloc(cl->returnBuf, worst_case_size);
  
-diff --git a/glx/unpack.h b/glx/unpack.h
-index 52fba74..2b1ebcf 100644
 --- a/glx/unpack.h
 +++ b/glx/unpack.h
 @@ -83,7 +83,8 @@ extern xGLXSingleReply __glXReply;
@@ -54,6 +50,3 @@ index 52fba74..2b1ebcf 100644
        int bump;                                                        \
        if ((cl)->returnBufSize < (size)+(align)) {                      \
            (cl)->returnBuf = (GLbyte*)realloc((cl)->returnBuf,          \
--- 
-1.7.9.2
-