Skip to content

Module-Metadata: Fix UTF-8 BOM detection for non-ASCII #37

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Module-Metadata: Fix UTF-8 BOM detection for non-ASCII #37

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 23 additions & 3 deletions lib/Module/Metadata.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -493,6 +493,26 @@ sub _parse_version_expression {
return ( $sigil, $variable_name, $package );
}

my $UTF8_BOM;
my $UTF8_BOM_BYTES_1_2;
my $UTF8_BOM_BYTES_TRAILER;
my $UTF8_BOM_BYTES_TRAILER_LENGTH;
BEGIN {
if ( "$]" >= 5.008 ) {

# Works on EBCDIC too
$UTF8_BOM = "\x{FEFF}";
utf8::encode($UTF8_BOM);
}
else {
$UTF8_BOM = "\x{EF}\x{BB}\x{BF}";
}

$UTF8_BOM_BYTES_1_2 = substr($UTF8_BOM, 0, 2);
$UTF8_BOM_BYTES_TRAILER = substr($UTF8_BOM, 2);
$UTF8_BOM_BYTES_TRAILER_LENGTH = length $UTF8_BOM_BYTES_TRAILER;
}

# Look for a UTF-8/UTF-16BE/UTF-16LE BOM at the beginning of the stream.
# If there's one, then skip it and set the :encoding layer appropriately.
sub _handle_bom {
Expand All @@ -512,10 +532,10 @@ sub _handle_bom {
elsif ( $buf eq "\x{FF}\x{FE}" ) {
$encoding = 'UTF-16LE';
}
elsif ( $buf eq "\x{EF}\x{BB}" ) {
$buf = ' ';
elsif ( $buf eq $UTF8_BOM_BYTES_1_2 ) {
$buf = ' ' x $UTF8_BOM_BYTES_TRAILER_LENGTH;
$count = read $fh, $buf, length $buf;
if ( defined $count and $count >= 1 and $buf eq "\x{BF}" ) {
if ( defined $count and $count >= 1 and $buf eq $UTF8_BOM_BYTES_TRAILER ) {
$encoding = 'UTF-8';
}
}
Expand Down