diff options
| author | Tony Cook <tony@develop-help.com> | 2017-08-14 11:52:39 +1000 |
|---|---|---|
| committer | Tony Cook <tony@develop-help.com> | 2017-09-04 14:47:29 +1000 |
| commit | f14cf3632059d421de83cf901c7e849adc1fcd03 (patch) | |
| tree | 154fa1ff985a07e1daa78f467b4bfcbcb296c9ad /ext/File-Glob | |
| parent | 011c35bc25a9aebadb06d2e6e7f421615d5a7260 (diff) | |
| download | perl-f14cf3632059d421de83cf901c7e849adc1fcd03.tar.gz | |
(perl #131746) avoid undefined behaviour in Copy() etc
These functions depend on C library functions which have undefined
behaviour when passed NULL pointers, even when passed a zero 'n' value.
Some compilers use this information, ie. assume the pointers are
non-NULL when optimizing any following code, so we do need to
prevent such unguarded calls.
My initial thought was to add conditionals to each macro to skip the
call to the library function when n is zero, but this adds a cost to
every use of these macros, even when the n value is always true.
So instead I added asserts() which will give us a much more visible
indicator of such broken code and revealed the pp_caller and Glob.xs
issues also patched here.
Diffstat (limited to 'ext/File-Glob')
| -rw-r--r-- | ext/File-Glob/Glob.pm | 2 | ||||
| -rw-r--r-- | ext/File-Glob/Glob.xs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ext/File-Glob/Glob.pm b/ext/File-Glob/Glob.pm index 4f740235fb..6614e8251e 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.29'; +$VERSION = '1.30'; sub import { require Exporter; diff --git a/ext/File-Glob/Glob.xs b/ext/File-Glob/Glob.xs index e0a36814e0..9779d54ca6 100644 --- a/ext/File-Glob/Glob.xs +++ b/ext/File-Glob/Glob.xs @@ -121,7 +121,7 @@ iterate(pTHX_ bool(*globber)(pTHX_ AV *entries, const char *pat, STRLEN len, boo /* chuck it all out, quick or slow */ if (gimme == G_ARRAY) { - if (!on_stack) { + if (!on_stack && AvFILLp(entries) + 1) { EXTEND(SP, AvFILLp(entries)+1); Copy(AvARRAY(entries), SP+1, AvFILLp(entries)+1, SV *); SP += AvFILLp(entries)+1; |