diff options
| author | Thierry Vignaud <tv@mandriva.org> | 2008-02-05 16:15:30 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mandriva.org> | 2008-02-05 16:15:30 +0000 |
| commit | 4c4518584c18382e52be10aca1e86ec8f8903453 (patch) | |
| tree | 41a8b914f4ce8233addd51b5d7271c9009afb190 | |
| parent | e4eb31a8886fc6c5412ef1c217d7886788f38044 (diff) | |
| download | drakx-4c4518584c18382e52be10aca1e86ec8f8903453.tar drakx-4c4518584c18382e52be10aca1e86ec8f8903453.tar.gz drakx-4c4518584c18382e52be10aca1e86ec8f8903453.tar.bz2 drakx-4c4518584c18382e52be10aca1e86ec8f8903453.tar.xz drakx-4c4518584c18382e52be10aca1e86ec8f8903453.zip | |
(search_dir_font) fix crashing on file names with meta characters (#36482)
| -rw-r--r-- | perl-install/NEWS | 2 | ||||
| -rwxr-xr-x | perl-install/standalone/drakfont | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS index df3024030..a6edbe430 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) - enhance the logout dialog (ok/cancel instead of yes/no) - short-circuit exit once drakbug was run on crash diff --git a/perl-install/standalone/drakfont b/perl-install/standalone/drakfont index 9ed05beec..d244f2d1b 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")); |