From ae2873f72e90c948da1ed32af3e30e0cd6cef409 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Wed, 24 Jun 2015 14:02:40 +0200
Subject: demux_mkv: don't use byte strings

Use char* for strings instead of bstr (data ptr + length pair). Matroska
actually (probably) allows "padding" strings with \0 bytes, so using
normal C strings instead of byte strings is more appropriate.
---
 demux/ebml.c | 29 ++++++++++++++++++++---------
 1 file changed, 20 insertions(+), 9 deletions(-)

(limited to 'demux/ebml.c')

diff --git a/demux/ebml.c b/demux/ebml.c
index d75b61e84c..91e10213e9 100644
--- a/demux/ebml.c
+++ b/demux/ebml.c
@@ -415,7 +415,7 @@ static void ebml_parse_element(struct ebml_parse_ctx *ctx, void *target,
         break;
     }
 
-    for (int i = 0; i < type->field_count; i++)
+    for (int i = 0; i < type->field_count; i++) {
         if (num_elems[i] && type->fields[i].multiple) {
             char *ptr = s + type->fields[i].offset;
             switch (type->fields[i].desc->type) {
@@ -442,6 +442,9 @@ static void ebml_parse_element(struct ebml_parse_ctx *ctx, void *target,
                                                      double, num_elems[i]);
                 break;
             case EBML_TYPE_STR:
+                *(char ***) ptr = talloc_zero_array(ctx->talloc_ctx,
+                                                    char *, num_elems[i]);
+                break;
             case EBML_TYPE_BINARY:
                 *(struct bstr **) ptr = talloc_zero_array(ctx->talloc_ctx,
                                                           struct bstr,
@@ -455,6 +458,7 @@ static void ebml_parse_element(struct ebml_parse_ctx *ctx, void *target,
                 abort();
             }
         }
+    }
 
     while (data < end) {
         int len;
@@ -570,19 +574,26 @@ static void ebml_parse_element(struct ebml_parse_ctx *ctx, void *target,
             break;
 
         case EBML_TYPE_STR:
+            if (length > 1024 * 1024) {
+                MP_ERR(ctx, "Not reading overly long string element.\n");
+                break;
+            }
+            char **strptr;
+            GETPTR(strptr, char *);
+            *strptr = talloc_strndup(ctx->talloc_ctx, data, length);
+            MP_DBG(ctx, "string \"%s\"\n", *strptr);
+            break;
+
         case EBML_TYPE_BINARY:;
             if (length > 0x80000000) {
                 MP_ERR(ctx, "Not reading overly long EBML element.\n");
                 break;
             }
-            struct bstr *strptr;
-            GETPTR(strptr, struct bstr);
-            strptr->start = data;
-            strptr->len = length;
-            if (ed->type == EBML_TYPE_STR)
-                MP_DBG(ctx, "string \"%.*s\"\n", BSTR_P(*strptr));
-            else
-                MP_DBG(ctx, "binary %zd bytes\n", strptr->len);
+            struct bstr *binptr;
+            GETPTR(binptr, struct bstr);
+            binptr->start = data;
+            binptr->len = length;
+            MP_DBG(ctx, "binary %zd bytes\n", binptr->len);
             break;
 
         case EBML_TYPE_EBML_ID:;
-- 
cgit v1.2.3