Skip to content

Address issues with debug allocator, and utf-8 escape sequences #367

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
nirosys merged 2 commits into from
Nov 7, 2025
Merged

Address issues with debug allocator, and utf-8 escape sequences #367

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
43e9a06
Address identified issues with debug allocator, and utf-8 escape sequ…
nirosys Nov 6, 2025
8ad8e88
Install libasan and libubsan for amazon linux
nirosys Nov 7, 2025
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
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
# Amazon Linux needs a newer version of git installed for actions/checkout
- name: Install Dependencies
run: |
yum install which git make cmake3 -y
yum install which git make cmake3 libasan libubsan -y
if [ ! -e '/usr/bin/cmake' ]; then ln -s "$(which cmake3)" /usr/bin/cmake; fi
- name: Install ${{ matrix.compiler.cc }}
run: yum install ${{ matrix.compiler.packages }} -y
Expand Down
11 changes: 10 additions & 1 deletion ionc/ion_allocation.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,10 +228,19 @@ SIZE debug_pattern_size = sizeof(debug_pattern);
void *debug_malloc(SIZE size, const char *file, int line)
{
BYTE *ptr, *psize, *head, *user, *tail;
SIZE adjusted_size = size + 2*debug_pattern_size * 2 + sizeof(SIZE);
SIZE overhead = 2 * debug_pattern_size * 2 + sizeof(SIZE);
SIZE adjusted_size = 0;

assert( debug_pattern_size == 8 ); // just to make sure we're getting the right value and know what's actually happening

// Check for integer overflow in the adjusted_size calculation
// SIZE is int32_t, so we need to ensure size + overhead doesn't exceed INT32_MAX
if (size < 0 || size > (MAX_SIZE - overhead)) {
return NULL; // Allocation request too large or invalid
}

adjusted_size = size + overhead;

ptr = (BYTE *)malloc(adjusted_size);

malloc_block++;
Expand Down
8 changes: 8 additions & 0 deletions ionc/ion_writer_text.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1275,6 +1275,10 @@ iERR _ion_writer_text_append_escape_sequence_string(ION_STREAM *poutput, BOOL do
else {
len = (SIZE)(limit - cp);
if (len > 4) len = 4;

// Initialize the entire buffer to prevent memory disclosure
memset(unicode_buffer, 0, sizeof(unicode_buffer));

for (ii=0; ii<len; ii++) {
unicode_buffer[ii] = cp[ii];
}
Expand Down Expand Up @@ -1305,6 +1309,10 @@ iERR _ion_writer_text_append_escape_sequence_cstr_limit(ION_STREAM *poutput, cha
else {
len = (SIZE)(limit - cp);
if (len > 4) len = 4;

// Initialize the entire buffer to prevent memory disclosure
memset(temp_buffer, 0, sizeof(temp_buffer));

strncpy(temp_buffer, cp, len);
IONCHECK(_ion_writer_text_read_unicode_scalar(temp_buffer, &ilen, &unicode_scalar));
len = ilen;
Expand Down