summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorespie <espie@openbsd.org>2016-06-14 20:49:03 +0000
committerespie <espie@openbsd.org>2016-06-14 20:49:03 +0000
commit4cdaf3c1e07c93c9b3eb5cdbfef47a8909aa4379 (patch)
treeb242ac0c6661a9b4c23c858b898dcfbab9e0238c
parentllprio now affects pppoe(4) control frames as well as arp(4) and bpf(4) writes. (diff)
downloadwireguard-openbsd-4cdaf3c1e07c93c9b3eb5cdbfef47a8909aa4379.tar.xz
wireguard-openbsd-4cdaf3c1e07c93c9b3eb5cdbfef47a8909aa4379.zip
restrict %m and friends to "separate words" so they won't collide with
branch specifiers. Unlikely, but better safe than sorry.
-rw-r--r--usr.sbin/pkg_add/OpenBSD/PackageRepository/Installed.pm4
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.sbin/pkg_add/OpenBSD/PackageRepository/Installed.pm b/usr.sbin/pkg_add/OpenBSD/PackageRepository/Installed.pm
index 4a3eadafd31..ab952251b5d 100644
--- a/usr.sbin/pkg_add/OpenBSD/PackageRepository/Installed.pm
+++ b/usr.sbin/pkg_add/OpenBSD/PackageRepository/Installed.pm
@@ -1,5 +1,5 @@
# ex:ts=8 sw=4:
-# $OpenBSD: Installed.pm,v 1.33 2015/06/25 13:33:25 sthen Exp $
+# $OpenBSD: Installed.pm,v 1.34 2016/06/14 20:49:03 espie Exp $
#
# Copyright (c) 2007-2014 Marc Espie <espie@openbsd.org>
#
@@ -61,7 +61,7 @@ sub parse_url
$$r = '';
}
- $path =~ s/\%[vacm]/$class->expand_locations($&, $state)/ge;
+ $path =~ s/\%[vacm]\b/$class->expand_locations($&, $state)/ge;
$path .= '/' unless $path =~ m/\/$/;
bless { path => $path, state => $state }, $class;
}