[136619] trunk/base/src/port1.0/portutil.tcl

[raimue at macports.org]

Revision: 136619
          https://trac.macports.org/changeset/136619
Author:   raimue at macports.org
Date:     2015-05-23 07:20:06 -0700 (Sat, 23 May 2015)
Log Message:
-----------
base: reject variant names with invalid characters

https://lists.macosforge.org/pipermail/macports-dev/2015-May/030581.html

Modified Paths:
--------------
    trunk/base/src/port1.0/portutil.tcl

Modified: trunk/base/src/port1.0/portutil.tcl
===================================================================
--- trunk/base/src/port1.0/portutil.tcl	2015-05-23 13:58:52 UTC (rev 136618)
+++ trunk/base/src/port1.0/portutil.tcl	2015-05-23 14:20:06 UTC (rev 136619)
@@ -599,6 +599,12 @@
     }
     ditem_key $ditem name "[join [ditem_key $ditem provides] -]"
 
+    if {![regexp {^[A-Za-z0-9_]+$} [ditem_key $ditem provides]]} {
+        set name [ditem_key $ditem provides] 
+        ditem_delete $ditem
+        return -code error "Variant name $name contains invalid characters"
+    }
+
     # make a user procedure named variant-blah-blah
     # we will call this procedure during variant-run
     makeuserproc variant-[ditem_key $ditem name] $code
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150523/496fdcbd/attachment.html>