diff options
| author | David Mitchell <davem@iabyn.com> | 2013-11-13 15:01:40 +0000 |
|---|---|---|
| committer | David Mitchell <davem@iabyn.com> | 2013-11-13 17:38:43 +0000 |
| commit | 03e4b83dd4717161d2b8ca65f1f26bc6336676c1 (patch) | |
| tree | 7827bbc446b45166c00252efe8183dd3eb319257 /ext/File-Glob | |
| parent | 46a847d35219c7d246a7d6498769055e62afb5f3 (diff) | |
| download | perl-03e4b83dd4717161d2b8ca65f1f26bc6336676c1.tar.gz | |
File::Glob: fix warnings and non-\0-ended strings
The lower levels of File::Glob expect null-terminated strings, while
the higher levels do s = SvPV(sv,len) and pass the len. Ease the impedance
mismatch by ensuring that s[len] is always \0. Most perl SVs will already
have that \0 anyway, so in practice this hasn't been an issue.
It also ignores the utf8-ness of the string. I've kept that as-is (too big
a can of works to open for now), but I've fixed the 'is_utf8 var not used'
warning and added an XXX comment instead.
Diffstat (limited to 'ext/File-Glob')
| -rw-r--r-- | ext/File-Glob/Glob.pm | 2 | ||||
| -rw-r--r-- | ext/File-Glob/Glob.xs | 16 |
2 files changed, 14 insertions, 4 deletions
diff --git a/ext/File-Glob/Glob.pm b/ext/File-Glob/Glob.pm index 88e630cd8a..2b39dce6a8 100644 --- a/ext/File-Glob/Glob.pm +++ b/ext/File-Glob/Glob.pm @@ -37,7 +37,7 @@ pop @{$EXPORT_TAGS{bsd_glob}}; # no "glob" @EXPORT_OK = (@{$EXPORT_TAGS{'glob'}}, 'csh_glob'); -$VERSION = '1.22'; +$VERSION = '1.23'; sub import { require Exporter; diff --git a/ext/File-Glob/Glob.xs b/ext/File-Glob/Glob.xs index 118d88ed1f..99d22f6af3 100644 --- a/ext/File-Glob/Glob.xs +++ b/ext/File-Glob/Glob.xs @@ -100,6 +100,11 @@ iterate(pTHX_ bool(*globber)(pTHX_ AV *entries, const char *pat, STRLEN len, boo else { pat = SvPV_nomg(patsv,len); is_utf8 = !!SvUTF8(patsv); + /* the lower-level code expects a null-terminated string */ + if (!SvPOK(patsv) || pat != SvPVX(patsv) || pat[len] != '\0') { + SV *newpatsv = newSVpvn_flags(pat, len, SVs_TEMP); + pat = SvPV_nomg(newpatsv,len); + } } if (!IS_SAFE_SYSCALL(pat, len, "pattern", "glob")) { @@ -122,7 +127,7 @@ iterate(pTHX_ bool(*globber)(pTHX_ AV *entries, const char *pat, STRLEN len, boo SP += AvFILLp(entries)+1; } /* No G_DISCARD here! It will free the stack items. */ - hv_delete(MY_CXT.x_GLOB_ENTRIES, cxixpv, cxixlen, 0); + (void)hv_delete(MY_CXT.x_GLOB_ENTRIES, cxixpv, cxixlen, 0); } else { if (AvFILLp(entries) + 1) { @@ -130,7 +135,7 @@ iterate(pTHX_ bool(*globber)(pTHX_ AV *entries, const char *pat, STRLEN len, boo } else { /* return undef for EOL */ - hv_delete(MY_CXT.x_GLOB_ENTRIES, cxixpv, cxixlen, G_DISCARD); + (void)hv_delete(MY_CXT.x_GLOB_ENTRIES, cxixpv, cxixlen, G_DISCARD); PUSHs(&PL_sv_undef); } } @@ -306,6 +311,11 @@ doglob_iter_wrapper(pTHX_ AV *entries, const char *pattern, STRLEN len, bool is_ int const flags = (int)SvIV(get_sv("File::Glob::DEFAULT_FLAGS", GV_ADD)); + PERL_UNUSED_VAR(len); /* we use \0 termination instead */ + /* XXX we currently just use the underlying bytes of the passed SV. + * Some day someone needs to make glob utf8 aware */ + PERL_UNUSED_VAR(is_utf8); + PUSHMARK(SP); PUTBACK; doglob(aTHX_ pattern, flags); @@ -330,7 +340,7 @@ glob_ophook(pTHX_ OP *o) dMY_CXT; if (MY_CXT.x_GLOB_ENTRIES && (o->op_type == OP_GLOB || o->op_type == OP_ENTERSUB)) - hv_delete(MY_CXT.x_GLOB_ENTRIES, (char *)&o, sizeof(OP *), + (void)hv_delete(MY_CXT.x_GLOB_ENTRIES, (char *)&o, sizeof(OP *), G_DISCARD); if (MY_CXT.x_GLOB_OLD_OPHOOK) MY_CXT.x_GLOB_OLD_OPHOOK(aTHX_ o); } |