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

Commit 12da9d74 authored by Kenny Root's avatar Kenny Root
Browse files

Fix buffer compacting in NativeDaemonConnector 

The buffer was being compacted in the read loop, but the start offset on
the compacted buffer wasn't being considered after the next read.

Bug: 2501075
Change-Id: I163297d751cf800d0bbc66df66b1a0fa0785de49
parent b355714a

services/java/com/android/server/NativeDaemonConnector.java

+7 −0
Original line number Diff line number Diff line
@@ -109,6 +109,10 @@ final class NativeDaemonConnector implements Runnable { 
                int count = inputStream.read(buffer, start, BUFFER_SIZE - start);

                if (count < 0) break;



                // Add our starting point to the count and reset the start.

                count += start;

                start = 0;



                for (int i = 0; i < count; i++) {

                    if (buffer[i] == 0) {

                        String event = new String(buffer, start, i - start);
@@ -140,6 +144,9 @@ final class NativeDaemonConnector implements Runnable { 
                        start = i + 1;

                    }

                }



                // We should end at the amount we read. If not, compact then

                // buffer and read again.

                if (start != count) {

                    final int remaining = BUFFER_SIZE - start;

                    System.arraycopy(buffer, start, buffer, 0, remaining);