Skip to content

Commit

Permalink
Merge 94ff7e4 into 9b56997
Browse files Browse the repository at this point in the history
  • Loading branch information
khwilliamson committed Sep 1, 2021
2 parents 9b56997 + 94ff7e4 commit 1c32941
Show file tree
Hide file tree
Showing 39 changed files with 88 additions and 88 deletions.
2 changes: 1 addition & 1 deletion Porting/bisect-runner.pl
Expand Up @@ -1046,7 +1046,7 @@ sub die_255 {
unless (exists $defines{cc}) {
# If it fails, the heuristic of 63f9ec3008baf7d6 is noisy, and hence
# confusing.
# FIXME - really it should be replaced with a proper test of
# XXX - really it should be replaced with a proper test of
# "can we build something?" and a helpful diagnostic if we can't.
# For now, simply move it here.
$defines{cc} = (`ccache -V`, $?) ? 'cc' : 'ccache cc';
Expand Down
2 changes: 1 addition & 1 deletion Porting/how_to_write_a_perldelta.pod
Expand Up @@ -196,7 +196,7 @@ for the particular file in core.)

Changes which create B<new> files in F<pod/> go here.

B<FIXME> - this could be automated, at least as far as generating a first
B<XXX> - this could be automated, at least as far as generating a first
draft.

=over
Expand Down
32 changes: 16 additions & 16 deletions Porting/security_template.pod
Expand Up @@ -5,79 +5,79 @@ Delete this begin/end block before publication.
Not every heading below is appropriate for every security issue, so
some may be deleted.

Look for FIXME to see what needs to be filled in.
Look for XXX to see what needs to be filled in.

=end editor

=encoding utf8

=head1 NAME

FIXME - short description of the security issue, with an identifier of the issue as the manpage name
XXX - short description of the security issue, with an identifier of the issue as the manpage name

=head1 DESCRIPTION

=for editor
Ideally, FIXME here should be the CVE-ID as a link to cve.mitre.org
Ideally, XXX here should be the CVE-ID as a link to cve.mitre.org

This document describes the
L<FIXME|http://cve.mitre.org/cgi-bin/cvename.cgi?name=FIXME>
L<XXX|http://cve.mitre.org/cgi-bin/cvename.cgi?name=XXX>
security vulnerability for perl 5.

=head2 Are there any known exploits "in the wild" for this vulnerability

FIXME or delete
XXX or delete

=head2 Who is particularly vulnerable because of this issue?

FIXME or delete
XXX or delete

=head2 What is the nature of the vulnerability?

FIXME
XXX

=head2 What potential exploits are enabled by this vulnerability?

FIXME or delete
XXX or delete

=head2 Which major versions of perl 5 are affected?

FIXME with a list of versions that are affected, and which were updated.
XXX with a list of versions that are affected, and which were updated.

=head2 How can users protect themselves?

FIXME or use the following:
XXX or use the following:

If you are vulnerable, upgrade to the latest maintenance release for the
version of perl you are using.

If your release of perl is no longer supported by the perl 5 committers you
may need to upgrade to a new major release of perl. The versions currently
supported by the perl 5 committers are
FIXME 5.28.2 (until 2020-05-31)
XXX 5.28.2 (until 2020-05-31)
and
FIXME 5.30.1 (until 2021-05-31).
XXX 5.30.1 (until 2021-05-31).
The current version of perl is available from https://www.perl.org/get.html .

=head2 Who was given access to the information about the vulnerability?

FIXME or use the following:
XXX or use the following:

Specifics about the vulnerability were first disclosed to
C<perl-security>, a closed subscriber mailing list that has a
subset of the perl committers subcribed to it.

=head2 When was the vulnerability discovered?

FIXME
XXX

=head2 Who discovered the vulnerability?

FIXME
XXX

=head2 How was the vulnerability reported?

FIXME: something like "So-and-so sent email to
XXX: something like "So-and-so sent email to
perl-security@perl.org"

=cut
2 changes: 1 addition & 1 deletion Porting/todo.pod
Expand Up @@ -805,7 +805,7 @@ Change 25773 notes
AvARYLEN(av) has been freed before av, and hence the SvANY() pointer
is now part of the linked list of SV heads, rather than pointing to
the original body. */
/* FIXME - audit the code for other bugs like this one. */
/* XXX - audit the code for other bugs like this one. */

adding the C<SvMAGICAL> check to

Expand Down
2 changes: 1 addition & 1 deletion amigaos4/amigaio.c
Expand Up @@ -356,7 +356,7 @@ struct child_arg

#undef kill

/* FIXME: Is here's a chance, albeit it small of a clash between our pseudo pid */
/* XXX: Is here's a chance, albeit it small of a clash between our pseudo pid */
/* derived from the pthread API and the dos.library pid that newlib kill uses? */
/* clib2 used the Process address so there was no issue */

Expand Down
2 changes: 1 addition & 1 deletion configpm
Expand Up @@ -70,7 +70,7 @@ my %Extensions = map {($_,$_)}
# Could use a map to add ".h", but I suspect that it's easier to use literals,
# so that anyone using grep will find them
# This is the list from MM_VMS, plus pad.h, parser.h, utf8.h
# which it installs. It *doesn't* install perliol.h - FIXME.
# which it installs. It *doesn't* install perliol.h - XXX.
my @header_files = qw(EXTERN.h INTERN.h XSUB.h av.h config.h cop.h cv.h
embed.h embedvar.h form.h gv.h handy.h hv.h hv_func.h intrpvar.h
iperlsys.h keywords.h mg.h nostdio.h op.h opcode.h
Expand Down
4 changes: 2 additions & 2 deletions configure.com
Expand Up @@ -3189,7 +3189,7 @@ $!
$ ccdlflags=""
$ cccdlflags=""
$!
$! FIXME -- This section does not really handle all the different permutations
$! XXX -- This section does not really handle all the different permutations
$! of 64-bitness, and it does not provide for the /POINTER_SIZE=64 compiler
$! option that would be necessary to support the "explicit 64-bit interfaces"
$! promised by -Dusemorebits.
Expand Down Expand Up @@ -5419,7 +5419,7 @@ $ d_getgrnam_r = "define"
$ getgrnam_r_proto = "1"
$ if d_symlink .or. d_symlink .EQS. "define"
$ then
$! FIXME: Need to find how to activate this.
$! XXX: Need to find how to activate this.
$! d_getpgid = "define"
$! d_getpgrp = "define"
$ endif
Expand Down
2 changes: 1 addition & 1 deletion doio.c
Expand Up @@ -974,7 +974,7 @@ S_openn_cleanup(pTHX_ GV *gv, IO *io, PerlIO *fp, char *mode, const char *oname,
#endif /* !PERL_MICRO */
}

/* Eeek - FIXME !!!
/* Eeek - XXX !!!
* If this is a standard handle we discard all the layer stuff
* and just dup the fd into whatever was on the handle before !
*/
Expand Down
30 changes: 15 additions & 15 deletions embed.fnc
Expand Up @@ -622,7 +622,7 @@ Apd |OP* |op_append_elem |I32 optype|NULLOK OP* first|NULLOK OP* last
Apd |OP* |op_append_list |I32 optype|NULLOK OP* first|NULLOK OP* last
Apd |OP* |op_linklist |NN OP *o
Apd |OP* |op_prepend_elem|I32 optype|NULLOK OP* first|NULLOK OP* last
: FIXME - this is only called by pp_chown. They should be merged.
: XXX - this is only called by pp_chown. They should be merged.
p |I32 |apply |I32 type|NN SV** mark|NN SV** sp
Apx |void |apply_attrs_string|NN const char *stashpv|NN CV *cv|NN const char *attrstr|STRLEN len
Apd |void |av_clear |NN AV *av
Expand Down Expand Up @@ -745,9 +745,9 @@ Ap |void |filter_del |NN filter_t funcp
ApRhd |I32 |filter_read |int idx|NN SV *buf_sv|int maxlen
ApPR |char** |get_op_descs
ApPR |char** |get_op_names
: FIXME discussion on p5p
: XXX discussion on p5p
pPR |const char* |get_no_modify
: FIXME discussion on p5p
: XXX discussion on p5p
pPR |U32* |get_opargs
ApPR |PPADDR_t*|get_ppaddr
: Used by CXINC, which appears to be in widespread use
Expand Down Expand Up @@ -775,7 +775,7 @@ Afrpd |OP* |die |NULLOK const char* pat|...
: Used in util.c
pr |void |die_unwind |NN SV* msv
Ap |void |dounwind |I32 cxix
: FIXME
: XXX
pMb |bool|do_aexec |NULLOK SV* really|NN SV** mark|NN SV** sp
: Used in pp_sys.c
p |bool|do_aexec5 |NULLOK SV* really|NN SV** mark|NN SV** sp|int fd|int do_report
Expand Down Expand Up @@ -924,7 +924,7 @@ i |void |op_relocate_sv |NN SV** svp|NN PADOFFSET* targp
#endif
i |OP* |newMETHOP_internal |I32 type|I32 flags|NULLOK OP* dynamic_meth \
|NULLOK SV* const_meth
: FIXME
: XXX
S |OP* |fold_constants |NN OP * const o
Sd |OP* |traverse_op_tree|NN OP* top|NN OP* o
#endif
Expand Down Expand Up @@ -1255,7 +1255,7 @@ Axpd |OP* |parse_stmtseq |U32 flags
Axpd |OP* |parse_subsignature|U32 flags
: Used in various files
Apd |void |op_null |NN OP* o
: FIXME. Used by Data::Alias
: XXX. Used by Data::Alias
EXp |void |op_clear |NN OP* o
Ap |void |op_refcnt_lock
Ap |void |op_refcnt_unlock
Expand Down Expand Up @@ -1372,7 +1372,7 @@ p |char* |_mem_collxfrm |NN const char* input_string \
Afpd |SV* |mess |NN const char* pat|...
Apd |SV* |mess_sv |NN SV* basemsg|bool consume
Apd |SV* |vmess |NN const char* pat|NULLOK va_list* args
: FIXME - either make it public, or stop exporting it. (Data::Alias uses this)
: XXX - either make it public, or stop exporting it. (Data::Alias uses this)
: Used in gv.c, op.c, toke.c
EXp |void |qerror |NN SV* err
Apd |void |sortsv |NULLOK SV** array|size_t num_elts|NN SVCOMPARE_t cmp
Expand Down Expand Up @@ -1958,7 +1958,7 @@ Apdh |I32 |pregexec |NN REGEXP * const prog|NN char* stringarg \
|SSize_t minend |NN SV* screamer|U32 nosave
Ap |void |pregfree |NULLOK REGEXP* r
Cp |void |pregfree2 |NN REGEXP *rx
: FIXME - is anything in re using this now?
: XXX - is anything in re using this now?
EXp |REGEXP*|reg_temp_copy |NULLOK REGEXP* dsv|NN REGEXP* ssv
Cp |void |regfree_internal|NN REGEXP *const rx
#if defined(USE_ITHREADS)
Expand Down Expand Up @@ -1997,14 +1997,14 @@ Cp |SV*|reg_named_buff_nextkey |NN REGEXP * const rx|const U32 flags
Cp |SV*|reg_named_buff_scalar |NN REGEXP * const rx|const U32 flags
Cp |SV*|reg_named_buff_all |NN REGEXP * const rx|const U32 flags

: FIXME - is anything in re using this now?
: XXX - is anything in re using this now?
EXp |void|reg_numbered_buff_fetch|NN REGEXP * const rx|const I32 paren|NULLOK SV * const sv
: FIXME - is anything in re using this now?
: XXX - is anything in re using this now?
EXp |void|reg_numbered_buff_store|NN REGEXP * const rx|const I32 paren|NULLOK SV const * const value
: FIXME - is anything in re using this now?
: XXX - is anything in re using this now?
EXp |I32|reg_numbered_buff_length|NN REGEXP * const rx|NN const SV * const sv|const I32 paren

: FIXME - is anything in re using this now?
: XXX - is anything in re using this now?
EXp |SV*|reg_qr_package|NN REGEXP * const rx
EXpRT |I16 |do_uniprop_match|NN const char * const key|const U16 key_len
EXpRT |const char * const *|get_prop_values|const int table_index
Expand Down Expand Up @@ -2658,7 +2658,7 @@ dm |void |free_c_backtrace|NN Perl_c_backtrace* bt
Apd |SV* |get_c_backtrace_dump|int max_depth|int skip
Apd |bool |dump_c_backtrace|NN PerlIO* fp|int max_depth|int skip
#endif
: FIXME
: XXX
p |void |watch |NN char** addr
Amd |I32 |whichsig |NN const char* sig
Apd |I32 |whichsig_sv |NN SV* sigsv
Expand Down Expand Up @@ -2952,7 +2952,7 @@ pe |void |Slab_to_rw |NN OPSLAB *const slab
# endif
: Used in OpREFCNT_inc() in sv.c
poex |OP * |op_refcnt_inc |NULLOK OP *o
: FIXME - can be static.
: XXX - can be static.
poex |PADOFFSET |op_refcnt_dec |NN OP *o
#endif

Expand Down Expand Up @@ -3551,7 +3551,7 @@ S |bool |ckwarn_common |U32 w
#endif
CpoP |bool |ckwarn |U32 w
CpoP |bool |ckwarn_d |U32 w
: FIXME - exported for ByteLoader - public or private?
: XXX - exported for ByteLoader - public or private?
XEopxR |STRLEN *|new_warnings_bitfield|NULLOK STRLEN *buffer \
|NN const char *const bits|STRLEN size

Expand Down
2 changes: 1 addition & 1 deletion ext/B/B.pm
Expand Up @@ -20,7 +20,7 @@ sub import {
# walkoptree comes from B.xs

BEGIN {
$B::VERSION = '1.82';
$B::VERSION = '1.83';
@B::EXPORT_OK = ();

# Our BOOT code needs $VERSION set, and will append to @EXPORT_OK.
Expand Down
2 changes: 1 addition & 1 deletion ext/B/B.xs
Expand Up @@ -1631,7 +1631,7 @@ REGEX(sv)
if (ix)
PUSHu(RX_COMPFLAGS(sv));
else
/* FIXME - can we code this method more efficiently? */
/* XXX - can we code this method more efficiently? */
PUSHi(PTR2IV(sv));
}

Expand Down
2 changes: 1 addition & 1 deletion ext/Devel-Peek/Peek.pm
Expand Up @@ -3,7 +3,7 @@

package Devel::Peek;

$VERSION = '1.32';
$VERSION = '1.33';
$XS_VERSION = $VERSION;
$VERSION = eval $VERSION;

Expand Down
2 changes: 1 addition & 1 deletion ext/Devel-Peek/Peek.xs
Expand Up @@ -224,7 +224,7 @@ _mstats_to_hv(HV *hv, const struct mstats_buffer *b, int level)
sv_setiv(*svp, b->buffer.nbuckets);

if (_NBUCKETS < b->buffer.nbuckets)
warn("FIXME: internal mstats buffer too short");
warn("XXX: internal mstats buffer too short");

for (type = 0; type < (level ? 4 : 2); type++) {
UV *p = 0, *p1 = 0, i;
Expand Down
6 changes: 3 additions & 3 deletions ext/File-DosGlob/lib/File/DosGlob.pm
Expand Up @@ -6,7 +6,7 @@

package File::DosGlob;

our $VERSION = '1.12';
our $VERSION = '1.13';
use strict;
use warnings;

Expand Down Expand Up @@ -155,12 +155,12 @@ sub glob {
}
}
#print "Sould have "GOT" vs "Got"!\n";
#FIXME: There should be checking for this.
#XXX: There should be checking for this.
# How or what should be done about failure is beyond me.
}
if ( $#appendpat != -1
) {
#FIXME: Max loop, no way! :")
#XXX: Max loop, no way! :")
for ( @appendpat ) {
push @pat, $_;
}
Expand Down
2 changes: 1 addition & 1 deletion ext/PerlIO-encoding/encoding.pm
@@ -1,7 +1,7 @@
package PerlIO::encoding;

use strict;
our $VERSION = '0.30';
our $VERSION = '0.31';
our $DEBUG = 0;
$DEBUG and warn __PACKAGE__, " called by ", join(", ", caller), "\n";

Expand Down
2 changes: 1 addition & 1 deletion ext/PerlIO-encoding/encoding.xs
Expand Up @@ -462,7 +462,7 @@ PerlIOEncode_flush(pTHX_ PerlIO * f)
else if ((PerlIOBase(f)->flags & PERLIO_F_RDBUF)) {
/* read case */
/* if we have any untranslated stuff then unread that first */
/* FIXME - unread is fragile is there a better way ? */
/* XXX - unread is fragile is there a better way ? */
if (e->dataSV && SvCUR(e->dataSV)) {
s = SvPV(e->dataSV, len);
count = PerlIO_unread(PerlIONext(f),s,len);
Expand Down
2 changes: 1 addition & 1 deletion ext/PerlIO-via/via.pm
@@ -1,5 +1,5 @@
package PerlIO::via;
our $VERSION = '0.18';
our $VERSION = '0.19';
require XSLoader;
XSLoader::load();
1;
Expand Down
4 changes: 2 additions & 2 deletions ext/PerlIO-via/via.xs
Expand Up @@ -110,7 +110,7 @@ PerlIOVia_method(pTHX_ PerlIO * f, const char *method, CV ** save, int flags,
}
else {
PerlIO_debug("No next\n");
/* FIXME: How should this work for OPEN etc? */
/* XXX: How should this work for OPEN etc? */
}
PUTBACK;
count = call_sv((SV *) cv, flags);
Expand Down Expand Up @@ -292,7 +292,7 @@ PerlIOVia_open(pTHX_ PerlIO_funcs * self, PerlIO_list_t * layers,
f = NULL;
}
}
/* FIXME - Call an OPENED method here ? */
/* XXX - Call an OPENED method here ? */
return f;
}
else {
Expand Down
2 changes: 1 addition & 1 deletion ext/XS-Typemap/Typemap.pm
Expand Up @@ -34,7 +34,7 @@ to the test script.
use parent qw/ Exporter /;
require XSLoader;

our $VERSION = '0.18';
our $VERSION = '0.19';

our @EXPORT = (qw/
T_SV
Expand Down

0 comments on commit 1c32941

Please sign in to comment.