Merge commit 'fca3c3b61952aacc45e9ca54d86a762946c21942'

[ffmpeg] / libavcodec / bsf.c

diff --git a/libavcodec/bsf.c b/libavcodec/bsf.c
index dfb127e7eb3d8fe68700c5b83bfe8133c5490673..c984526e140d6df5cd307d46784242691367459b 100644 (file)
--- a/libavcodec/bsf.c
+++ b/libavcodec/bsf.c
@@ -403,7 +403,7 @@ void av_bsf_list_free(AVBSFList **lst)
 {
     int i;
 
-    if (*lst)
+    if (!*lst)
         return;
 
     for (i = 0; i < (*lst)->nb_bsfs; ++i)
@@ -514,8 +514,10 @@ int av_bsf_list_parse_str(const char *str, AVBSFContext **bsf_lst)
     if (!lst)
         return AVERROR(ENOMEM);
 
-    if (!(dup = buf = av_strdup(str)))
-        return AVERROR(ENOMEM);
+    if (!(dup = buf = av_strdup(str))) {
+        ret = AVERROR(ENOMEM);
+        goto end;
+    }
 
     while (1) {
         bsf_str = av_strtok(buf, ",", &saveptr);