[FFmpeg-cvslog] libavformat/dashdec: Fix issue with dash on Windows

Christopher Degawa git at videolan.org
Thu Oct 8 16:05:41 EEST 2020


ffmpeg | branch: master | Christopher Degawa <ccom at randomderp.com> | Thu Oct  8 12:45:21 2020 +0000| [0117d5aa03aca0158ee54b806d420fb1a974b788] | committer: James Almer

libavformat/dashdec: Fix issue with dash on Windows

Use xmlFree instead of av_freep

snip from libxml2:

 * xmlGetProp:
...
 * Returns the attribute value or NULL if not found.
 *     It's up to the caller to free the memory with xmlFree().

According to libxml2, you are supposed to use xmlFree instead of free
on the pointer returned by it, and also using av_freep on Windows will
call _aligned_free instead of normal free, causing _aligned_free to raise
SIGTRAP and crashing ffmpeg and ffplay.

Signed-off-by: Christopher Degawa <ccom at randomderp.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0117d5aa03aca0158ee54b806d420fb1a974b788
---

 libavformat/dashdec.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/dashdec.c b/libavformat/dashdec.c
index 99b9c45439..42ea74635b 100644
--- a/libavformat/dashdec.c
+++ b/libavformat/dashdec.c
@@ -1145,7 +1145,7 @@ static int parse_manifest_adaptationset(AVFormatContext *s, const char *url,
     }
 
 err:
-    av_freep(&c->adaptionset_lang);
+    xmlFree(c->adaptionset_lang);
     return ret;
 }
 



More information about the ffmpeg-cvslog mailing list