Skip to content

fix(pl): /proc/mounts octal escapes + Encode compat for Perl 5.8 #40

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

Merged
Neo23x0 merged 1 commit into from
Mar 18, 2026
Merged

fix(pl): /proc/mounts octal escapes + Encode compat for Perl 5.8 #40

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
7 changes: 6 additions & 1 deletion scripts/thunderstorm-collector.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,9 @@ sub get_excluded_mounts {
my @parts = split(/\s+/, $line);
if (scalar @parts >= 3) {
my ($mount_point, $fs_type) = ($parts[1], $parts[2]);
# Decode octal escapes (\040 = space, \011 = tab, etc.)
# /proc/mounts encodes spaces and special chars as \NNN
$mount_point =~ s/\\([0-7]{3})/chr(oct($1))/ge;
if ($networkFsTypes{$fs_type} || $specialFsTypes{$fs_type}) {
push @excluded, $mount_point;
}
Expand Down Expand Up @@ -436,7 +439,9 @@ sub submitSample {
if ($] >= 5.008) {
require Encode;
# Decode byte string as UTF-8, replacing invalid sequences
$safe_path = Encode::decode('UTF-8', $safe_path, Encode::FB_DEFAULT());
# FB_DEFAULT (0x0001) was introduced in Encode 2.53 (Perl 5.14);
# use the numeric value directly for Perl 5.8-5.12 compatibility
$safe_path = Encode::decode('UTF-8', $safe_path, 0x0001);
$safe_path = Encode::encode('UTF-8', $safe_path);
}
# Remove control characters except tab
Expand Down
Loading