diff options
| author | Andy Polyakov <appro@openssl.org> | 2017-05-04 15:54:29 +0200 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2017-05-05 16:56:38 +0200 |
| commit | fc925f3bd24cfe64976c57e941eea373dee92fe1 (patch) | |
| tree | 76e2d6121cdaeaa4066a2921ccd4dc8fe3f8a951 /crypto | |
| parent | 46824b30deab8fce5466eab9ae7e0f65867c6b1e (diff) | |
perlasm/x86_64-xlate.pl: work around problem with hex constants in masm.
Perl, multiple versions, for some reason occasionally takes issue with
letter b[?] in ox([0-9a-f]+) regex. As result some constants, such as
0xb1 came out wrong when generating code for MASM. Fixes GH#3241.
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3385)
(cherry picked from commit c47aea8af1e28e46e1ad5e2e7468b49fec3f4f29)
Diffstat (limited to 'crypto')
| -rwxr-xr-x | crypto/perlasm/x86_64-xlate.pl | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/crypto/perlasm/x86_64-xlate.pl b/crypto/perlasm/x86_64-xlate.pl index 425cd292e7..6eaefcfd93 100755 --- a/crypto/perlasm/x86_64-xlate.pl +++ b/crypto/perlasm/x86_64-xlate.pl @@ -217,8 +217,9 @@ my %globals; } sprintf "\$%s",$self->{value}; } else { - $self->{value} =~ s/0x([0-9a-f]+)/0$1h/ig if ($masm); - sprintf "%s",$self->{value}; + my $value = $self->{value}; + $value =~ s/0x([0-9a-f]+)/0$1h/ig if ($masm); + sprintf "%s",$value; } } } |