summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2008-02-05 16:18:08 +0000
committerThierry Vignaud <tv@mandriva.org>2008-02-05 16:18:08 +0000
commit07f179597961c937defd4cc67537c5821c2f406d (patch)
tree453fc396d07eeffcf25268d0718fad5b43876785
parent9b76a317a8fe974b6528f48cafaf0342a67a9453 (diff)
downloaddrakx-07f179597961c937defd4cc67537c5821c2f406d.tar
drakx-07f179597961c937defd4cc67537c5821c2f406d.tar.gz
drakx-07f179597961c937defd4cc67537c5821c2f406d.tar.bz2
drakx-07f179597961c937defd4cc67537c5821c2f406d.tar.xz
drakx-07f179597961c937defd4cc67537c5821c2f406d.zip
(search_dir_font) fix crashing on file names with meta characters (#36482)
-rw-r--r--perl-install/NEWS2
-rwxr-xr-xperl-install/standalone/drakfont4
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"));