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

Commit ae5be38e authored by Jason Sams's avatar Jason Sams
Browse files

Fix potential npe 

bug 19805515

Change-Id: Id36b145d3ce1c81311e88f5cdd2441880e98f737
parent 5fc9b336

rs/java/android/renderscript/Mesh.java

+6 −0
Original line number Diff line number Diff line
@@ -363,6 +363,9 @@ public class Mesh extends BaseObj { 
                    alloc = Allocation.createTyped(mRS, entry.t, mUsage);

                } else if(entry.e != null) {

                    alloc = Allocation.createSized(mRS, entry.e, entry.size, mUsage);

                } else {

                    // Should never happen because the builder will always set one

                    throw new IllegalStateException("Builder corrupt, no valid element in entry.");

                }

                vertexBuffers[ct] = alloc;

                vtx[ct] = alloc.getID(mRS);
@@ -375,6 +378,9 @@ public class Mesh extends BaseObj { 
                    alloc = Allocation.createTyped(mRS, entry.t, mUsage);

                } else if(entry.e != null) {

                    alloc = Allocation.createSized(mRS, entry.e, entry.size, mUsage);

                } else {

                    // Should never happen because the builder will always set one

                    throw new IllegalStateException("Builder corrupt, no valid element in entry.");

                }

                long allocID = (alloc == null) ? 0 : alloc.getID(mRS);

                indexBuffers[ct] = alloc;