wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1197280 - Use CheckedInt instead of manual comparison. r=baku,gerald

Browse Source 
This is less error-prone and somewhat easier to read.
Based on a patch from Joshua J. Drake and suggestions
from Andrea Marchesini.

NB CheckedInt<T>::value() returns a T, so the comparison with
SIZE_MAX should always succeed. Doesn't warn on clang though.
This commit is contained in:
Ralph Giles 2015-09-11 14:40:48 -07:00
parent eed73d1bdd
commit 1ab673222e
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
media/libstagefright/system/core/libutils/SharedBuffer.cpp
View File

@ -17,6 +17,7 @@
#include <stdlib.h>
#include <string.h>
#include <mozilla/CheckedInt.h>
#include <utils/SharedBuffer.h>
#include <utils/Atomic.h>
@ -26,7 +27,13 @@ namespace stagefright {
SharedBuffer* SharedBuffer::alloc(size_t size)
{
SharedBuffer* sb = static_cast<SharedBuffer *>(malloc(sizeof(SharedBuffer) + size));
mozilla::CheckedInt<size_t> allocSize = size;
allocSize += sizeof(SharedBuffer);
if (!allocSize.isValid() || allocSize.value() >= SIZE_MAX) {
return nullptr;
}
SharedBuffer* sb = static_cast<SharedBuffer*>(malloc(allocSize.value()));
if (sb) {
sb->mRefs = 1;
sb->mSize = size;
@ -60,11 +67,17 @@ SharedBuffer* SharedBuffer::editResize(size_t newSize) const
if (onlyOwner()) {
SharedBuffer* buf = const_cast<SharedBuffer*>(this);
if (buf->mSize == newSize) return buf;
buf = (SharedBuffer*)realloc(buf, sizeof(SharedBuffer) + newSize);
if (buf != NULL) {
buf->mSize = newSize;
mozilla::CheckedInt<size_t> reallocSize = newSize;
reallocSize += sizeof(SharedBuffer);
if (reallocSize.isValid() && reallocSize.value() < SIZE_MAX) {
buf = (SharedBuffer*)realloc(buf, reallocSize.value());
if (buf != nullptr) {
buf->mSize = reallocSize.value();
return buf;
}
}
// Overflow or allocation failed.
return nullptr;
}
SharedBuffer* sb = alloc(newSize);
if (sb) {