development/ghidra
development/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra synced 2024-10-03 00:44:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch

Browse source 
'origin/GP-3541_emteere_FixPragmaCommaParse' into patch (Closes #5427)
This commit is contained in:
Ryan Kurtz 2023-06-12 17:24:40 -04:00
parent f7cdef1d56 6d428e0dc9
commit 7115d1187a
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Ghidra/Features/Base/src/main/javacc/ghidra/app/util/cparser/C/C.jj
View file

@ -1922,7 +1922,7 @@ void PragmaSpecifier() : {
{
LOOKAHEAD(3)
<POPEN> PragmaSpecifier() <PCLOSE> |
id=<PIDENTIFIER> (<PIDENTIFIER> | <PINTEGER_LITERAL> | <PSTRING_LITERAL>)*
id=<PIDENTIFIER> (<PIDENTIFIER> | <PINTEGER_LITERAL> | <PSTRING_LITERAL> | <PCOMMA> )*
([ <POPEN> [ (ds1=PragmaConstant())+ [ ( <PCOMMA> ds2=PragmaConstant() ) [ ( <PCOMMA> ds3=PragmaConstant() ) [ ( <PCOMMA> PragmaConstant() )+ ] ] ] ] <PCLOSE> ] )
{
if (id.image.equals("pack") && ds1 != null) {

3
Ghidra/Features/Base/src/test/resources/ghidra/app/util/cparser/CParserTest.h
View file

@ -176,6 +176,9 @@ int (__stdcall * GetSectionBlock) (
#pragma region Input compatibility macros
// nothing will parse after this line if the this fails
#pragma test for, pragma, with, commas outside parens
#pragma warning(disable)
#pragma warning(disable:4035 4793) // re-enable below