Skip to content

Fixed: UBSAN null pointer in memcpy/memmove with zero length #8848

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dand-oss wants to merge 1 commit into
base: master
Choose a base branch
from
+13 −6
Open

Fixed: UBSAN null pointer in memcpy/memmove with zero length #8848

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 13 additions & 6 deletions src/common/classes/array.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,8 @@ class Array : protected Storage
void copyFrom(const Array<T, Storage>& source)
{
ensureCapacity(source.count, false);
memcpy(static_cast<void*>(data), source.data, sizeof(T) * source.count);
if (source.count)
memcpy(static_cast<void*>(data), source.data, sizeof(T) * source.count);
count = source.count;
}

Expand Down Expand Up @@ -244,17 +245,21 @@ class Array : protected Storage
fb_assert(index <= count);
fb_assert(count < FB_MAX_SIZEOF);
ensureCapacity(count + 1);
memmove(static_cast<void*>(data + index + 1), data + index, sizeof(T) * (count++ - index));
if (count - index)
memmove(static_cast<void*>(data + index + 1), data + index, sizeof(T) * (count - index));
data[index] = item;
++count;
}

void insert(const size_type index, const Array<T, Storage>& items)
{
fb_assert(index <= count);
fb_assert(count <= FB_MAX_SIZEOF - items.count);
ensureCapacity(count + items.count);
memmove(static_cast<void*>(data + index + items.count), data + index, sizeof(T) * (count - index));
memcpy(static_cast<void*>(data + index), items.data, items.count);
if (count - index)
memmove(static_cast<void*>(data + index + items.count), data + index, sizeof(T) * (count - index));
if (items.count)
memcpy(static_cast<void*>(data + index), items.data, sizeof(T) * items.count);
count += items.count;
}

Expand All @@ -263,8 +268,10 @@ class Array : protected Storage
fb_assert(index <= count);
fb_assert(count <= FB_MAX_SIZEOF - itemsCount);
ensureCapacity(count + itemsCount);
memmove(static_cast<void*>(data + index + itemsCount), data + index, sizeof(T) * (count - index));
memcpy(static_cast<void*>(data + index), items, sizeof(T) * itemsCount);
if (count - index)
memmove(static_cast<void*>(data + index + itemsCount), data + index, sizeof(T) * (count - index));
if (itemsCount)
memcpy(static_cast<void*>(data + index), items, sizeof(T) * itemsCount);
count += itemsCount;
}

Expand Down