diff options
Diffstat (limited to 'debian/patches/1021-dix-integer-overflow-in-RegionSizeof-CVE-2014-8.full.patch')
| -rw-r--r-- | debian/patches/1021-dix-integer-overflow-in-RegionSizeof-CVE-2014-8.full.patch | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/debian/patches/1021-dix-integer-overflow-in-RegionSizeof-CVE-2014-8.full.patch b/debian/patches/1021-dix-integer-overflow-in-RegionSizeof-CVE-2014-8.full.patch index a189cd537..64d7d3e41 100644 --- a/debian/patches/1021-dix-integer-overflow-in-RegionSizeof-CVE-2014-8.full.patch +++ b/debian/patches/1021-dix-integer-overflow-in-RegionSizeof-CVE-2014-8.full.patch @@ -24,8 +24,6 @@ Conflicts: nx-X11/programs/Xserver/mi/miregion.c | 39 ++++++++++++++++++++--------- 2 files changed, 34 insertions(+), 15 deletions(-) -diff --git a/nx-X11/programs/Xserver/include/regionstr.h b/nx-X11/programs/Xserver/include/regionstr.h -index 000bf3f..cf41170 100644 --- a/nx-X11/programs/Xserver/include/regionstr.h +++ b/nx-X11/programs/Xserver/include/regionstr.h @@ -53,6 +53,9 @@ SOFTWARE. @@ -60,8 +58,6 @@ index 000bf3f..cf41170 100644 { \ (_pReg)->data->size = (_size); \ (_pReg)->data->numRects = 0; \ -diff --git a/nx-X11/programs/Xserver/mi/miregion.c b/nx-X11/programs/Xserver/mi/miregion.c -index df33248..5ec4ec5 100644 --- a/nx-X11/programs/Xserver/mi/miregion.c +++ b/nx-X11/programs/Xserver/mi/miregion.c @@ -172,7 +172,6 @@ Equipment Corporation. @@ -72,7 +68,7 @@ index df33248..5ec4ec5 100644 #define xfreeData(reg) if ((reg)->data && (reg)->data->size) xfree((reg)->data) #define RECTALLOC_BAIL(pReg,n,bail) \ -@@ -209,8 +208,9 @@ if (!(pReg)->data || (((pReg)->data->numRects + (n)) > (pReg)->data->size)) \ +@@ -209,8 +208,9 @@ if (!(pReg)->data || (((pReg)->data->num #define DOWNSIZE(reg,numRects) \ if (((numRects) < ((reg)->data->size >> 1)) && ((reg)->data->size > 50)) \ { \ @@ -200,6 +196,3 @@ index df33248..5ec4ec5 100644 if (!dst->data) return miRegionBreak (dst); } --- -2.1.4 - |