Gentoo Archives: gentoo-commits

From: Fabian Groffen <grobian@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/portage-utils:master commit in: /
Date: Wed, 22 Jan 2020 20:11:32
Message-Id: 1579723557.9bcc67d7155a2fa2287d1f2600d3ca2419b51e09.grobian@gentoo
1 commit: 9bcc67d7155a2fa2287d1f2600d3ca2419b51e09
2 Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
3 AuthorDate: Wed Jan 22 20:05:57 2020 +0000
4 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
5 CommitDate: Wed Jan 22 20:05:57 2020 +0000
6 URL: https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=9bcc67d7
7
8 qmanifest: fix Coverity 206530 Explicit null dereferenced
9
10 Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
11
12 qmanifest.c | 3 ++-
13 1 file changed, 2 insertions(+), 1 deletion(-)
14
15 diff --git a/qmanifest.c b/qmanifest.c
16 index bead1c9..31c4696 100644
17 --- a/qmanifest.c
18 +++ b/qmanifest.c
19 @@ -1489,7 +1489,8 @@ verify_manifest(
20 * - Manifest at top-level, needs to be igored as it only points to
21 * the larger Manifest.files.gz
22 */
23 - qsort(elems, elemslen, sizeof(elems[0]), compare_elems);
24 + if (compare_elems > 1)
25 + qsort(elems, elemslen, sizeof(elems[0]), compare_elems);
26 snprintf(buf, sizeof(buf), "%s/%s", dir, manifest);
27 ret = verify_dir(dir, elems, elemslen, 0, buf + 2, msgs);
28 checked_manifests++;