mpegtsenc: Check dynarray_add() for failure
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 7 Aug 2014 20:28:59 +0000 (22:28 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 7 Aug 2014 21:02:10 +0000 (23:02 +0200)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/mpegtsenc.c

index 5d98ea8..5c0b0d7 100644 (file)
@@ -533,14 +533,17 @@ static MpegTSService *mpegts_add_service(MpegTSWrite *ts, int sid,
     service->pcr_pid       = 0x1fff;
     service->provider_name = av_strdup(provider_name);
     service->name          = av_strdup(name);
-    if (!service->provider_name || !service->name) {
-        av_freep(&service->provider_name);
-        av_freep(&service->name);
-        av_free(service);
-        return NULL;
-    }
-    dynarray_add(&ts->services, &ts->nb_services, service);
+    if (!service->provider_name || !service->name)
+        goto fail;
+    if (av_dynarray_add_nofree(&ts->services, &ts->nb_services, service) < 0)
+        goto fail;
+
     return service;
+fail:
+    av_freep(&service->provider_name);
+    av_freep(&service->name);
+    av_free(service);
+    return NULL;
 }
 
 static int64_t get_pcr(const MpegTSWrite *ts, AVIOContext *pb)