From: Jesse Luehrs Date: Tue, 6 Sep 2011 03:17:25 +0000 (-0500) Subject: don't allow invalid package names X-Git-Tag: 0.24~2 X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=78daf8edadd5929c47b81ef7170549abafa20fa6;p=gitmo%2FPackage-Stash-XS.git don't allow invalid package names --- diff --git a/XS.xs b/XS.xs index 58c76b9..7015e3e 100644 --- a/XS.xs +++ b/XS.xs @@ -126,6 +126,7 @@ typedef struct { static U32 name_hash, namespace_hash, type_hash; static SV *name_key, *namespace_key, *type_key; +static REGEXP *valid_module_regex; static const char *vartype_to_string(vartype_t type) { @@ -185,6 +186,27 @@ static vartype_t string_to_vartype(char *vartype) } } +static int _is_valid_module_name(SV *package) +{ + char *buf; + STRLEN len; + SV *sv; + + buf = SvPV(package, len); + + /* whee cargo cult */ + sv = sv_newmortal(); + sv_upgrade(sv, SVt_PV); + SvREADONLY_on(sv); + SvLEN(sv) = 0; + SvUTF8_on(sv); + SvPVX(sv) = buf; + SvCUR_set(sv, len); + SvPOK_on(sv); + + return pregexec(valid_module_regex, buf, buf + len, buf, 1, sv, 1); +} + static void _deconstruct_variable_name(SV *variable, varspec_t *varspec) { char *varpv; @@ -386,6 +408,9 @@ new(class, package_name) if (!SvPOK(package_name)) croak("Package::Stash->new must be passed the name of the package to access"); + if (!_is_valid_module_name(package_name)) + croak("%s is not a module name", SvPV_nolen(package_name)); + instance = newHV(); if (!hv_store(instance, "name", 4, SvREFCNT_inc_simple_NN(package_name), 0)) { @@ -779,6 +804,11 @@ get_all_symbols(self, vartype=VAR_NONE) BOOT: { + SV *re; + + re = newSVpv("\\A[0-9A-Z_a-z]+(?:::[0-9A-Z_a-z]+)*\\z", 0); + valid_module_regex = pregcomp(re, 0); + name_key = newSVpvs("name"); PERL_HASH(name_hash, "name", 4);