am e86f7e96: am 3c0272ba: am dc2d031a: am da9fd70d: am 2758eb2e: am fde92eb0: Update maxNumber to be smaller.

* commit 'e86f7e96a75a7bf7bfa85d52cd9f2145fe25878c':
  Update maxNumber to be smaller.
This commit is contained in:
Michael Lentine 2015-02-19 01:00:47 +00:00 committed by Android Git Automerger
commit 592cc33c40

View File

@ -310,7 +310,11 @@ status_t GraphicBuffer::unflatten(
const size_t numFds = buf[8]; const size_t numFds = buf[8];
const size_t numInts = buf[9]; const size_t numInts = buf[9];
const size_t maxNumber = UINT_MAX / sizeof(int); // Limit the maxNumber to be relatively small. The number of fds or ints
// should not come close to this number, and the number itself was simply
// chosen to be high enough to not cause issues and low enough to prevent
// overflow problems.
const size_t maxNumber = 4096;
if (numFds >= maxNumber || numInts >= (maxNumber - 10)) { if (numFds >= maxNumber || numInts >= (maxNumber - 10)) {
width = height = stride = format = usage = 0; width = height = stride = format = usage = 0;
handle = NULL; handle = NULL;