Revisit memory deallocation

elixir-webrtc · Aug 8, 2024 · 56f1f5c · 56f1f5c
1 parent f1d9e2f
commit 56f1f5c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/c_src/xav/decoder.c b/c_src/xav/decoder.c
@@ -61,9 +61,12 @@ int decoder_decode(struct Decoder *decoder, AVPacket *pkt, AVFrame *frame) {
 }
 
 void decoder_free_frame(struct Decoder *decoder) {
-  // TODO revisit this
-  av_frame_unref(decoder->frame);
-  av_packet_unref(decoder->pkt);
+  if (decoder->frame != NULL) {
+    av_frame_unref(decoder->frame);
+  }
+  if (decoder->pkt != NULL) {
+    av_packet_unref(decoder->pkt);
+  }
 }
 
 void decoder_free(struct Decoder **decoder) {

diff --git a/c_src/xav/reader.c b/c_src/xav/reader.c
@@ -175,7 +175,11 @@ int reader_next_frame(struct Reader *reader) {
   return 0;
 }
 
-void reader_free_frame(struct Reader *reader) { av_frame_unref(reader->frame); }
+void reader_free_frame(struct Reader *reader) {
+  if (reader->frame != NULL) {
+    av_frame_unref(reader->frame);
+  }
+}
 
 void reader_free(struct Reader **reader) {
   XAV_LOG_DEBUG("Freeing Reader object");