From b068a9b914887af5cc99895754412582fbb0e10b Mon Sep 17 00:00:00 2001 From: Andy Polyakov Date: Mon, 2 Jul 2018 13:12:49 +0200 Subject: [PATCH] perlasm/x86_64-xlate.pl: refine symbol recognition in .xdata. Hexadecimals were erroneously recognized as symbols in .xdata. Reviewed-by: Rich Salz (Merged from https://github.com/openssl/openssl/pull/6626) --- crypto/perlasm/x86_64-xlate.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crypto/perlasm/x86_64-xlate.pl b/crypto/perlasm/x86_64-xlate.pl index eac21c1c69..0bde5ee77c 100755 --- a/crypto/perlasm/x86_64-xlate.pl +++ b/crypto/perlasm/x86_64-xlate.pl @@ -877,7 +877,7 @@ my %globals; $var=~s/^(0b[0-1]+)/oct($1)/eig; $var=~s/^0x([0-9a-f]+)/0$1h/ig if ($masm); if ($sz eq "D" && ($current_segment=~/.[px]data/ || $dir eq ".rva")) - { $var=~s/([_a-z\$\@][_a-z0-9\$\@]*)/$nasm?"$1 wrt ..imagebase":"imagerel $1"/egi; } + { $var=~s/^([_a-z\$\@][_a-z0-9\$\@]*)/$nasm?"$1 wrt ..imagebase":"imagerel $1"/egi; } $var; };