From 9085b85729bb8eb8e4b96195f651308e912b443f Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Mon, 19 Nov 2012 00:22:43 +0100
Subject: stream: fix dvd:// + cache crashing

The language string was dynamically allocated, which completely fails
if the cache is forked (which it usually is). Change it back to a fixed
length string, like the original code had it.
---
 stream/stream.h        | 2 +-
 stream/stream_bluray.c | 4 +++-
 stream/stream_dvd.c    | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'stream')

diff --git a/stream/stream.h b/stream/stream.h
index 9bb6da749b..87cb6c64db 100644
--- a/stream/stream.h
+++ b/stream/stream.h
@@ -100,7 +100,7 @@
 struct stream_lang_req {
 	int type; // STREAM_AUDIO, STREAM_SUB
 	int id;
-        char *name;
+        char name[50];
 };
 
 typedef enum {
diff --git a/stream/stream_bluray.c b/stream/stream_bluray.c
index 5f380458c7..8ee69aaa80 100644
--- a/stream/stream_bluray.c
+++ b/stream/stream_bluray.c
@@ -30,6 +30,8 @@
  */
 
 #include <libbluray/bluray.h>
+#include <string.h>
+#include <assert.h>
 
 #include "config.h"
 #include "libavutil/common.h"
@@ -215,7 +217,7 @@ static int bluray_stream_control(stream_t *s, int cmd, void *arg)
             }
             while (count-- > 0) {
                 if (si->pid == req->id) {
-                    req->name = talloc_strndup(NULL, si->lang, 4);
+                    snprintf(req->name, sizeof(req->name), "%.4s", si->lang);
                     bd_free_title_info(ti);
                     return STREAM_OK;
                 }
diff --git a/stream/stream_dvd.c b/stream/stream_dvd.c
index 4554b2c2cc..b30092134c 100644
--- a/stream/stream_dvd.c
+++ b/stream/stream_dvd.c
@@ -707,7 +707,7 @@ static int control(stream_t *stream,int cmd,void* arg)
             }
             if (!lang)
                 break;
-            req->name = talloc_strdup(NULL, (char[]) {lang >> 8, lang, 0});
+            snprintf(req->name, sizeof(req->name), "%c%c", lang >> 8, lang);
             return STREAM_OK;
         }
     }
-- 
cgit v1.2.3