Index: branches/2015Q3/graphics/gdk-pixbuf2/files/patch-gdk-pixbuf_pixops_pixops.c =================================================================== --- branches/2015Q3/graphics/gdk-pixbuf2/files/patch-gdk-pixbuf_pixops_pixops.c (revision 394844) +++ branches/2015Q3/graphics/gdk-pixbuf2/files/patch-gdk-pixbuf_pixops_pixops.c (nonexistent) @@ -1,82 +0,0 @@ -From ffec86ed5010c5a2be14f47b33bcf4ed3169a199 Mon Sep 17 00:00:00 2001 -From: Matthias Clasen -Date: Mon, 13 Jul 2015 00:33:40 -0400 -Subject: pixops: Be more careful about integer overflow - -Our loader code is supposed to handle out-of-memory and overflow -situations gracefully, reporting errors instead of aborting. But -if you load an image at a specific size, we also execute our -scaling code, which was not careful enough about overflow in some -places. - -This commit makes the scaling code silently return if it fails to -allocate filter tables. This is the best we can do, since -gdk_pixbuf_scale() is not taking a GError. - -https://bugzilla.gnome.org/show_bug.cgi?id=752297 - -diff --git a/gdk-pixbuf/pixops/pixops.c b/gdk-pixbuf/pixops/pixops.c -index 29a1c14..ce51745 100644 ---- gdk-pixbuf/pixops/pixops.c -+++ gdk-pixbuf/pixops/pixops.c -@@ -1272,7 +1272,16 @@ make_filter_table (PixopsFilter *filter) - int i_offset, j_offset; - int n_x = filter->x.n; - int n_y = filter->y.n; -- int *weights = g_new (int, SUBSAMPLE * SUBSAMPLE * n_x * n_y); -+ gsize n_weights; -+ int *weights; -+ -+ n_weights = SUBSAMPLE * SUBSAMPLE * n_x * n_y; -+ if (n_weights / (SUBSAMPLE * SUBSAMPLE * n_x) != n_y) -+ return NULL; /* overflow, bail */ -+ -+ weights = g_try_new (int, n_weights); -+ if (!weights) -+ return NULL; /* overflow, bail */ - - for (i_offset=0; i_offset < SUBSAMPLE; i_offset++) - for (j_offset=0; j_offset < SUBSAMPLE; j_offset++) -@@ -1347,8 +1356,11 @@ pixops_process (guchar *dest_buf, - if (x_step == 0 || y_step == 0) - return; /* overflow, bail out */ - -- line_bufs = g_new (guchar *, filter->y.n); - filter_weights = make_filter_table (filter); -+ if (!filter_weights) -+ return; /* overflow, bail out */ -+ -+ line_bufs = g_new (guchar *, filter->y.n); - - check_shift = check_size ? get_check_shift (check_size) : 0; - -@@ -1468,7 +1480,7 @@ tile_make_weights (PixopsFilterDimension *dim, - double scale) - { - int n = ceil (1 / scale + 1); -- double *pixel_weights = g_new (double, SUBSAMPLE * n); -+ double *pixel_weights = g_malloc_n (sizeof (double) * SUBSAMPLE, n); - int offset; - int i; - -@@ -1526,7 +1538,7 @@ bilinear_magnify_make_weights (PixopsFilterDimension *dim, - } - - dim->n = n; -- dim->weights = g_new (double, SUBSAMPLE * n); -+ dim->weights = g_malloc_n (sizeof (double) * SUBSAMPLE, n); - - pixel_weights = dim->weights; - -@@ -1617,7 +1629,7 @@ bilinear_box_make_weights (PixopsFilterDimension *dim, - double scale) - { - int n = ceil (1/scale + 3.0); -- double *pixel_weights = g_new (double, SUBSAMPLE * n); -+ double *pixel_weights = g_malloc_n (sizeof (double) * SUBSAMPLE, n); - double w; - int offset, i; - --- -cgit v0.10.2 - Property changes on: branches/2015Q3/graphics/gdk-pixbuf2/files/patch-gdk-pixbuf_pixops_pixops.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: branches/2015Q3/graphics/gdk-pixbuf2/files/patch-gdk-pixbuf_gdk-pixbuf-loader.c =================================================================== --- branches/2015Q3/graphics/gdk-pixbuf2/files/patch-gdk-pixbuf_gdk-pixbuf-loader.c (revision 394844) +++ branches/2015Q3/graphics/gdk-pixbuf2/files/patch-gdk-pixbuf_gdk-pixbuf-loader.c (nonexistent) @@ -1,25 +0,0 @@ -From 74c418ba2e41ab9e2287420378a6192788b1fab6 Mon Sep 17 00:00:00 2001 -From: Sarita Rawat -Date: Fri, 5 Jun 2015 06:56:00 +0000 -Subject: Avoid a possible divide-by-zero - -Pointed out in - -https://bugzilla.gnome.org/show_bug.cgi?id=750440 - -diff --git a/gdk-pixbuf/gdk-pixbuf-loader.c b/gdk-pixbuf/gdk-pixbuf-loader.c -index 65845ed..668b703 100644 ---- gdk-pixbuf/gdk-pixbuf-loader.c -+++ gdk-pixbuf/gdk-pixbuf-loader.c -@@ -330,7 +330,7 @@ gdk_pixbuf_loader_prepare (GdkPixbuf *pixbuf, - else - anim = gdk_pixbuf_non_anim_new (pixbuf); - -- if (priv->needs_scale) { -+ if (priv->needs_scale && width != 0 && height != 0) { - priv->animation = GDK_PIXBUF_ANIMATION (_gdk_pixbuf_scaled_anim_new (anim, - (double) priv->width / width, - (double) priv->height / height, --- -cgit v0.10.2 - Property changes on: branches/2015Q3/graphics/gdk-pixbuf2/files/patch-gdk-pixbuf_gdk-pixbuf-loader.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: branches/2015Q3/graphics/gdk-pixbuf2/pkg-plist =================================================================== --- branches/2015Q3/graphics/gdk-pixbuf2/pkg-plist (revision 394844) +++ branches/2015Q3/graphics/gdk-pixbuf2/pkg-plist (revision 394845) @@ -1,151 +1,153 @@ bin/gdk-pixbuf-csource bin/gdk-pixbuf-pixdata bin/gdk-pixbuf-query-loaders include/gdk-pixbuf-2.0/gdk-pixbuf-xlib/gdk-pixbuf-xlib.h include/gdk-pixbuf-2.0/gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.h include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf-animation.h +include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf-autocleanups.h include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf-core.h include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf-enum-types.h include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf-features.h include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf-io.h include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf-loader.h include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf-marshal.h include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf-simple-anim.h include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf-transform.h include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf.h include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixdata.h lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-ani.so lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-bmp.so lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-gif.so lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-icns.so lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-ico.so %%JASPER%%lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-jasper.so %%JPEG%%lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-jpeg.so lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-pcx.so %%PNG%%lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-png.so lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-pnm.so lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-qtif.so lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-ras.so lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-tga.so %%TIFF%%lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-tiff.so lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-wbmp.so lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-xbm.so lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-xpm.so lib/girepository-1.0/GdkPixbuf-2.0.typelib lib/libgdk_pixbuf-2.0.so lib/libgdk_pixbuf-2.0.so.0 lib/libgdk_pixbuf-2.0.so.0.3100.6 lib/libgdk_pixbuf_xlib-2.0.so lib/libgdk_pixbuf_xlib-2.0.so.0 lib/libgdk_pixbuf_xlib-2.0.so.0.3100.6 libdata/pkgconfig/gdk-pixbuf-2.0.pc libdata/pkgconfig/gdk-pixbuf-xlib-2.0.pc man/man1/gdk-pixbuf-csource.1.gz man/man1/gdk-pixbuf-query-loaders.1.gz share/gir-1.0/GdkPixbuf-2.0.gir %%NLS%%share/locale/af/LC_MESSAGES/gdk-pixbuf.mo %%NLS%%share/locale/ang/LC_MESSAGES/gdk-pixbuf.mo %%NLS%%share/locale/ar/LC_MESSAGES/gdk-pixbuf.mo %%NLS%%share/locale/as/LC_MESSAGES/gdk-pixbuf.mo %%NLS%%share/locale/ast/LC_MESSAGES/gdk-pixbuf.mo %%NLS%%share/locale/az/LC_MESSAGES/gdk-pixbuf.mo %%NLS%%share/locale/be/LC_MESSAGES/gdk-pixbuf.mo %%NLS%%share/locale/be@latin/LC_MESSAGES/gdk-pixbuf.mo %%NLS%%share/locale/bg/LC_MESSAGES/gdk-pixbuf.mo %%NLS%%share/locale/bn/LC_MESSAGES/gdk-pixbuf.mo %%NLS%%share/locale/bn_IN/LC_MESSAGES/gdk-pixbuf.mo %%NLS%%share/locale/br/LC_MESSAGES/gdk-pixbuf.mo %%NLS%%share/locale/bs/LC_MESSAGES/gdk-pixbuf.mo %%NLS%%share/locale/ca/LC_MESSAGES/gdk-pixbuf.mo %%NLS%%share/locale/ca@valencia/LC_MESSAGES/gdk-pixbuf.mo %%NLS%%share/locale/crh/LC_MESSAGES/gdk-pixbuf.mo %%NLS%%share/locale/cs/LC_MESSAGES/gdk-pixbuf.mo %%NLS%%share/locale/csb/LC_MESSAGES/gdk-pixbuf.mo %%NLS%%share/locale/cy/LC_MESSAGES/gdk-pixbuf.mo %%NLS%%share/locale/da/LC_MESSAGES/gdk-pixbuf.mo %%NLS%%share/locale/de/LC_MESSAGES/gdk-pixbuf.mo %%NLS%%share/locale/dz/LC_MESSAGES/gdk-pixbuf.mo %%NLS%%share/locale/el/LC_MESSAGES/gdk-pixbuf.mo %%NLS%%share/locale/en@shaw/LC_MESSAGES/gdk-pixbuf.mo %%NLS%%share/locale/en_CA/LC_MESSAGES/gdk-pixbuf.mo %%NLS%%share/locale/en_GB/LC_MESSAGES/gdk-pixbuf.mo %%NLS%%share/locale/eo/LC_MESSAGES/gdk-pixbuf.mo %%NLS%%share/locale/es/LC_MESSAGES/gdk-pixbuf.mo %%NLS%%share/locale/et/LC_MESSAGES/gdk-pixbuf.mo %%NLS%%share/locale/eu/LC_MESSAGES/gdk-pixbuf.mo %%NLS%%share/locale/fa/LC_MESSAGES/gdk-pixbuf.mo %%NLS%%share/locale/fi/LC_MESSAGES/gdk-pixbuf.mo %%NLS%%share/locale/fr/LC_MESSAGES/gdk-pixbuf.mo %%NLS%%share/locale/ga/LC_MESSAGES/gdk-pixbuf.mo %%NLS%%share/locale/gl/LC_MESSAGES/gdk-pixbuf.mo %%NLS%%share/locale/gu/LC_MESSAGES/gdk-pixbuf.mo %%NLS%%share/locale/he/LC_MESSAGES/gdk-pixbuf.mo %%NLS%%share/locale/hi/LC_MESSAGES/gdk-pixbuf.mo %%NLS%%share/locale/hr/LC_MESSAGES/gdk-pixbuf.mo %%NLS%%share/locale/hu/LC_MESSAGES/gdk-pixbuf.mo %%NLS%%share/locale/hy/LC_MESSAGES/gdk-pixbuf.mo %%NLS%%share/locale/ia/LC_MESSAGES/gdk-pixbuf.mo %%NLS%%share/locale/id/LC_MESSAGES/gdk-pixbuf.mo %%NLS%%share/locale/io/LC_MESSAGES/gdk-pixbuf.mo %%NLS%%share/locale/is/LC_MESSAGES/gdk-pixbuf.mo %%NLS%%share/locale/it/LC_MESSAGES/gdk-pixbuf.mo %%NLS%%share/locale/ja/LC_MESSAGES/gdk-pixbuf.mo %%NLS%%share/locale/ka/LC_MESSAGES/gdk-pixbuf.mo +%%NLS%%share/locale/kk/LC_MESSAGES/gdk-pixbuf.mo %%NLS%%share/locale/km/LC_MESSAGES/gdk-pixbuf.mo %%NLS%%share/locale/kn/LC_MESSAGES/gdk-pixbuf.mo %%NLS%%share/locale/ko/LC_MESSAGES/gdk-pixbuf.mo %%NLS%%share/locale/ku/LC_MESSAGES/gdk-pixbuf.mo %%NLS%%share/locale/li/LC_MESSAGES/gdk-pixbuf.mo %%NLS%%share/locale/lt/LC_MESSAGES/gdk-pixbuf.mo %%NLS%%share/locale/lv/LC_MESSAGES/gdk-pixbuf.mo %%NLS%%share/locale/mai/LC_MESSAGES/gdk-pixbuf.mo %%NLS%%share/locale/mi/LC_MESSAGES/gdk-pixbuf.mo %%NLS%%share/locale/mk/LC_MESSAGES/gdk-pixbuf.mo %%NLS%%share/locale/ml/LC_MESSAGES/gdk-pixbuf.mo %%NLS%%share/locale/mn/LC_MESSAGES/gdk-pixbuf.mo %%NLS%%share/locale/mr/LC_MESSAGES/gdk-pixbuf.mo %%NLS%%share/locale/ms/LC_MESSAGES/gdk-pixbuf.mo %%NLS%%share/locale/my/LC_MESSAGES/gdk-pixbuf.mo %%NLS%%share/locale/nb/LC_MESSAGES/gdk-pixbuf.mo %%NLS%%share/locale/nds/LC_MESSAGES/gdk-pixbuf.mo %%NLS%%share/locale/ne/LC_MESSAGES/gdk-pixbuf.mo %%NLS%%share/locale/nl/LC_MESSAGES/gdk-pixbuf.mo %%NLS%%share/locale/nn/LC_MESSAGES/gdk-pixbuf.mo %%NLS%%share/locale/nso/LC_MESSAGES/gdk-pixbuf.mo %%NLS%%share/locale/oc/LC_MESSAGES/gdk-pixbuf.mo %%NLS%%share/locale/or/LC_MESSAGES/gdk-pixbuf.mo %%NLS%%share/locale/pa/LC_MESSAGES/gdk-pixbuf.mo %%NLS%%share/locale/pl/LC_MESSAGES/gdk-pixbuf.mo %%NLS%%share/locale/ps/LC_MESSAGES/gdk-pixbuf.mo %%NLS%%share/locale/pt/LC_MESSAGES/gdk-pixbuf.mo %%NLS%%share/locale/pt_BR/LC_MESSAGES/gdk-pixbuf.mo %%NLS%%share/locale/ro/LC_MESSAGES/gdk-pixbuf.mo %%NLS%%share/locale/ru/LC_MESSAGES/gdk-pixbuf.mo %%NLS%%share/locale/si/LC_MESSAGES/gdk-pixbuf.mo %%NLS%%share/locale/sk/LC_MESSAGES/gdk-pixbuf.mo %%NLS%%share/locale/sl/LC_MESSAGES/gdk-pixbuf.mo %%NLS%%share/locale/sq/LC_MESSAGES/gdk-pixbuf.mo %%NLS%%share/locale/sr/LC_MESSAGES/gdk-pixbuf.mo %%NLS%%share/locale/sr@ije/LC_MESSAGES/gdk-pixbuf.mo %%NLS%%share/locale/sr@latin/LC_MESSAGES/gdk-pixbuf.mo %%NLS%%share/locale/sv/LC_MESSAGES/gdk-pixbuf.mo %%NLS%%share/locale/ta/LC_MESSAGES/gdk-pixbuf.mo %%NLS%%share/locale/te/LC_MESSAGES/gdk-pixbuf.mo %%NLS%%share/locale/tg/LC_MESSAGES/gdk-pixbuf.mo %%NLS%%share/locale/th/LC_MESSAGES/gdk-pixbuf.mo %%NLS%%share/locale/tk/LC_MESSAGES/gdk-pixbuf.mo %%NLS%%share/locale/tr/LC_MESSAGES/gdk-pixbuf.mo %%NLS%%share/locale/tt/LC_MESSAGES/gdk-pixbuf.mo %%NLS%%share/locale/ug/LC_MESSAGES/gdk-pixbuf.mo %%NLS%%share/locale/uk/LC_MESSAGES/gdk-pixbuf.mo %%NLS%%share/locale/uz/LC_MESSAGES/gdk-pixbuf.mo %%NLS%%share/locale/uz@cyrillic/LC_MESSAGES/gdk-pixbuf.mo %%NLS%%share/locale/vi/LC_MESSAGES/gdk-pixbuf.mo %%NLS%%share/locale/wa/LC_MESSAGES/gdk-pixbuf.mo %%NLS%%share/locale/xh/LC_MESSAGES/gdk-pixbuf.mo %%NLS%%share/locale/yi/LC_MESSAGES/gdk-pixbuf.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/gdk-pixbuf.mo %%NLS%%share/locale/zh_HK/LC_MESSAGES/gdk-pixbuf.mo %%NLS%%share/locale/zh_TW/LC_MESSAGES/gdk-pixbuf.mo @exec %D/bin/gdk-pixbuf-query-loaders > /dev/null 2>&1 && %D/bin/gdk-pixbuf-query-loaders > %D/lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders.cache 2>/dev/null || /usr/bin/true @unexec rm %D/lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders.cache 2>&1 >/dev/null || true