a0871be6c0
* Update buildroot-patches for 2020.11-rc1 buildroot * Update buildroot to 2020.11-rc1 Signed-off-by: Stefan Agner <stefan@agner.ch> * Don't rely on sfdisk --list-free output The --list-free (-F) argument does not allow machine readable mode. And it seems that the output format changes over time (different spacing, using size postfixes instead of raw blocks). Use sfdisk json output and calculate free partition space ourselfs. This works for 2.35 and 2.36 and is more robust since we rely on output which is meant for scripts to parse. * Migrate defconfigs for Buildroot 2020.11-rc1 In particular, rename BR2_TARGET_UBOOT_BOOT_SCRIPT(_SOURCE) to BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT(_SOURCE). * Rebase/remove systemd patches for systemd 246 * Drop apparmor/libapparmor from buildroot-external * hassos-persists: use /run as directory for lockfiles The U-Boot tools use /var/lock by default which is not created any more by systemd by default (it is under tmpfiles legacy.conf, which we no longer install). * Disable systemd-update-done.service The service is not suited for pure read-only systems. In particular the service needs to be able to write a file in /etc and /var. Remove the service. Note: This is a static service and cannot be removed using systemd-preset. * Disable apparmor.service for now The service loads all default profiles. Some might actually cause problems. E.g. the profile for ping seems not to match our setup for /etc/resolv.conf: [85503.634653] audit: type=1400 audit(1605286002.684:236): apparmor="DENIED" operation="open" profile="ping" name="/run/resolv.conf" pid=27585 comm="ping" requested_mask="r" denied_mask="r" fsuid=0 ouid=0
79 lines
3.2 KiB
Diff
79 lines
3.2 KiB
Diff
# HG changeset patch
|
|
# User Bob Friesenhahn <bfriesen@GraphicsMagick.org>
|
|
# Date 1590851896 18000
|
|
# Sat May 30 10:18:16 2020 -0500
|
|
# Node ID 50395430a37188d0d197e71bd85ed6dd0f649ee3
|
|
# Parent 4917a4242fc0a12f2f6baa10f1c5a9b3e68c20dd
|
|
MNG: Fix small heap overwrite or assertion if magnifying and image to be magnified has rows or columns == 1.
|
|
|
|
[Retrieved (and updated to remove ChangeLog and version changes) from:
|
|
https://sourceforge.net/p/graphicsmagick/code/ci/50395430a37188d0d197e71bd85ed6dd0f649ee3]
|
|
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
|
|
|
diff -r 4917a4242fc0 -r 50395430a371 coders/png.c
|
|
--- a/coders/png.c Fri May 01 13:49:13 2020 -0500
|
|
+++ b/coders/png.c Sat May 30 10:18:16 2020 -0500
|
|
@@ -5304,7 +5304,7 @@
|
|
if (logging)
|
|
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
|
|
"MAGN chunk (%lu bytes): "
|
|
- "First_magnified_object_id=%u, Last_magnified_object_id=%u, "
|
|
+ "First_magnified_object_id=%u, Las t_magnified_object_id=%u, "
|
|
"MB=%u, ML=%u, MR=%u, MT=%u, MX=%u, MY=%u, "
|
|
"X_method=%u, Y_method=%u",
|
|
length,
|
|
@@ -5679,6 +5679,8 @@
|
|
/*
|
|
If magnifying and a supported method is requested then
|
|
magnify the image.
|
|
+
|
|
+ http://www.libpng.org/pub/mng/spec/mng-1.0-20010209-pdg.html#mng-MAGN
|
|
*/
|
|
if (((mng_info->magn_methx > 0) && (mng_info->magn_methx <= 5)) &&
|
|
((mng_info->magn_methy > 0) && (mng_info->magn_methy <= 5)))
|
|
@@ -5689,7 +5691,28 @@
|
|
|
|
if (logging)
|
|
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
|
|
- " Processing MNG MAGN chunk");
|
|
+ " Processing MNG MAGN chunk: MB=%u, ML=%u,"
|
|
+ " MR=%u, MT=%u, MX=%u, MY=%u,"
|
|
+ " X_method=%u, Y_method=%u",
|
|
+ mng_info->magn_mb,mng_info->magn_ml,
|
|
+ mng_info->magn_mr,mng_info->magn_mt,
|
|
+ mng_info->magn_mx,mng_info->magn_my,
|
|
+ mng_info->magn_methx,
|
|
+ mng_info->magn_methy);
|
|
+
|
|
+ /*
|
|
+ If the image width is 1, then X magnification is done
|
|
+ by simple pixel replication.
|
|
+ */
|
|
+ if (image->columns == 1)
|
|
+ mng_info->magn_methx = 1;
|
|
+
|
|
+ /*
|
|
+ If the image height is 1, then Y magnification is done
|
|
+ by simple pixel replication.
|
|
+ */
|
|
+ if (image->rows == 1)
|
|
+ mng_info->magn_methy = 1;
|
|
|
|
if (mng_info->magn_methx == 1)
|
|
{
|
|
@@ -5734,12 +5757,10 @@
|
|
Image
|
|
*large_image;
|
|
|
|
- int
|
|
- yy;
|
|
-
|
|
long
|
|
m,
|
|
- y;
|
|
+ y,
|
|
+ yy;
|
|
|
|
register long
|
|
x;
|