summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorphintuka <phintuka>2011-06-19 21:15:13 +0000
committerphintuka <phintuka>2011-06-19 21:15:13 +0000
commit0f23b0aa5f3526ab09caab665337c0ed3217caec (patch)
tree3e4c1e9423eb6cc271044a3d104b95807f34237a
parent4e2342a402217387fab30cdc2109362c054de04b (diff)
downloadxineliboutput-0f23b0aa5f3526ab09caab665337c0ed3217caec.tar.gz
xineliboutput-0f23b0aa5f3526ab09caab665337c0ed3217caec.tar.bz2
Check if optional data is NULL before using it
-rw-r--r--xine/BluRay/demux_ts.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/xine/BluRay/demux_ts.c b/xine/BluRay/demux_ts.c
index 6b18b72d..0010831b 100644
--- a/xine/BluRay/demux_ts.c
+++ b/xine/BluRay/demux_ts.c
@@ -2388,12 +2388,13 @@ static int demux_ts_get_optional_data(demux_plugin_t *this_gen,
{
demux_ts_t *this = (demux_ts_t *) this_gen;
char *str = data;
- int channel = *((int *)data);
/* be a bit paranoid */
- if (this == NULL || this->stream == NULL)
+ if (this == NULL || this->stream == NULL || data == NULL)
return DEMUX_OPTIONAL_UNSUPPORTED;
+ int channel = *((int *)data);
+
switch (data_type)
{
case DEMUX_OPTIONAL_DATA_AUDIOLANG: