am fde92eb0: Update maxNumber to be smaller.

* commit 'fde92eb0ffcc37106d5fe85bf1f1ba30d8639d17':
  Update maxNumber to be smaller.
This commit is contained in:
Michael Lentine 2015-02-19 00:10:11 +00:00 committed by Android Git Automerger
commit 2758eb2e67

View File

@ -250,7 +250,11 @@ status_t GraphicBuffer::unflatten(void const* buffer, size_t size,
const size_t numFds = buf[6]; const size_t numFds = buf[6];
const size_t numInts = buf[7]; const size_t numInts = buf[7];
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;