From: Simon McVittie Date: Sat, 13 Jun 2015 19:00:08 +0000 (+0100) Subject: img: stop ImageMagick trying to be clever if filenames contain a colon X-Git-Tag: debian/3.20141016.3~17 X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/3badfb87141571c0219865360a93202048b0614c?hp=91295c8976d17f7635dea5835487720a03826584 img: stop ImageMagick trying to be clever if filenames contain a colon $im->Read() takes a filename-like argument with several sets of special syntax. Most of the possible metacharacters are escaped by the default `wiki_file_chars` (and in any case not particularly disruptive), but the colon ":" is not. It seems the way to force ImageMagick to treat colons within the filename as literal is to prepend a colon, so do that. --- diff --git a/IkiWiki/Plugin/img.pm b/IkiWiki/Plugin/img.pm index 17a58ca7a..169f5e713 100644 --- a/IkiWiki/Plugin/img.pm +++ b/IkiWiki/Plugin/img.pm @@ -76,7 +76,7 @@ sub preprocess (@) { my $im = Image::Magick->new(); my $imglink; my $imgdatalink; - my $r = $im->Read("$srcfile\[$pagenumber]"); + my $r = $im->Read(":$srcfile\[$pagenumber]"); error sprintf(gettext("failed to read %s: %s"), $file, $r) if $r; if (! defined $im->Get("width") || ! defined $im->Get("height")) { diff --git a/t/img.t b/t/img.t index 2ea3abb24..a7b92531f 100755 --- a/t/img.t +++ b/t/img.t @@ -24,6 +24,11 @@ my $SVGS_WORK = defined $magick->QueryFormat("svg"); ok(! system("rm -rf t/tmp; mkdir -p t/tmp/in")); ok(! system("cp t/img/redsquare.png t/tmp/in/redsquare.png")); +# colons in filenames are a corner case for img +ok(! system("cp t/img/redsquare.png t/tmp/in/hello:world.png")); +ok(! system("cp t/img/redsquare.png t/tmp/in/a:b:c.png")); +ok(! system("cp t/img/redsquare.png t/tmp/in/a:b:c:d.png")); +ok(! system("cp t/img/redsquare.png t/tmp/in/a:b:c:d:e:f:g:h:i:j.png")); if ($SVGS_WORK) { writefile("emptysquare.svg", "t/tmp/in", @@ -42,6 +47,9 @@ writefile("imgconversions.mdwn", "t/tmp/in", <new(); - my $r = $im->Read($filename); + my $r = $im->Read(":$filename"); return "no image" if $r; my $w = $im->Get("width"); my $h = $im->Get("height"); @@ -78,6 +86,10 @@ if ($SVGS_WORK) { is(size("$outpath/12x-twopages.png"), "12x12"); is(size("$outpath/16x-p1-twopages.png"), "16x2"); +ok($outhtml =~ /width="8" height="8".*expecting 8x8/); +is(size("$outpath/x8-hello:world.png"), "8x8"); +is(size("$outpath/x4-a:b:c.png"), "4x4"); +is(size("$outpath/x6-a:b:c:d:e:f:g:h:i:j.png"), "6x6"); # now let's remove them again @@ -90,6 +102,9 @@ if (1) { # for easier testing ok(! -e "$outpath/10x-simple-svg.png"); ok(! -e "$outpath/10x-simple-pdf.png"); ok(! -e "$outpath/10x-p1-simple-pdf.png"); + ok(! -e "$outpath/x8-hello:world.png"); + ok(! -e "$outpath/x4-a:b:c.png"); + ok(! -e "$outpath/x6-a:b:c:d:e:f:g:h:i:j.png"); # cleanup ok(! system("rm -rf t/tmp"));