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

Commit dc92d925 authored by Hyunyoung Song's avatar Hyunyoung Song
Browse files

Wrap StackOverflowError in NotFoundException. 

Bug: 67462465
Test: builds and tested using faulty apk with recursive drawable.
Change-Id: I47691343dae892beb5ed8c1c66c33edefade321e
parent 6a8f4826

core/java/android/content/res/ResourcesImpl.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -796,7 +796,7 @@ public class ResourcesImpl { 
                dr = Drawable.createFromResourceStream(wrapper, value, is, file, null);

                dr = Drawable.createFromResourceStream(wrapper, value, is, file, null);

                is.close();

                is.close();

            }

            }

        } catch (Exception e) {

        } catch (Exception | StackOverflowError e) {

            Trace.traceEnd(Trace.TRACE_TAG_RESOURCES);

            Trace.traceEnd(Trace.TRACE_TAG_RESOURCES);

            final NotFoundException rnf = new NotFoundException(

            final NotFoundException rnf = new NotFoundException(

                    "File " + file + " from drawable resource ID #0x" + Integer.toHexString(id));

                    "File " + file + " from drawable resource ID #0x" + Integer.toHexString(id));