aboutsummaryrefslogtreecommitdiff
path: root/debian/patches/1031-glx-Be-more-paranoid-about-variable-length-requ.full.patch
diff options
context:
space:
mode:
authorMihai Moldovan <ionic@ionic.de>2017-08-03 09:41:21 +0200
committerMihai Moldovan <ionic@ionic.de>2017-08-03 09:41:21 +0200
commit6ae091cc27f90bd431e4d9564c760fa209f8efb8 (patch)
tree253588fb5860a00d39e957085a08a0dfcd736927 /debian/patches/1031-glx-Be-more-paranoid-about-variable-length-requ.full.patch
parenta4fb30f8d0dc188821ac61d64d113a6ae6156b95 (diff)
downloadnx-libs-6ae091cc27f90bd431e4d9564c760fa209f8efb8.tar.gz
nx-libs-6ae091cc27f90bd431e4d9564c760fa209f8efb8.tar.bz2
nx-libs-6ae091cc27f90bd431e4d9564c760fa209f8efb8.zip
debian/patches: refresh all patches.
Removes some fuzziness and adds the -p diff option to show the C function name in hunk headers.
Diffstat (limited to 'debian/patches/1031-glx-Be-more-paranoid-about-variable-length-requ.full.patch')
-rw-r--r--debian/patches/1031-glx-Be-more-paranoid-about-variable-length-requ.full.patch15
1 files changed, 4 insertions, 11 deletions
diff --git a/debian/patches/1031-glx-Be-more-paranoid-about-variable-length-requ.full.patch b/debian/patches/1031-glx-Be-more-paranoid-about-variable-length-requ.full.patch
index 6d16d2ec4..2c0da1e04 100644
--- a/debian/patches/1031-glx-Be-more-paranoid-about-variable-length-requ.full.patch
+++ b/debian/patches/1031-glx-Be-more-paranoid-about-variable-length-requ.full.patch
@@ -27,11 +27,9 @@ fixup swaps
nx-X11/programs/Xserver/GL/glx/glxcmdsswap.c | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
-diff --git a/nx-X11/programs/Xserver/GL/glx/glxcmds.c b/nx-X11/programs/Xserver/GL/glx/glxcmds.c
-index ca5eee8..02f3ba7 100644
--- a/nx-X11/programs/Xserver/GL/glx/glxcmds.c
+++ b/nx-X11/programs/Xserver/GL/glx/glxcmds.c
-@@ -1484,7 +1484,7 @@ int __glXRender(__GLXclientState *cl, GLbyte *pc)
+@@ -1484,7 +1484,7 @@ int __glXRender(__GLXclientState *cl, GL
/* variable size command */
extra = (*entry->varsize)(pc + __GLX_RENDER_HDR_SIZE, False);
if (extra < 0) {
@@ -40,7 +38,7 @@ index ca5eee8..02f3ba7 100644
}
if (cmdlen != __GLX_PAD(entry->bytes + extra)) {
return BadLength;
-@@ -1601,7 +1601,7 @@ int __glXRenderLarge(__GLXclientState *cl, GLbyte *pc)
+@@ -1601,7 +1601,7 @@ int __glXRenderLarge(__GLXclientState *c
*/
extra = (*entry->varsize)(pc + __GLX_RENDER_LARGE_HDR_SIZE, False);
if (extra < 0) {
@@ -49,11 +47,9 @@ index ca5eee8..02f3ba7 100644
}
/* large command's header is 4 bytes longer, so add 4 */
if (cmdlen != __GLX_PAD(entry->bytes + 4 + extra)) {
-diff --git a/nx-X11/programs/Xserver/GL/glx/glxcmdsswap.c b/nx-X11/programs/Xserver/GL/glx/glxcmdsswap.c
-index 595e814..027cba7 100644
--- a/nx-X11/programs/Xserver/GL/glx/glxcmdsswap.c
+++ b/nx-X11/programs/Xserver/GL/glx/glxcmdsswap.c
-@@ -535,7 +535,7 @@ int __glXSwapRender(__GLXclientState *cl, GLbyte *pc)
+@@ -535,7 +535,7 @@ int __glXSwapRender(__GLXclientState *cl
/* variable size command */
extra = (*entry->varsize)(pc + __GLX_RENDER_HDR_SIZE, True);
if (extra < 0) {
@@ -62,7 +58,7 @@ index 595e814..027cba7 100644
}
if (cmdlen != __GLX_PAD(entry->bytes + extra)) {
return BadLength;
-@@ -659,7 +659,7 @@ int __glXSwapRenderLarge(__GLXclientState *cl, GLbyte *pc)
+@@ -659,7 +659,7 @@ int __glXSwapRenderLarge(__GLXclientStat
*/
extra = (*entry->varsize)(pc + __GLX_RENDER_LARGE_HDR_SIZE, True);
if (extra < 0) {
@@ -71,6 +67,3 @@ index 595e814..027cba7 100644
}
/* large command's header is 4 bytes longer, so add 4 */
if (cmdlen != __GLX_PAD(entry->bytes + 4 + extra)) {
---
-2.1.4
-