From: "André Erdmann" <dywi@mailerd.de>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/R_overlay:master commit in: roverlay/ebuild/
Date: Thu, 25 Jul 2013 08:06:13 +0000 (UTC) [thread overview]
Message-ID: <1374739344.d5d60cb4944cf7f39083aeb2d618eca6b2acd7ad.dywi@gentoo> (raw)
commit: d5d60cb4944cf7f39083aeb2d618eca6b2acd7ad
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Thu Jul 25 08:02:24 2013 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Thu Jul 25 08:02:24 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=d5d60cb4
ebuild/evars: make R_SUGGESTS str more robust
Use get_value_str() to remove potentially malicious char sequences.
---
roverlay/ebuild/evars.py | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git a/roverlay/ebuild/evars.py b/roverlay/ebuild/evars.py
index f602033..87d595c 100644
--- a/roverlay/ebuild/evars.py
+++ b/roverlay/ebuild/evars.py
@@ -24,7 +24,7 @@ import roverlay.strutil
import roverlay.ebuild.abstractcomponents
-from roverlay.ebuild.abstractcomponents import ListValue
+from roverlay.ebuild.abstractcomponents import ListValue, get_value_str
RSUGGESTS_NAME = 'R_SUGGESTS'
@@ -206,19 +206,25 @@ class UseExpandListValue (
# --- end of cleanup (...) ---
def join_value_str ( self, join_str, quoted=False ):
- # get_value_str() not necessary here
+ # get_value_str() not strictly necessary here,
+ # but it catches incorrect handling of config options/values
+ #
if self.sort_flags:
return join_str.join (
- "{basename}_{flag}? ( {deps} )".format (
- basename=self.basename, flag=k, deps=' '.join ( v )
+ get_value_str (
+ "{basename}_{flag}? ( {deps} )".format (
+ basename=self.basename, flag=k, deps=' '.join ( v )
+ )
) for k, v in sorted (
self.depdict.items(), key=( lambda item : item[0] )
)
)
else:
return join_str.join (
- "{basename}_{flag}? ( {deps} )".format (
- basename=self.basename, flag=k, deps=' '.join ( v )
+ get_value_str (
+ "{basename}_{flag}? ( {deps} )".format (
+ basename=self.basename, flag=k, deps=' '.join ( v )
+ )
) for k, v in self.depdict.items()
)
# --- end of join_value_str (...) ---
next reply other threads:[~2013-07-25 8:06 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-25 8:06 André Erdmann [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-08-01 3:38 [gentoo-commits] proj/R_overlay:master commit in: roverlay/ebuild/ Benda XU
2019-08-17 16:41 Benda XU
2013-09-05 15:43 André Erdmann
2013-08-28 9:38 André Erdmann
2013-08-23 13:52 André Erdmann
2013-07-29 8:55 André Erdmann
2013-07-25 16:39 André Erdmann
2013-07-25 13:25 André Erdmann
2013-07-25 8:06 André Erdmann
2013-07-10 16:16 André Erdmann
2013-07-10 8:26 [gentoo-commits] proj/R_overlay:gsoc13/next " André Erdmann
2013-07-10 16:16 ` [gentoo-commits] proj/R_overlay:master " André Erdmann
2013-06-19 18:58 [gentoo-commits] proj/R_overlay:gsoc13/next " André Erdmann
2013-06-19 18:59 ` [gentoo-commits] proj/R_overlay:master " André Erdmann
2013-06-05 18:08 [gentoo-commits] proj/R_overlay:gsoc13/next " André Erdmann
2013-06-13 16:34 ` [gentoo-commits] proj/R_overlay:master " André Erdmann
2013-04-25 16:44 André Erdmann
2013-04-25 16:44 André Erdmann
2013-01-30 20:16 André Erdmann
2013-01-30 20:16 André Erdmann
2013-01-30 20:16 André Erdmann
2013-01-30 20:16 André Erdmann
2012-08-09 9:26 André Erdmann
2012-08-07 8:50 André Erdmann
2012-08-03 13:38 André Erdmann
2012-08-03 13:38 André Erdmann
2012-08-02 15:14 André Erdmann
2012-08-02 15:14 André Erdmann
2012-07-30 8:52 [gentoo-commits] proj/R_overlay:overlay_wip " André Erdmann
2012-07-30 8:52 ` [gentoo-commits] proj/R_overlay:master " André Erdmann
2012-07-16 16:15 André Erdmann
2012-07-16 16:15 André Erdmann
2012-07-12 18:04 André Erdmann
2012-07-06 22:19 André Erdmann
2012-06-29 22:48 André Erdmann
2012-06-29 22:48 André Erdmann
2012-06-29 22:48 André Erdmann
2012-06-29 22:48 André Erdmann
2012-06-28 15:55 André Erdmann
2012-06-28 13:29 André Erdmann
2012-06-26 15:42 André Erdmann
2012-06-21 16:55 André Erdmann
2012-06-20 19:03 André Erdmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1374739344.d5d60cb4944cf7f39083aeb2d618eca6b2acd7ad.dywi@gentoo \
--to=dywi@mailerd.de \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox