From f8b09658f48f307c1dc0aede3ec10e35824d62c8 Mon Sep 17 00:00:00 2001
From: Aman Gupta <aman@tmm1.net>
Date: Mon, 21 Dec 2015 17:16:14 -0800
Subject: dec_sub: avoid segfault on sub_init_decoder failure

Broken by commit 687b552d.

Signed-off-by: wm4 <wm4@nowhere>
---
 sub/dec_sub.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'sub')

diff --git a/sub/dec_sub.c b/sub/dec_sub.c
index 4746b8f2cc..e29b5bf220 100644
--- a/sub/dec_sub.c
+++ b/sub/dec_sub.c
@@ -166,7 +166,8 @@ void sub_init_from_sh(struct dec_sub *sub, struct sh_stream *sh)
     *sd = init_sd;
 
     if (sub_init_decoder(sub, sd) < 0) {
-        sd->driver->uninit(sd);
+        if (sd->driver && sd->driver->uninit)
+            sd->driver->uninit(sd);
         talloc_free(sd);
         MP_ERR(sub, "Could not find subtitle decoder for format '%s'.\n",
                sh->codec ? sh->codec : "<unknown>");
-- 
cgit v1.2.3