From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C6CBB138334 for ; Thu, 2 Jan 2020 14:07:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 06F08E0B72; Thu, 2 Jan 2020 14:07:10 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E1B3AE0A81 for ; Thu, 2 Jan 2020 14:07:08 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id F332734DE60 for ; Thu, 2 Jan 2020 14:07:07 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 84591AC for ; Thu, 2 Jan 2020 14:07:04 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <1577973859.70676c12f78bcf99ebc29901a6db36cbee6044c9.grobian@gentoo> Subject: [gentoo-commits] proj/portage-utils:master commit in: libq/ X-VCS-Repository: proj/portage-utils X-VCS-Files: libq/tree.c X-VCS-Directories: libq/ X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: 70676c12f78bcf99ebc29901a6db36cbee6044c9 X-VCS-Branch: master Date: Thu, 2 Jan 2020 14:07:04 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 2ea1086f-2888-4800-8bcb-c1109f8a39b3 X-Archives-Hash: fb780f31a4fea8a15199f978d8d68b8a commit: 70676c12f78bcf99ebc29901a6db36cbee6044c9 Author: Fabian Groffen gentoo org> AuthorDate: Thu Jan 2 14:04:19 2020 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Thu Jan 2 14:04:19 2020 +0000 URL: https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=70676c12 libq/tree: fix off-by-ones Signed-off-by: Fabian Groffen gentoo.org> libq/tree.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libq/tree.c b/libq/tree.c index e7914f1..186fb4d 100644 --- a/libq/tree.c +++ b/libq/tree.c @@ -912,7 +912,7 @@ tree_read_file_binpkg_xpak_cb( while (isspace((int)data[data_offset + data_len - 1])) data_len--; - if (len - pos < (size_t)data_len) { + if (len - pos < (size_t)(data_len + 1)) { char *old_data = m->Q__data; len += (((data_len + 1) / BUFSIZ) + 1) * BUFSIZ; m->Q__data = xrealloc(m->Q__data, len); @@ -1028,7 +1028,7 @@ tree_pkg_meta_get_int(tree_pkg_ctx *pkg_ctx, size_t offset, const char *keyn) len = (size_t)m->Q__md5_; /* TODO: this is an exact copy from tree_read_file_binpkg_xpak_cb */ - if (len - pos < (size_t)s.st_size) { + if (len - pos < (size_t)(s.st_size + 1)) { char *old_data = m->Q__data; len += (((s.st_size + 1) / BUFSIZ) + 1) * BUFSIZ; m->Q__data = xrealloc(m->Q__data, len); @@ -1049,7 +1049,7 @@ tree_pkg_meta_get_int(tree_pkg_ctx *pkg_ctx, size_t offset, const char *keyn) char *p = *key = m->Q__data + pos; p[s.st_size] = '\0'; while (s.st_size > 0 && isspace((int)p[s.st_size - 1])) - p[s.st_size--] = '\0'; + p[--s.st_size] = '\0'; pos += s.st_size + 1; m->Q__eclasses_ = (char *)pos; }