[PATCH] GL_UNPACK_ROW_LENGTH does not accept negative values. So when we have a negative stride we should fallback for the slow code path.

[Igor Oliveira]

---
 src/cairo-gl-surface.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/cairo-gl-surface.c b/src/cairo-gl-surface.c
index 95b4d7c..7108564 100644
--- a/src/cairo-gl-surface.c
+++ b/src/cairo-gl-surface.c
@@ -845,9 +845,10 @@ _cairo_gl_surface_draw_image (cairo_gl_surface_t *dst,
         * b. the row stride cannot be handled by GL itself using a 4 byte
         *     alignment constraint
         */
-       if (ctx->gl_flavor =3D=3D CAIRO_GL_FLAVOR_ES &&
+       if ((ctx->gl_flavor =3D=3D CAIRO_GL_FLAVOR_ES &&
            (src->width * cpp < src->stride - 3 ||
-            width !=3D src->width))
+            width !=3D src->width)) ||
+           src->stride < 0)
        {
            glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
            status =3D _cairo_gl_surface_extract_image_data (src, src_x, sr=
c_y,
--=20
1.7.5.4

--_002_73E7C25EAD45E74E8CC051AA9CA388215B5C4Asjb3kcas1sisasams_
Content-Type: text/x-patch;
	name="0001-GL_UNPACK_ROW_LENGTH-does-not-accept-negative-values.patch"
Content-Description: 0001-GL_UNPACK_ROW_LENGTH-does-not-accept-negative-values.patch
Content-Disposition: attachment;
	filename="0001-GL_UNPACK_ROW_LENGTH-does-not-accept-negative-values.patch";
	size=1085; creation-date="Wed, 21 Mar 2012 01:03:25 GMT";
	modification-date="Wed, 21 Mar 2012 01:03:25 GMT"
Content-Transfer-Encoding: base64

RnJvbSBkYWY4YzRiMzcyYThmODk1YzJjMjNjOWYwZDZmMDE0ZDY3YzNhZjJjIE1vbiBTZXAgMTcg
MDA6MDA6MDAgMjAwMQpGcm9tOiBJZ29yIE9saXZlaXJhIDxpZ29yLm9Ac2lzYS5zYW1zdW5nLmNv
bT4KRGF0ZTogVHVlLCAyMCBNYXIgMjAxMiAxNzo1NDoyNSAtMDcwMApTdWJqZWN0OiBbUEFUQ0hd
IEdMX1VOUEFDS19ST1dfTEVOR1RIIGRvZXMgbm90IGFjY2VwdCBuZWdhdGl2ZSB2YWx1ZXMuIFNv
CiB3aGVuIHdlIGhhdmUgYSBuZWdhdGl2ZSBzdHJpZGUgd2Ugc2hvdWxkIGZhbGxiYWNrIGZvciB0
aGUKIHNsb3cgY29kZSBwYXRoLgoKLS0tCiBzcmMvY2Fpcm8tZ2wtc3VyZmFjZS5jIHwgICAgNSAr
KystLQogMSBmaWxlcyBjaGFuZ2VkLCAzIGluc2VydGlvbnMoKyksIDIgZGVsZXRpb25zKC0pCgpk
aWZmIC0tZ2l0IGEvc3JjL2NhaXJvLWdsLXN1cmZhY2UuYyBiL3NyYy9jYWlyby1nbC1zdXJmYWNl
LmMKaW5kZXggOTViNGQ3Yy4uNzEwODU2NCAxMDA2NDQKLS0tIGEvc3JjL2NhaXJvLWdsLXN1cmZh
Y2UuYworKysgYi9zcmMvY2Fpcm8tZ2wtc3VyZmFjZS5jCkBAIC04NDUsOSArODQ1LDEwIEBAIF9j
YWlyb19nbF9zdXJmYWNlX2RyYXdfaW1hZ2UgKGNhaXJvX2dsX3N1cmZhY2VfdCAqZHN0LAogCSAq
IGIuIHRoZSByb3cgc3RyaWRlIGNhbm5vdCBiZSBoYW5kbGVkIGJ5IEdMIGl0c2VsZiB1c2luZyBh
IDQgYnl0ZQogCSAqICAgICBhbGlnbm1lbnQgY29uc3RyYWludAogCSAqLwotCWlmIChjdHgtPmds
X2ZsYXZvciA9PSBDQUlST19HTF9GTEFWT1JfRVMgJiYKKwlpZiAoKGN0eC0+Z2xfZmxhdm9yID09
IENBSVJPX0dMX0ZMQVZPUl9FUyAmJgogCSAgICAoc3JjLT53aWR0aCAqIGNwcCA8IHNyYy0+c3Ry
aWRlIC0gMyB8fAotCSAgICAgd2lkdGggIT0gc3JjLT53aWR0aCkpCisJICAgICB3aWR0aCAhPSBz
cmMtPndpZHRoKSkgfHwKKwkgICAgc3JjLT5zdHJpZGUgPCAwKQogCXsKIAkgICAgZ2xQaXhlbFN0
b3JlaSAoR0xfVU5QQUNLX0FMSUdOTUVOVCwgMSk7CiAJICAgIHN0YXR1cyA9IF9jYWlyb19nbF9z
dXJmYWNlX2V4dHJhY3RfaW1hZ2VfZGF0YSAoc3JjLCBzcmNfeCwgc3JjX3ksCi0tIAoxLjcuNS40
Cgo=

--_002_73E7C25EAD45E74E8CC051AA9CA388215B5C4Asjb3kcas1sisasams_--