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

Commit e40974d9 authored by Dan Albert's avatar Dan Albert Committed by Gerrit Code Review
Browse files

Merge "Fix an overflow found by ASAN."

parents 09fd5a18 d395f791

tools/aapt/Resource.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -553,7 +553,7 @@ static int validateAttr(const String8& path, const ResTable& table, 
                    String8(parser.getElementName(&len)).string(), attr);

                    String8(parser.getElementName(&len)).string(), attr);

            return ATTR_LEADING_SPACES;

            return ATTR_LEADING_SPACES;

        }

        }

        if (str[len-1] == ' ') {

        if (len != 0 && str[len-1] == ' ') {

            fprintf(stderr, "%s:%d: Tag <%s> attribute %s can not end with a space.\n",

            fprintf(stderr, "%s:%d: Tag <%s> attribute %s can not end with a space.\n",

                    path.string(), parser.getLineNumber(),

                    path.string(), parser.getLineNumber(),

                    String8(parser.getElementName(&len)).string(), attr);

                    String8(parser.getElementName(&len)).string(), attr);