Attachment 101029 Details for Bug 54168 – Patch to maintain no segfault in fbBresSolid while fixing the algorithmic problems created in 863d528a9f76d0e8f122aebf19f8564a4c67a938

[patch] Patch to maintain no segfault in fbBresSolid while fixing the algorithmic problems created in 863d528a9f76d0e8f122aebf19f8564a4c67a938

fix-fbBres.patch (text/plain), 1.54 KB, created by Alex Orange on 2014-06-14 05:51:53 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Orange

Created: 2014-06-14 05:51:53 UTC

Size: 1.54 KB

patch

obsolete

>diff -ur xorg-server-1.15.0/fb/fbseg.c xorg-server-1.15.0-fix-fbBres/fb/fbseg.c
>--- xorg-server-1.15.0/fb/fbseg.c	2013-12-15 00:48:08.000000000 -0700
>+++ xorg-server-1.15.0-fix-fbBres/fb/fbseg.c	2014-06-13 23:29:32.993019058 -0600
>@@ -65,12 +65,6 @@
>     if (axis == X_AXIS) {
>         bits = 0;
>         while (len--) {
>-            if (e >= 0) {
>-                WRITE(dst, FbDoMaskRRop (READ(dst), and, xor, bits));
>-                bits = 0;
>-                dst += dstStride;
>-                e += e3;
>-            }
>             bits |= mask;
>             mask = fbBresShiftMask(mask, signdx, dstBpp);
>             if (!mask) {
>@@ -80,12 +74,23 @@
>                 mask = mask0;
>             }
>             e += e1;
>+            if (e >= 0) {
>+                if (bits) {
>+                    WRITE(dst, FbDoMaskRRop (READ(dst), and, xor, bits));
>+                    bits = 0;
>+                }
>+                dst += dstStride;
>+                e += e3;
>+            }
>         }
>         if (bits)
>             WRITE(dst, FbDoMaskRRop(READ(dst), and, xor, bits));
>     }
>     else {
>         while (len--) {
>+            WRITE(dst, FbDoMaskRRop(READ(dst), and, xor, mask));
>+            dst += dstStride;
>+            e += e1;
>             if (e >= 0) {
>                 e += e3;
>                 mask = fbBresShiftMask(mask, signdx, dstBpp);
>@@ -94,9 +99,6 @@
>                     mask = mask0;
>                 }
>             }
>-            WRITE(dst, FbDoMaskRRop(READ(dst), and, xor, mask));
>-            dst += dstStride;
>-            e += e1;
>         }
>     }
>

Actions: View | Splinter Review

Attachments on bug 54168: 66246 | 101029

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.