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

Prevent copy in texture upload with invalid input

Browse Source 
Skip the memcpy when src is null.

Also silences a Codechecker warning.

Pick-to: 6.0
Change-Id: I5042d725000cb6dff6864408fa9ed9e0ca35145a
Reviewed-by: Christian Strømme <christian.stromme@qt.io>
This commit is contained in:
Laszlo Agocs 2020-12-14 14:24:00 +01:00
parent 494da40f29
commit 796de4f066
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/gui/rhi/qrhivulkan.cpp
View File

@ -2923,8 +2923,10 @@ void QRhiVulkan::prepareUploadSubres(QVkTexture *texD, int layer, int level,
qWarning("Invalid texture upload for %p layer=%d mip=%d", texD, layer, level); qWarning("Invalid texture upload for %p layer=%d mip=%d", texD, layer, level);
} }
memcpy(reinterpret_cast<char *>(mp) + *curOfs, src, size_t(copySizeBytes)); if (src) {
*curOfs += aligned(VkDeviceSize(imageSizeBytes), texbufAlign); memcpy(reinterpret_cast<char *>(mp) + *curOfs, src, size_t(copySizeBytes));
*curOfs += aligned(VkDeviceSize(imageSizeBytes), texbufAlign);
}
} }
void QRhiVulkan::enqueueResourceUpdates(QVkCommandBuffer *cbD, QRhiResourceUpdateBatch *resourceUpdates) void QRhiVulkan::enqueueResourceUpdates(QVkCommandBuffer *cbD, QRhiResourceUpdateBatch *resourceUpdates)