• Grant Likely's avatar
    dtc: ensure #line directives don't consume data from the next line · 706b78f3
    Grant Likely authored
    Previously, the #line parsing regex ended with ({WS}+[0-9]+)?. The {WS}
    could match line-break characters. If the #line directive did not contain
    the optional flags field at the end, this could cause any integer data on
    the next line to be consumed as part of the #line directive parsing. This
    could cause syntax errors (i.e. #line parsing consuming the leading 0
    from a hex literal 0x1234, leaving x1234 to be parsed as cell data,
    which is a syntax error), or invalid compilation results (i.e. simply
    consuming literal 1234 as part of the #line processing, thus removing it
    from the cell data).
    
    Fix this by replacing {WS} with [ \t] so that it can't match line-breaks.
    
    Convert all instances of {WS}, even though the other instances should be
    irrelevant for any well-formed #line directive. This is done for
    consistency and ultimate safety.
    
    [Cherry picked from DTC commit a1ee6f068e1c8dbc62873645037a353d7852d5cc]
    Reported-by: default avatarIan Campbell <Ian.Campbell@citrix.com>
    Signed-off-by: default avatarStephen Warren <swarren@nvidia.com>
    Acked-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
    Signed-off-by: default avatarGrant Likely <grant.likely@secretlab.ca>
    706b78f3
dtc-lexer.l 5.44 KB