Skip to content

add checks for swr_alloc() and av_malloc() results #56

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

Open
the-shank wants to merge 2 commits into
base: master
Choose a base branch
from
Open

add checks for swr_alloc() and av_malloc() results #56

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2e9968c
add checks for swr_alloc() and av_malloc() results
the-shank Dec 18, 2022
d2695a2
return early if av_samples_get_buffer_size() returns a negative value
the-shank Dec 18, 2022
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
9 changes: 9 additions & 0 deletions src/scan.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,9 @@ int scan_file(const char *file, unsigned index) {
packet.size = buffer_size;

swr = swr_alloc();
if (swr == NULL){
fail_printf("unable to allocate memory fro SwrContext");
}

*ebur128 = ebur128_init(
ctx -> channels, ctx -> sample_rate,
Expand Down Expand Up @@ -436,8 +439,14 @@ static void scan_frame(ebur128_state *ebur128, AVFrame *frame,
out_size = av_samples_get_buffer_size(
&out_linesize, frame -> channels, frame -> nb_samples, out_fmt, 0
);
if (out_size < 0){
fail_printf("av_samples_get_buffer_size() failed with return code %d", out_size);
}

out_data = av_malloc(out_size);
if (out_data == NULL){
fail_printf("av_malloc failed to allocate memory");
}

if (swr_convert(
swr, (uint8_t**) &out_data, frame -> nb_samples,
Expand Down