[FFmpeg-devel] [Patch] Fix for ticket 6658 (Dash demuxer segfault)

[Steven Liu]

2017-11-23 9:16 GMT+08:00 Colin NG <colin_ng at hotmail.com>:
> Clean up coding style.
>
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel at ffmpeg.org
> http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>

diff --git a/libavformat/dashdec.c b/libavformat/dashdec.c
index 3798649..7e7ae52 100644
--- a/libavformat/dashdec.c
+++ b/libavformat/dashdec.c
@@ -148,6 +148,11 @@ static uint64_t get_current_time_in_sec(void)
     return  av_gettime() / 1000000;
 }

+static char *ishttp(char *url) {
+    char *proto_name = avio_find_protocol_name(url);
+    return av_strstart(proto_name, "http", NULL);
+}
+
 static uint64_t get_utc_date_time_insec(AVFormatContext *s, const
char *datetime)
 {
     struct tm timeinfo;
@@ -392,7 +397,8 @@ static int open_url(AVFormatContext *s,
AVIOContext **pb, const char *url,
     else if (strcmp(proto_name, "file") || !strncmp(url, "file,", 5))
         return AVERROR_INVALIDDATA;

-    ret = s->io_open(s, pb, url, AVIO_FLAG_READ, &tmp);
+    av_freep(pb);
+    ret = avio_open2(pb, url, AVIO_FLAG_READ, c->interrupt_callback, &tmp);
     if (ret >= 0) {
         // update cookies on http response with setcookies.
         char *new_cookies = NULL;
@@ -639,6 +645,78 @@ static int
parse_manifest_segmenttimeline(AVFormatContext *s, struct representat
     return 0;
 }

+static int resolve_content_path(AVFormatContext *s, const char *url,
xmlNodePtr *baseurl_nodes, int n_baseurl_nodes)
+ {
+    int i;
+    char *text;
+    char tmp_str[MAX_URL_SIZE];
+    char tmp_str_2[MAX_URL_SIZE];
+
+    char *path = av_mallocz(MAX_URL_SIZE);
+    int nameSize = 0;
+    int updated = 0;
+
+    av_strlcpy(tmp_str, url, strlen(url)+1);
+    char *mpdName = strtok(tmp_str, "/");
+
+    while ((mpdName = strtok(NULL, "/"))) {
+        nameSize = strlen(mpdName);
+    }
+
+    av_strlcpy(path, url, strlen(url)-nameSize+1);
+
+    int rootId = 0;
+    xmlNodePtr  *node = NULL;
+    for (rootId = n_baseurl_nodes-1; rootId > 0; rootId--) {
+        if (!(node = baseurl_nodes[rootId])) {
+            continue;
+        }
+        if (ishttp(xmlNodeGetContent(node))) {
+            break;
+        }
+    }
+
+    node = baseurl_nodes[rootId];
+    char *baseurl = xmlNodeGetContent(node);
+    char *root_url = (!av_strcasecmp(baseurl, ""))? path: baseurl;
+
+    if (node) {
+        xmlNodeSetContent(node, root_url);
+    }
+
+    int size = strlen(root_url);
+    char *isRootHttp = ishttp(root_url);
+
+    char token = '/';
+    if (strncmp(&root_url[size-1], &token, 1) != 0) {

why not av_strncasecmp?

+        av_strlcat(root_url, "/", size+2);
+        size+=2;
+    }
+
+    for (i = 0; i < n_baseurl_nodes; i++) {
+        if (i == rootId) {
+            continue;
+        }
+        text = xmlNodeGetContent(baseurl_nodes[i]);
+        if (text) {
+            memset(tmp_str, 0, strlen(tmp_str));
+
+            if (!ishttp(text) && isRootHttp) {
+                av_strlcpy(tmp_str, root_url, size+1);
+            }
+            int start = (strncmp(text, &token, 1) == 0) ? 1: 0;

why not av_strncasecmp?


+            memset(tmp_str_2, 0, strlen(tmp_str_2));
+            av_strlcat(tmp_str, text+start, MAX_URL_SIZE);
+            xmlFree(text);
+            xmlNodeSetContent(baseurl_nodes[i], tmp_str);
+            updated = 1;
+        }
+    }
+
+    av_free(path);
+    return updated;
+
+}
 static int parse_manifest_representation(AVFormatContext *s, const char *url,
                                          xmlNodePtr node,
                                          xmlNodePtr adaptionset_node,
@@ -698,6 +776,8 @@ static int
parse_manifest_representation(AVFormatContext *s, const char *url,
         baseurl_nodes[2] = adaptionset_baseurl_node;
         baseurl_nodes[3] = representation_baseurl_node;

+        resolve_content_path(s, url, baseurl_nodes, 4);



check this call return value. If there are no return value, make it void type.



+
         if (representation_segmenttemplate_node || fragment_template_node) {
             fragment_timeline_node = NULL;
             fragment_templates_tab[0] = representation_segmenttemplate_node;
@@ -993,6 +1073,9 @@ static int parse_manifest(AVFormatContext *s,
const char *url, AVIOContext *in)
         }

         mpd_baseurl_node = find_child_node_by_name(node, "BaseURL");
+        if (!mpd_baseurl_node) {
+            mpd_baseurl_node = xmlNewNode(node, "BaseURL");
+        }

         // at now we can handle only one period, with the longest duration
         node = xmlFirstElementChild(node);



BTW: use command looks like this:
1. git commit -a
2. git format-patch -1 or git format-patch -s -2 to make patch.

refer to: https://ffmpeg.org/developer.html#Submitting-patches-1


Thanks