diff -Nru gtk+2.0-2.24.28/debian/changelog gtk+2.0-2.24.28/debian/changelog --- gtk+2.0-2.24.28/debian/changelog 2015-09-04 13:48:49.000000000 +0300 +++ gtk+2.0-2.24.28/debian/changelog 2015-09-22 13:27:29.000000000 +0300 @@ -1,3 +1,12 @@ +gtk+2.0 (2.24.28-1ubuntu1.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * gdkcairo-Avoid-integer-overflow.patch: new patch. Cherry-pick upstream + commit from GTK+3 to avoid integer overflow when allocating a large block + of memory in gdk_cairo_set_source_pixbuf. + + -- Vlad Orlov Tue, 22 Sep 2015 13:27:04 +0300 + gtk+2.0 (2.24.28-1ubuntu1) wily; urgency=low * Merge from Debian unstable (LP: #1485548). Remaining changes: diff -Nru gtk+2.0-2.24.28/debian/patches/gdkcairo-Avoid-integer-overflow.patch gtk+2.0-2.24.28/debian/patches/gdkcairo-Avoid-integer-overflow.patch --- gtk+2.0-2.24.28/debian/patches/gdkcairo-Avoid-integer-overflow.patch 1970-01-01 03:00:00.000000000 +0300 +++ gtk+2.0-2.24.28/debian/patches/gdkcairo-Avoid-integer-overflow.patch 2015-09-22 13:28:14.000000000 +0300 @@ -0,0 +1,24 @@ +From 894b1ae76a32720f4bb3d39cf460402e3ce331d6 Mon Sep 17 00:00:00 2001 +From: Matthias Clasen +Date: Sat, 29 Jun 2013 22:06:54 -0400 +Subject: Avoid integer overflow + +Use g_malloc_n in gdk_cairo_set_source_pixbuf when allocating +a large block of memory, to avoid integer overflow. + +Pointed out by Bert Massop in +https://bugzilla.gnome.org/show_bug.cgi?id=703220 + +Index: gtk+2.0-2.24.28/gdk/gdkcairo.c +=================================================================== +--- gtk+2.0-2.24.28.orig/gdk/gdkcairo.c ++++ gtk+2.0-2.24.28/gdk/gdkcairo.c +@@ -211,7 +211,7 @@ gdk_cairo_set_source_pixbuf (cairo_t + format = CAIRO_FORMAT_ARGB32; + + cairo_stride = cairo_format_stride_for_width (format, width); +- cairo_pixels = g_malloc (height * cairo_stride); ++ cairo_pixels = g_malloc_n (height, cairo_stride); + surface = cairo_image_surface_create_for_data ((unsigned char *)cairo_pixels, + format, + width, height, cairo_stride); diff -Nru gtk+2.0-2.24.28/debian/patches/series gtk+2.0-2.24.28/debian/patches/series --- gtk+2.0-2.24.28/debian/patches/series 2015-09-04 13:41:23.000000000 +0300 +++ gtk+2.0-2.24.28/debian/patches/series 2015-09-22 13:28:09.000000000 +0300 @@ -29,3 +29,4 @@ menubar_toolbar_dragging.patch use-secrets-service-for-cups-auth_info.patch printing-initialize-auth_info.patch +gdkcairo-Avoid-integer-overflow.patch