From: Pierre-Anthony Lemieux <p...@palemieux.com> --- libavformat/tests/imf.c | 38 +++++--------------------------------- 1 file changed, 5 insertions(+), 33 deletions(-)
diff --git a/libavformat/tests/imf.c b/libavformat/tests/imf.c index a5bdf16645..a23b687c3d 100644 --- a/libavformat/tests/imf.c +++ b/libavformat/tests/imf.c @@ -257,7 +257,7 @@ const char *cpl_doc = "</SegmentList>" "</CompositionPlaylist>"; -const char *cpl_bad_doc = "<Composition></Composition>"; +const char *cpl_bad_empty_doc = "<Composition></Composition>"; const char *asset_map_doc = "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>" @@ -384,36 +384,11 @@ static int test_cpl_parsing(void) return 0; } -static int test_bad_cpl_parsing(FFIMFCPL **cpl) -{ - xmlDocPtr doc; - int ret; - - doc = xmlReadMemory(cpl_bad_doc, strlen(cpl_bad_doc), NULL, NULL, 0); - if (doc == NULL) { - printf("XML parsing failed.\n"); - return 1; - } - - ret = ff_imf_parse_cpl_from_xml_dom(doc, cpl); - xmlFreeDoc(doc); - if (ret) { - printf("CPL parsing failed.\n"); - return ret; - } - - ff_imf_cpl_free(*cpl); - *cpl = NULL; - - return 0; -} - -static int test_bad_resource_cpl_parsing(FFIMFCPL **cpl) -{ +static int test_bad_cpl(FFIMFCPL **cpl, const char* bad_cpl_doc) { xmlDocPtr doc; int ret; - doc = xmlReadMemory(cpl_bad_resource_doc, strlen(cpl_bad_resource_doc), NULL, NULL, 0); + doc = xmlReadMemory(bad_cpl_doc, strlen(bad_cpl_doc), NULL, NULL, 0); if (doc == NULL) { printf("XML parsing failed.\n"); return 1; @@ -591,7 +566,7 @@ int main(int argc, char *argv[]) ret = 1; printf("#### The following should fail ####\n"); - if (test_bad_cpl_parsing(&cpl) == 0) { + if (test_bad_cpl(&cpl, cpl_bad_empty_doc) == 0) { ret = 1; } else if (cpl) { printf("Improper cleanup after failed CPL parsing\n"); @@ -600,10 +575,7 @@ int main(int argc, char *argv[]) printf("#### End failing test ####\n"); printf("#### The following should emit errors ####\n"); - if (test_bad_resource_cpl_parsing(&cpl) != 0) { - ret = 1; - } else if (cpl) { - printf("Improper cleanup after failed CPL parsing\n"); + if (test_bad_cpl(&cpl, cpl_bad_resource_doc) != 0) { ret = 1; } printf("#### End emission of errors ####\n"); -- 2.25.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".