Gentoo Archives: gentoo-commits

From: "Ulrich Müller" <ulm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/eselect:master commit in: modules/, /
Date: Sat, 06 May 2017 13:24:21
Message-Id: 1494074627.2c5554fe64ace6f8cb082b6bd442e13dc3999c0c.ulm@gentoo
1 commit: 2c5554fe64ace6f8cb082b6bd442e13dc3999c0c
2 Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
3 AuthorDate: Sat May 6 12:43:47 2017 +0000
4 Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
5 CommitDate: Sat May 6 12:43:47 2017 +0000
6 URL: https://gitweb.gentoo.org/proj/eselect.git/commit/?id=2c5554fe
7
8 Check range of number in kernel and profile modules.
9
10 * modules/kernel.eselect (set_symlink):
11 * modules/profile.eselect (set_symlink): Check range of number,
12 bug 617572. Thanks to Takuto Yoshida <otakuto.gentoo <AT> gmail.com>.
13
14 ChangeLog | 6 ++++++
15 modules/kernel.eselect | 2 ++
16 modules/profile.eselect | 2 ++
17 3 files changed, 10 insertions(+)
18
19 diff --git a/ChangeLog b/ChangeLog
20 index 4bd53b9..2b356bd 100644
21 --- a/ChangeLog
22 +++ b/ChangeLog
23 @@ -1,3 +1,9 @@
24 +2017-05-06 Ulrich Müller <ulm@g.o>
25 +
26 + * modules/kernel.eselect (set_symlink):
27 + * modules/profile.eselect (set_symlink): Check range of number,
28 + bug 617572. Thanks to Takuto Yoshida <otakuto.gentoo@×××××.com>.
29 +
30 2017-03-22 Ulrich Müller <ulm@g.o>
31
32 * configure.ac: Update version to 1.4.9.
33
34 diff --git a/modules/kernel.eselect b/modules/kernel.eselect
35 index 3104a98..e76c143 100644
36 --- a/modules/kernel.eselect
37 +++ b/modules/kernel.eselect
38 @@ -44,6 +44,8 @@ set_symlink() {
39
40 if is_number "${target}"; then
41 local targets=( $(find_targets) )
42 + [[ ${target} -ge 1 && ${target} -le ${#targets[@]} ]] \
43 + || die -q "Number out of range: $1"
44 target=${targets[target-1]}
45 fi
46
47
48 diff --git a/modules/profile.eselect b/modules/profile.eselect
49 index 68d9b8a..8d95c01 100644
50 --- a/modules/profile.eselect
51 +++ b/modules/profile.eselect
52 @@ -80,6 +80,8 @@ set_symlink() {
53 targets=( $(find_targets) )
54 [[ ${#targets[@]} -eq 0 ]] \
55 && die -q "Failed to get a list of valid profiles"
56 + [[ ${target} -ge 1 && ${target} -le ${#targets[@]} ]] \
57 + || die -q "Number out of range: $1"
58 target=${targets[target-1]}
59 repo=${target%%::*}; target=${target#*::}
60 repopath=${target%%::*}; target=${target#*::}