debian/changelog | 7 ++++++
debian/patches/series | 1
debian/patches/validate.patch | 44 ++++++++++++++++++++++++++++++++++++++++++
3 files changed, 52 insertions(+)
New commits:
commit 28a7d0aba2f1b4781e42b1981c908180893437c1
Author: Timo Aaltonen <tjaal...@ubuntu.com>
Date: Wed Nov 27 16:56:04 2013 +0200
validate.patch: fix a crash when rendering invalid trapezoids. (LP:
#1197921)
diff --git a/debian/changelog b/debian/changelog
index 85a6c6f..9207bda 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+pixman (0.28.2-0ubuntu1.1) raring-proposed; urgency=low
+
+ * debian/patches/validate.patch:
+ - fixing a crash when rendering invalid trapezoids. (LP: #1197921)
+
+ -- Ritesh Khadgaray <rit...@canonical.com> Tue, 26 Nov 2013 12:02:49 +0530
+
pixman (0.28.2-0ubuntu1) raring; urgency=low
* Sync from unreleased debian experimental git.
diff --git a/debian/patches/series b/debian/patches/series
index bad3809..0fe1236 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
00-unexport-symbol.diff
+validate.patch
diff --git a/debian/patches/validate.patch b/debian/patches/validate.patch
new file mode 100644
index 0000000..9fc205a
--- /dev/null
+++ b/debian/patches/validate.patch
@@ -0,0 +1,44 @@
+diff -Naurp pixman-0.28.2/pixman/pixman.h pixman-0.28.2.new/pixman/pixman.h
+--- pixman-0.28.2/pixman/pixman.h 2012-12-10 17:04:13.000000000 +0530
++++ pixman-0.28.2.new/pixman/pixman.h 2013-11-26 12:00:07.684025531 +0530
+@@ -979,7 +979,7 @@ struct pixman_triangle
+ #define pixman_trapezoid_valid(t) \
+ ((t)->left.p1.y != (t)->left.p2.y && \
+ (t)->right.p1.y != (t)->right.p2.y && \
+- (int) ((t)->bottom - (t)->top) > 0)
++ ((t)->bottom > (t)->top))
+
+ struct pixman_span_fix
+ {
+diff --git a/test/trap-crasher.c b/test/trap-crasher.c
+index 4e4cac2..77be1c9 100644
+--- a/test/trap-crasher.c
++++ b/test/trap-crasher.c
+@@ -5,7 +5,7 @@ int
+ main()
+ {
+ pixman_image_t *dst;
+- pixman_trapezoid_t traps[1] = {
++ pixman_trapezoid_t traps[] = {
+ {
+ 2147483646,
+ 2147483647,
+@@ -18,6 +18,18 @@ main()
+ { 0, 2147483647 }
+ }
+ },
++ {
++ 32768,
++ - 2147483647,
++ {
++ { 0, 0 },
++ { 0, 2147483647 }
++ },
++ {
++ { 65536, 0 },
++ { 0, 2147483647 }
++ }
++ },
+ };
+
+ dst = pixman_image_create_bits (PIXMAN_a8, 1, 1, NULL, -1);
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1vlgaj-0005qb...@moszumanska.debian.org
