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

Commit f11cc165 authored by Calin Juravle's avatar Calin Juravle Committed by Gerrit Code Review
Browse files

Merge "Fixed a possible infinite loop in JsonReader#skipValue()"

parents 60097a9c 8fbcc6b4

core/java/android/util/JsonReader.java

+3 −0
Original line number Original line Diff line number Diff line
@@ -546,6 +546,9 @@ public final class JsonReader implements Closeable { 
    public void skipValue() throws IOException {

    public void skipValue() throws IOException {

        skipping = true;

        skipping = true;

        try {

        try {

            if (!hasNext() || peek() == JsonToken.END_DOCUMENT) {

                throw new IllegalStateException("No element left to skip");

            }

            int count = 0;

            int count = 0;

            do {

            do {

                JsonToken token = advance();

                JsonToken token = advance();