Skip to content

Move some null pointers asserts before the pointer dereference #888

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
ktmf01 merged 2 commits into from
May 8, 2026
Merged

Move some null pointers asserts before the pointer dereference #888

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
ac1be7d
Move some null pointers asserts before the pointer dereference
madah81pnz1 Feb 28, 2026
ea362db
Nudge
ktmf01 May 8, 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
24 changes: 17 additions & 7 deletions src/libFLAC/metadata_iterators.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -666,12 +666,14 @@ FLAC_API FLAC__bool FLAC__metadata_simple_iterator_get_application_id(FLAC__Meta

FLAC_API FLAC__StreamMetadata *FLAC__metadata_simple_iterator_get_block(FLAC__Metadata_SimpleIterator *iterator)
{
FLAC__StreamMetadata *block = FLAC__metadata_object_new(iterator->type);
FLAC__StreamMetadata *block;

FLAC__ASSERT(0 != iterator);
FLAC__ASSERT(0 != iterator->file);
FLAC__ASSERT(iterator->status == FLAC__METADATA_SIMPLE_ITERATOR_STATUS_OK);

block = FLAC__metadata_object_new(iterator->type);

if(0 != block) {
block->is_last = iterator->is_last;
block->length = iterator->length;
Expand All @@ -696,14 +698,16 @@ FLAC_API FLAC__StreamMetadata *FLAC__metadata_simple_iterator_get_block(FLAC__Me

FLAC_API FLAC__bool FLAC__metadata_simple_iterator_set_block(FLAC__Metadata_SimpleIterator *iterator, FLAC__StreamMetadata *block, FLAC__bool use_padding)
{
FLAC__ASSERT_DECLARATION(FLAC__off_t debug_target_offset = iterator->offset[iterator->depth];)
FLAC__ASSERT_DECLARATION(FLAC__off_t debug_target_offset;)
FLAC__bool ret;

FLAC__ASSERT(0 != iterator);
FLAC__ASSERT(0 != iterator->file);
FLAC__ASSERT(0 != block);
FLAC__ASSERT(iterator->status == FLAC__METADATA_SIMPLE_ITERATOR_STATUS_OK);

FLAC__ASSERT_DECLARATION(debug_target_offset = iterator->offset[iterator->depth];)

if(!iterator->is_writable) {
iterator->status = FLAC__METADATA_SIMPLE_ITERATOR_STATUS_NOT_WRITABLE;
return false;
Expand Down Expand Up @@ -800,14 +804,16 @@ FLAC_API FLAC__bool FLAC__metadata_simple_iterator_insert_block_after(FLAC__Meta
uint32_t padding_leftover = 0;
FLAC__bool padding_is_last = false;

FLAC__ASSERT_DECLARATION(FLAC__off_t debug_target_offset = iterator->offset[iterator->depth] + FLAC__STREAM_METADATA_HEADER_LENGTH + iterator->length;)
FLAC__ASSERT_DECLARATION(FLAC__off_t debug_target_offset;)
FLAC__bool ret;

FLAC__ASSERT(0 != iterator);
FLAC__ASSERT(0 != iterator->file);
FLAC__ASSERT(0 != block);
FLAC__ASSERT(iterator->status == FLAC__METADATA_SIMPLE_ITERATOR_STATUS_OK);

FLAC__ASSERT_DECLARATION(debug_target_offset = iterator->offset[iterator->depth] + FLAC__STREAM_METADATA_HEADER_LENGTH + iterator->length;)

if(!iterator->is_writable) {
iterator->status = FLAC__METADATA_SIMPLE_ITERATOR_STATUS_NOT_WRITABLE;
return false;
Expand Down Expand Up @@ -3601,17 +3607,21 @@ void set_file_stats_(const char *filename, struct flac_stat_s *stats)
{
#if defined(_POSIX_C_SOURCE) && (_POSIX_C_SOURCE >= 200809L) && !defined(_WIN32)
struct timespec srctime[2] = {};
srctime[0].tv_sec = stats->st_atime;
srctime[1].tv_sec = stats->st_mtime;
#else
struct utimbuf srctime;
srctime.actime = stats->st_atime;
srctime.modtime = stats->st_mtime;
#endif

FLAC__ASSERT(0 != filename);
FLAC__ASSERT(0 != stats);

#if defined(_POSIX_C_SOURCE) && (_POSIX_C_SOURCE >= 200809L) && !defined(_WIN32)
srctime[0].tv_sec = stats->st_atime;
srctime[1].tv_sec = stats->st_mtime;
#else
srctime.actime = stats->st_atime;
srctime.modtime = stats->st_mtime;
#endif

(void)flac_chmod(filename, stats->st_mode);
(void)flac_utime(filename, &srctime);
#if !defined _MSC_VER && !defined __BORLANDC__ && !defined __MINGW32__
Expand Down
24 changes: 18 additions & 6 deletions src/libFLAC/stream_encoder.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2513,14 +2513,20 @@ FLAC_API FLAC__bool FLAC__stream_encoder_get_limit_min_bitrate(const FLAC__Strea
FLAC_API FLAC__bool FLAC__stream_encoder_process(FLAC__StreamEncoder *encoder, const FLAC__int32 * const buffer[], uint32_t samples)
{
uint32_t i, j = 0, k = 0, channel;
const uint32_t channels = encoder->protected_->channels, blocksize = encoder->protected_->blocksize;
const FLAC__int32 sample_max = INT32_MAX >> (32 - encoder->protected_->bits_per_sample);
const FLAC__int32 sample_min = INT32_MIN >> (32 - encoder->protected_->bits_per_sample);
uint32_t channels;
uint32_t blocksize;
FLAC__int32 sample_max;
FLAC__int32 sample_min;

FLAC__ASSERT(0 != encoder);
FLAC__ASSERT(0 != encoder->private_);
FLAC__ASSERT(0 != encoder->protected_);

channels = encoder->protected_->channels;
blocksize = encoder->protected_->blocksize;
sample_max = INT32_MAX >> (32 - encoder->protected_->bits_per_sample);
sample_min = INT32_MIN >> (32 - encoder->protected_->bits_per_sample);

if(encoder->protected_->state != FLAC__STREAM_ENCODER_OK)
return false;

Expand Down Expand Up @@ -2564,14 +2570,20 @@ FLAC_API FLAC__bool FLAC__stream_encoder_process(FLAC__StreamEncoder *encoder, c
FLAC_API FLAC__bool FLAC__stream_encoder_process_interleaved(FLAC__StreamEncoder *encoder, const FLAC__int32 buffer[], uint32_t samples)
{
uint32_t i, j, k, channel;
const uint32_t channels = encoder->protected_->channels, blocksize = encoder->protected_->blocksize;
const FLAC__int32 sample_max = INT32_MAX >> (32 - encoder->protected_->bits_per_sample);
const FLAC__int32 sample_min = INT32_MIN >> (32 - encoder->protected_->bits_per_sample);
uint32_t channels;
uint32_t blocksize;
FLAC__int32 sample_max;
FLAC__int32 sample_min;

FLAC__ASSERT(0 != encoder);
FLAC__ASSERT(0 != encoder->private_);
FLAC__ASSERT(0 != encoder->protected_);

channels = encoder->protected_->channels;
blocksize = encoder->protected_->blocksize;
sample_max = INT32_MAX >> (32 - encoder->protected_->bits_per_sample);
sample_min = INT32_MIN >> (32 - encoder->protected_->bits_per_sample);

if(encoder->protected_->state != FLAC__STREAM_ENCODER_OK)
return false;

Expand Down
Loading