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

Commit 2ddce322 authored by Vladimir Marko's avatar Vladimir Marko
Browse files

Handle missing and invalid numeric values in XmlUtils. 

Convert these errors to XmlPullParserException.

Bug: 8584433
Change-Id: I070ed517682e7f047ec00271db26110da2bebb09
parent 94fed1c5

core/java/com/android/internal/util/XmlUtils.java

+27 −10
Original line number Diff line number Diff line
@@ -800,16 +800,8 @@ public class XmlUtils 
            }

            throw new XmlPullParserException(

                "Unexpected end of document in <string>");

        } else if (tagName.equals("int")) {

            res = Integer.parseInt(parser.getAttributeValue(null, "value"));

        } else if (tagName.equals("long")) {

            res = Long.valueOf(parser.getAttributeValue(null, "value"));

        } else if (tagName.equals("float")) {

            res = new Float(parser.getAttributeValue(null, "value"));

        } else if (tagName.equals("double")) {

            res = new Double(parser.getAttributeValue(null, "value"));

        } else if (tagName.equals("boolean")) {

            res = Boolean.valueOf(parser.getAttributeValue(null, "value"));

        } else if ((res = readThisPrimitiveValueXml(parser, tagName)) != null) {

            // all work already done by readThisPrimitiveValueXml

        } else if (tagName.equals("int-array")) {

            parser.next();

            res = readThisIntArrayXml(parser, "int-array", name);
@@ -862,6 +854,31 @@ public class XmlUtils 
            "Unexpected end of document in <" + tagName + ">");

    }



    private static final Object readThisPrimitiveValueXml(XmlPullParser parser, String tagName)

    throws XmlPullParserException, java.io.IOException

    {

        try {

            if (tagName.equals("int")) {

                return Integer.parseInt(parser.getAttributeValue(null, "value"));

            } else if (tagName.equals("long")) {

                return Long.valueOf(parser.getAttributeValue(null, "value"));

            } else if (tagName.equals("float")) {

                return new Float(parser.getAttributeValue(null, "value"));

            } else if (tagName.equals("double")) {

                return new Double(parser.getAttributeValue(null, "value"));

            } else if (tagName.equals("boolean")) {

                return Boolean.valueOf(parser.getAttributeValue(null, "value"));

            } else {

                return null;

            }

        } catch (NullPointerException e) {

            throw new XmlPullParserException("Need value attribute in <" + tagName + ">");

        } catch (NumberFormatException e) {

            throw new XmlPullParserException(

                    "Not a number in value attribute in <" + tagName + ">");

        }

    }



    public static final void beginDocument(XmlPullParser parser, String firstElementName) throws XmlPullParserException, IOException

    {

        int type;