Skip to content

Fix memory leak in rx_samples_c error cleanup waterfall #931

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

Closed
tlozs wants to merge 1 commit into from
+8 −8
Closed

Fix memory leak in rx_samples_c error cleanup waterfall #931

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 8 additions & 8 deletions host/examples/rx_samples_c.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,11 +172,11 @@ int main(int argc, char* argv[])
// Set up streamer
stream_args.channel_list = &channel;
EXECUTE_OR_GOTO(
free_rx_streamer, uhd_usrp_get_rx_stream(usrp, &stream_args, rx_streamer))
free_rx_metadata, uhd_usrp_get_rx_stream(usrp, &stream_args, rx_streamer))

// Set up buffer
EXECUTE_OR_GOTO(
free_rx_streamer, uhd_rx_streamer_max_num_samps(rx_streamer, &samps_per_buff))
free_rx_metadata, uhd_rx_streamer_max_num_samps(rx_streamer, &samps_per_buff))
fprintf(stderr, "Buffer size in samples: %zu\n", samps_per_buff);
buff = malloc(samps_per_buff * 2 * sizeof(float));
buffs_ptr = (void**)&buff;
Expand Down Expand Up @@ -235,19 +235,19 @@ int main(int argc, char* argv[])
}
buff = NULL;
buffs_ptr = NULL;

free_rx_metadata:
if (verbose) {
fprintf(stderr, "Cleaning up RX metadata.\n");
}
uhd_rx_metadata_free(&md);

free_rx_streamer:
if (verbose) {
fprintf(stderr, "Cleaning up RX streamer.\n");
}
uhd_rx_streamer_free(&rx_streamer);

free_rx_metadata:
if (verbose) {
fprintf(stderr, "Cleaning up RX metadata.\n");
}
uhd_rx_metadata_free(&md);

free_usrp:
if (verbose) {
fprintf(stderr, "Cleaning up USRP.\n");
Expand Down
Loading