diff --git a/libavformat/rtpdec_xiph.c b/libavformat/rtpdec_xiph.c
index dc34f9e224..53b4975278 100644
--- a/libavformat/rtpdec_xiph.c
+++ b/libavformat/rtpdec_xiph.c
@@ -67,8 +67,8 @@ static inline void free_fragment_if_needed(PayloadContext * data)
 static void xiph_free_context(PayloadContext * data)
 {
     free_fragment_if_needed(data);
-    av_free(data->split_buf);
-    av_free(data);
+    av_freep(&data->split_buf);
+    av_freep(&data);
 }
 
 static av_cold int xiph_vorbis_init(AVFormatContext *ctx, int st_index,