[PATCH] checkpatch: Fix unescaped left brace

[PATCH] checkpatch: Fix unescaped left brace

[Dwaipayan Ray]

There is an unescaped left brace in a regex in OPEN_BRACE
check. This throws a runtime error when checkpatch is run
with --fix flag and the OPEN_BRACE check is executed.

Fix it by escaping the left brace.

Fixes: 8d1824780f2f ("checkpatch: add --fix option for a couple OPEN_BRACE misuses")
Signed-off-by: Dwaipayan Ray <dwaipayanray1@gmail.com>
---
 scripts/checkpatch.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 2749f32dffe9..0da6422cd0fd 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -4505,7 +4505,7 @@ sub process {
 			    $fix) {
 				fix_delete_line($fixlinenr, $rawline);
 				my $fixed_line = $rawline;
-				$fixed_line =~ /(^..*$Type\s*$Ident\(.*\)\s*){(.*)$/;
+				$fixed_line =~ /(^..*$Type\s*$Ident\(.*\)\s*)\{(.*)$/;
 				my $line1 = $1;
 				my $line2 = $2;
 				fix_insert_line($fixlinenr, ltrim($line1));
-- 
2.27.0

Re: [PATCH] checkpatch: Fix unescaped left brace

[Joe Perches]

On Mon, 2020-11-16 at 01:59 +0530, Dwaipayan Ray wrote:
> There is an unescaped left brace in a regex in OPEN_BRACE
> check. This throws a runtime error when checkpatch is run
> with --fix flag and the OPEN_BRACE check is executed.
> 
> Fix it by escaping the left brace.
> 
> Fixes: 8d1824780f2f ("checkpatch: add --fix option for a couple OPEN_BRACE misuses")
> Signed-off-by: Dwaipayan Ray <dwaipayanray1@gmail.com>

Thanks Dwaipayan.

Obviously that code path hasn't been tested in awhile.

I think the notice to require an escape for a { was added back in
perl 5.16 or so.

Acked-by: Joe Perches <joe@perches.com>

> ---
>  scripts/checkpatch.pl | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
> index 2749f32dffe9..0da6422cd0fd 100755
> --- a/scripts/checkpatch.pl
> +++ b/scripts/checkpatch.pl
> @@ -4505,7 +4505,7 @@ sub process {
>  			    $fix) {
>  				fix_delete_line($fixlinenr, $rawline);
>  				my $fixed_line = $rawline;
> -				$fixed_line =~ /(^..*$Type\s*$Ident\(.*\)\s*){(.*)$/;
> +				$fixed_line =~ /(^..*$Type\s*$Ident\(.*\)\s*)\{(.*)$/;
>  				my $line1 = $1;
>  				my $line2 = $2;
>  				fix_insert_line($fixlinenr, ltrim($line1));

Re: [PATCH] checkpatch: Fix unescaped left brace

[Joe Perches]

On Sun, 2020-11-15 at 19:43 -0800, Joe Perches wrote:
> On Mon, 2020-11-16 at 01:59 +0530, Dwaipayan Ray wrote:
> > There is an unescaped left brace in a regex in OPEN_BRACE
> > check. This throws a runtime error when checkpatch is run
> > with --fix flag and the OPEN_BRACE check is executed.
> > 
> > Fix it by escaping the left brace.
> > 
> > Fixes: 8d1824780f2f ("checkpatch: add --fix option for a couple OPEN_BRACE misuses")
> > Signed-off-by: Dwaipayan Ray <dwaipayanray1@gmail.com>
> 
> Thanks Dwaipayan.
> 
> Obviously that code path hasn't been tested in awhile.
> 
> I think the notice to require an escape for a { was added back in
> perl 5.16 or so.

Just fyi:  it seems the requirement was actually implemented in perl 5.22
and this code predates the release of perl 5.22

https://github.com/Perl/perl5/blob/blead/pod/perl5220delta.pod

Re: [PATCH] checkpatch: Fix unescaped left brace

[Dwaipayan Ray]

On Tue, Nov 17, 2020 at 4:32 AM Joe Perches <joe@perches.com> wrote:
>
> On Sun, 2020-11-15 at 19:43 -0800, Joe Perches wrote:
> > On Mon, 2020-11-16 at 01:59 +0530, Dwaipayan Ray wrote:
> > > There is an unescaped left brace in a regex in OPEN_BRACE
> > > check. This throws a runtime error when checkpatch is run
> > > with --fix flag and the OPEN_BRACE check is executed.
> > >
> > > Fix it by escaping the left brace.
> > >
> > > Fixes: 8d1824780f2f ("checkpatch: add --fix option for a couple OPEN_BRACE misuses")
> > > Signed-off-by: Dwaipayan Ray <dwaipayanray1@gmail.com>
> >
> > Thanks Dwaipayan.
> >
> > Obviously that code path hasn't been tested in awhile.
> >
> > I think the notice to require an escape for a { was added back in
> > perl 5.16 or so.
>
> Just fyi:  it seems the requirement was actually implemented in perl 5.22
> and this code predates the release of perl 5.22
>
> https://github.com/Perl/perl5/blob/blead/pod/perl5220delta.pod
>
That's pretty interesting. Apart from that I have seen that
the perl_version_ok check mandates perl 5.10 which was
released more than 10 years back.

Do you think that check could be removed completely?
Maybe sometime in the future or just have it lay around
for backward compatibility?

Thanks,
Dwaipayan.

Re: [PATCH] checkpatch: Fix unescaped left brace

[Joe Perches]

On Tue, 2020-11-17 at 14:37 +0530, Dwaipayan Ray wrote:
> I have seen that
> the perl_version_ok check mandates perl 5.10 which was
> released more than 10 years back.
> 
> Do you think that check could be removed completely?
> Maybe sometime in the future or just have it lay around
> for backward compatibility?

I think having the check in the code isn't burdensome.