[pkgsrc/trunk]: pkgsrc/devel/at-spi2-core at-spi2-core: fix inverted logic th...

[maya <maya%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/181f206b8c28
branches:  trunk
changeset: 372377:181f206b8c28
user:      maya <maya%pkgsrc.org@localhost>
date:      Mon Dec 04 16:36:24 2017 +0000

description:
at-spi2-core: fix inverted logic that might lead to buffer overflow
(merged upstream).

bump PKGREVISION

diffstat:

 devel/at-spi2-core/Makefile                                |   3 +-
 devel/at-spi2-core/distinfo                                |   3 +-
 devel/at-spi2-core/patches/patch-bus_at-spi-bus-launcher.c |  16 ++++++++++++++
 3 files changed, 20 insertions(+), 2 deletions(-)

diffs (44 lines):

diff -r e7d0bffad636 -r 181f206b8c28 devel/at-spi2-core/Makefile
--- a/devel/at-spi2-core/Makefile       Mon Dec 04 15:19:59 2017 +0000
+++ b/devel/at-spi2-core/Makefile       Mon Dec 04 16:36:24 2017 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.26 2017/11/23 15:16:39 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2017/12/04 16:36:24 maya Exp $
 
 DISTNAME=      at-spi2-core-2.26.2
+PKGREVISION=   1
 CATEGORIES=    devel gnome
 MASTER_SITES=  ${MASTER_SITE_GNOME:=sources/at-spi2-core/${PKGVERSION_NOREV:R}/}
 EXTRACT_SUFX=  .tar.xz
diff -r e7d0bffad636 -r 181f206b8c28 devel/at-spi2-core/distinfo
--- a/devel/at-spi2-core/distinfo       Mon Dec 04 15:19:59 2017 +0000
+++ b/devel/at-spi2-core/distinfo       Mon Dec 04 16:36:24 2017 +0000
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.22 2017/11/23 15:16:39 wiz Exp $
+$NetBSD: distinfo,v 1.23 2017/12/04 16:36:24 maya Exp $
 
 SHA1 (at-spi2-core-2.26.2.tar.xz) = 1c39d66c1ca02005abff884fdab0ab510311d018
 RMD160 (at-spi2-core-2.26.2.tar.xz) = 8b4da05431a7c764701a36d8be4753ff0dc17574
 SHA512 (at-spi2-core-2.26.2.tar.xz) = 6a8e158e30c37ce475467b6634aff046a318875271966d7bfa3e56052d0cd26cd37435d0b9ae14f079542b8b3e76088da5bd50ed39eb39f3f40394c55ed3f255
 Size (at-spi2-core-2.26.2.tar.xz) = 494484 bytes
+SHA1 (patch-bus_at-spi-bus-launcher.c) = f897928b6b032c729c409ccecc9d8088b45bca5a
diff -r e7d0bffad636 -r 181f206b8c28 devel/at-spi2-core/patches/patch-bus_at-spi-bus-launcher.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/at-spi2-core/patches/patch-bus_at-spi-bus-launcher.c        Mon Dec 04 16:36:24 2017 +0000
@@ -0,0 +1,16 @@
+$NetBSD: patch-bus_at-spi-bus-launcher.c,v 1.1 2017/12/04 16:36:24 maya Exp $
+
+Fix inverted logic. Don't write to a buffer more than it can hold.
+https://bugzilla.gnome.org/show_bug.cgi?id=791124
+
+--- bus/at-spi-bus-launcher.c.orig     2017-06-20 17:27:11.000000000 +0000
++++ bus/at-spi-bus-launcher.c
+@@ -244,7 +244,7 @@ unix_read_all_fd_to_string (int      fd,
+ {
+   ssize_t bytes_read;
+ 
+-  while (max_bytes > 1 && (bytes_read = read (fd, buf, MAX (4096, max_bytes - 1))))
++  while (max_bytes > 1 && (bytes_read = read (fd, buf, MIN (4096, max_bytes - 1))))
+     {
+       if (bytes_read < 0)
+         return FALSE;