ODROID-U3 xorg-server debian package fork :

[deb_xorg-server.git] / debian / patches / CVE-2014-8xxx / 0018-Add-request-length-checking-test-cases-for-some-Xinp.patch

diff --git a/debian/patches/CVE-2014-8xxx/0018-Add-request-length-checking-test-cases-for-some-Xinp.patch b/debian/patches/CVE-2014-8xxx/0018-Add-request-length-checking-test-cases-for-some-Xinp.patch
index 20ee8ecf02eac3ba48be555029826e58e025fdf9..24330935a7227b63dd39afe74c9fce9f1cf3fabf 100644 (file)
--- a/debian/patches/CVE-2014-8xxx/0018-Add-request-length-checking-test-cases-for-some-Xinp.patch
+++ b/debian/patches/CVE-2014-8xxx/0018-Add-request-length-checking-test-cases-for-some-Xinp.patch
@@ -13,11 +13,9 @@ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
  test/xi2/protocol-xiwarppointer.c       |    3 +++
  4 files changed, 20 insertions(+)
 
-Index: xorg-server-1.15.1/test/xi2/protocol-xigetclientpointer.c
-===================================================================
---- xorg-server-1.15.1.orig/test/xi2/protocol-xigetclientpointer.c     2014-12-04 11:54:32.024693177 -0500
-+++ xorg-server-1.15.1/test/xi2/protocol-xigetclientpointer.c  2014-12-04 11:54:32.020693152 -0500
-@@ -124,6 +124,11 @@
+--- a/test/xi2/protocol-xigetclientpointer.c
++++ b/test/xi2/protocol-xigetclientpointer.c
+@@ -124,6 +124,11 @@ test_XIGetClientPointer(void)
      request.win = INVALID_WINDOW_ID;
      request_XIGetClientPointer(&client_request, &request, BadWindow);
  
@@ -29,11 +27,9 @@ Index: xorg-server-1.15.1/test/xi2/protocol-xigetclientpointer.c
      test_data.cp_is_set = FALSE;
  
      printf("Testing window None, unset ClientPointer.\n");
-Index: xorg-server-1.15.1/test/xi2/protocol-xipassivegrabdevice.c
-===================================================================
---- xorg-server-1.15.1.orig/test/xi2/protocol-xipassivegrabdevice.c    2014-12-04 11:54:32.024693177 -0500
-+++ xorg-server-1.15.1/test/xi2/protocol-xipassivegrabdevice.c 2014-12-04 11:54:32.020693152 -0500
-@@ -139,6 +139,7 @@
+--- a/test/xi2/protocol-xipassivegrabdevice.c
++++ b/test/xi2/protocol-xipassivegrabdevice.c
+@@ -139,6 +139,7 @@ request_XIPassiveGrabDevice(ClientPtr cl
      int modifiers;
      int mask_len;
  
@@ -41,7 +37,7 @@ Index: xorg-server-1.15.1/test/xi2/protocol-xipassivegrabdevice.c
      rc = ProcXIPassiveGrabDevice(&client_request);
      assert(rc == error);
  
-@@ -190,6 +191,13 @@
+@@ -190,6 +191,13 @@ test_XIPassiveGrabDevice(void)
      request_XIPassiveGrabDevice(&client_request, request, BadDevice,
                                  request->deviceid);
  
@@ -55,11 +51,9 @@ Index: xorg-server-1.15.1/test/xi2/protocol-xipassivegrabdevice.c
      request->deviceid = XIAllMasterDevices;
  
      printf("Testing invalid grab types\n");
-Index: xorg-server-1.15.1/test/xi2/protocol-xiquerypointer.c
-===================================================================
---- xorg-server-1.15.1.orig/test/xi2/protocol-xiquerypointer.c 2014-12-04 11:54:32.024693177 -0500
-+++ xorg-server-1.15.1/test/xi2/protocol-xiquerypointer.c      2014-12-04 11:54:32.020693152 -0500
-@@ -201,6 +201,10 @@
+--- a/test/xi2/protocol-xiquerypointer.c
++++ b/test/xi2/protocol-xiquerypointer.c
+@@ -201,6 +201,10 @@ test_XIQueryPointer(void)
      test_data.dev = devices.mouse;
      request.deviceid = devices.mouse->id;
      request_XIQueryPointer(&client_request, &request, Success);
@@ -70,11 +64,9 @@ Index: xorg-server-1.15.1/test/xi2/protocol-xiquerypointer.c
  }
  
  int
-Index: xorg-server-1.15.1/test/xi2/protocol-xiwarppointer.c
-===================================================================
---- xorg-server-1.15.1.orig/test/xi2/protocol-xiwarppointer.c  2014-12-04 11:54:32.024693177 -0500
-+++ xorg-server-1.15.1/test/xi2/protocol-xiwarppointer.c       2014-12-04 11:54:32.020693152 -0500
-@@ -198,6 +198,9 @@
+--- a/test/xi2/protocol-xiwarppointer.c
++++ b/test/xi2/protocol-xiwarppointer.c
+@@ -198,6 +198,9 @@ test_XIWarpPointer(void)
      request_XIWarpPointer(&client_request, &request, Success);
  
      /* FIXME: src_x/y checks */