From 07f179597961c937defd4cc67537c5821c2f406d Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Tue, 5 Feb 2008 16:18:08 +0000 Subject: (search_dir_font) fix crashing on file names with meta characters (#36482) --- perl-install/NEWS | 2 ++ perl-install/standalone/drakfont | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/perl-install/NEWS b/perl-install/NEWS index f5d5e107d..7cab57e6d 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,6 +1,8 @@ - bootloader-config: o never use "vmlinuz-desktop" or "initrd-desktop.img", always use "vmlinuz" or "initrd.img" (#35721) +- drakfont: + o fix crashing on file names with meta characters (#36482) Version 10.4.239.3 - 05 February 2008, by Thierry Vignaud diff --git a/perl-install/standalone/drakfont b/perl-install/standalone/drakfont index cce577201..887039da7 100755 --- a/perl-install/standalone/drakfont +++ b/perl-install/standalone/drakfont @@ -255,8 +255,8 @@ sub search_dir_font() { } } elsif (is_a_font($fn)) { - !$replace && any { /$fn/ } @installed_fonts and next; - !any { /$fn/ } @installed_fonts and push @font_list, $fn; + !$replace && any { /\Q$fn\E/ } @installed_fonts and next; + !any { /\Q$fn\E/ } @installed_fonts and push @font_list, $fn; } } interactive_progress($pbar, 0.50 / @install, N("Reselect correct fonts")); -- cgit v1.2.1