Skip to content

use size_t for image plane allocation in alloc_image #635

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

Merged
solidpixel merged 2 commits into from
Jun 3, 2026
Merged

use size_t for image plane allocation in alloc_image #635

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b1fb472
use size_t for image plane allocation in alloc_image
sahvx655-wq Jun 3, 2026
39e552b
Hoist plane count calculation
solidpixel Jun 3, 2026
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
12 changes: 8 additions & 4 deletions Source/astcenccli_image.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: Apache-2.0
// ----------------------------------------------------------------------------
// Copyright 2011-2022 Arm Limited
// Copyright 2011-2026 Arm Limited
//
// Licensed under the Apache License, Version 2.0 (the "License"); you may not
// use this file except in compliance with the License. You may obtain a copy
Expand Down Expand Up @@ -41,6 +41,10 @@ astcenc_image_ptr alloc_image(
img->data_type = ASTCENC_TYPE_U8;
img->data = nullptr;

// Ensure this is done as a size_t to avoid overflow - calling code has
// checked that the product will fit in a size_t without overflowing.
size_t plane_components = static_cast<size_t>(dim_x) * dim_y * 4;

void** data = new void*[dim_z] {};
img->data = data;

Expand All @@ -49,15 +53,15 @@ astcenc_image_ptr alloc_image(
img->data_type = ASTCENC_TYPE_U8;
for (unsigned int z = 0; z < dim_z; z++)
{
data[z] = new uint8_t[dim_x * dim_y * 4];
data[z] = new uint8_t[plane_components];
}
}
else if (bitness == 16)
{
img->data_type = ASTCENC_TYPE_F16;
for (unsigned int z = 0; z < dim_z; z++)
{
data[z] = new uint16_t[dim_x * dim_y * 4];
data[z] = new uint16_t[plane_components];
}
}
else // if (bitness == 32)
Expand All @@ -66,7 +70,7 @@ astcenc_image_ptr alloc_image(
img->data_type = ASTCENC_TYPE_F32;
for (unsigned int z = 0; z < dim_z; z++)
{
data[z] = new float[dim_x * dim_y * 4];
data[z] = new float[plane_components];
}
}

Expand Down
Loading