1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qalloc: keep the original capacity if realloc() fails

Browse Source 
As a drive-by, fix the copyright headers.

Amends 03d5daf9437d8b46db2e89e3a9763ea701fa681c.

Change-Id: Ie27ecb62097e9bcb33cc0ceb10c97743bce0b0e0
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Aurélien Brooke 2025-04-10 10:04:56 +02:00
parent 39358791f0
commit d0df02ad8a
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/corelib/global/qalloc.cpp
View File

@ -1,4 +1,4 @@
// Copyright (C) 2025 The Qt Company Ltd.
// Copyright (C) 2025 Aurélien Brooke <aurelien@bahiasoft.fr>
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
#include "qalloc.h"

15
src/corelib/global/qalloc.h
View File

@ -1,4 +1,4 @@
// Copyright (C) 2025 The Qt Company Ltd.
// Copyright (C) 2025 Aurélien Brooke <aurelien@bahiasoft.fr>
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
#ifndef QALLOC_H
@ -99,12 +99,17 @@ inline void *fittedMalloc(size_t headerSize, qsizetype *capacity,
inline void *fittedRealloc(void *ptr, size_t headerSize, size_t *capacity,
size_t elementSize, size_t unusedCapacity) noexcept
{
size_t allocSize = fittedAllocSize(headerSize, capacity,
size_t newCapacity = *capacity;
size_t allocSize = fittedAllocSize(headerSize, &newCapacity,
elementSize, unusedCapacity, alignof(std::max_align_t));
if (Q_LIKELY(allocSize != 0))
return realloc(ptr, allocSize);
else
if (Q_LIKELY(allocSize != 0)) {
void *newPtr = realloc(ptr, allocSize);
if (newPtr)
*capacity = newCapacity;
return newPtr;
} else {
return nullptr;
}
}
inline void *fittedRealloc(void *ptr, size_t headerSize, qsizetype *capacity,
size_t elementSize, size_t unusedCapacity = 0) noexcept