Attachment 882662 Details for Bug 1084399 – Proposed fix

[patch] Proposed fix

0001-Emit-I-argument-for-perl-test-by-t-TEST.patch (text/plain), 1.83 KB, created by Petr Pisar on 2014-04-04 11:37:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Petr Pisar

Created: 2014-04-04 11:37:04 UTC

Size: 1.83 KB

patch

obsolete

>From f08b237ec5ed3d79fb88487c1585e6ab310cb19c Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
>Date: Fri, 4 Apr 2014 12:59:27 +0200
>Subject: [PATCH] Emit -I argument for perl test by t/TEST
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>This patch makes command line for tests of type "perl" to contain perl "-I"
>argument. Othwerwise the tests will load modules from system instead
>of build directory.
>
>The malicious behavior was:
>
>$ LD_PRELOAD=../libperl.so strace -fq -eopen,execve ./perl harness comp/parser.t 2>&1 |grep '"/usr/lib64/perl5/'
>[pid 13545] open("/usr/lib64/perl5/re.pm", O_RDONLY) = 5
>[pid 13545] open("/usr/lib64/perl5/auto/re/re.so", O_RDONLY|O_CLOEXEC) = 5
>
>This is caused by a bug in t/TEST where _cmd() function forgets to
>emit "-I" argument if requested. The _cmd() is called with:
>
>$VAR1 = {
>          'return_dir' => undef,
>          'testswitch' => '',
>          'perl' => './perl',
>          'file' => '',
>          'utf8' => '',
>          'lib' => '../lib',
>          'run_dir' => undef,
>          'switch' => '',
>          'test' => 'comp/parser.t'
>        };
>$VAR2 = 'perl';
>
>but it returns:
>
>$VAR1 = './perl comp/parser.t ';
>
>while it should return:
>
>$VAR1 = './perl -I../lib comp/parser.t ';
>
>Signed-off-by: Petr PÃsaÅ <ppisar@redhat.com>
>---
> t/TEST | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
>diff --git a/t/TEST b/t/TEST
>index 96eb6a4..1539f16 100755
>--- a/t/TEST
>+++ b/t/TEST
>@@ -297,7 +297,8 @@ sub _cmd {
>         }
> 
>         my $args = "$options->{testswitch} $options->{switch} $options->{utf8}";
>-        $cmd = $perl . _quote_args($args) . " $test $redir";
>+        my $lib = ($options->{lib} eq '') ? '' : " -I$options->{lib}";
>+        $cmd = $perl . $lib . _quote_args($args) . " $test $redir";
>     }
>     return $cmd;
> }
>-- 
>1.9.0
>

Actions: View | Diff

Attachments on bug 1084399: 882662 | 882684