Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 39d69b84 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "AAPT2: Do not interpret %n as a format specifier in string resources"

parents d131f19c b9f05483

tools/aapt2/ResourceParser_test.cpp

+5 −0
Original line number Diff line number Diff line
@@ -843,4 +843,9 @@ TEST_F(ResourceParserTest, ParseElementWithNoValue) { 
  EXPECT_THAT(*str->value, Eq(""));

}



TEST_F(ResourceParserTest, ParsePlatformIndependentNewline) {

  std::string input = R"(<string name="foo">%1$s %n %2$s</string>)";

  ASSERT_TRUE(TestParse(input));

}



}  // namespace aapt

tools/aapt2/util/Util.cpp

+1 −1
Original line number Diff line number Diff line
@@ -203,7 +203,7 @@ bool VerifyJavaStringFormat(const StringPiece& str) { 
    if (*c == '%' && c + 1 < end) {

      c++;



      if (*c == '%') {

      if (*c == '%' || *c == 'n') {

        c++;

        continue;

      }