summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Salt <linux@youmustbejoking.demon.co.uk>2008-08-08 11:18:08 +0100
committerDarren Salt <linux@youmustbejoking.demon.co.uk>2008-08-08 11:18:08 +0100
commit3a6da3fcaef64afe71e1e1a0d41baca0872e98f8 (patch)
tree0b6424163081c69b9353b22e74ca03c59bd0fcfb
parent344c697e75c3fdd1067dc90fc2edc7a19c49466b (diff)
downloadxine-lib-3a6da3fcaef64afe71e1e1a0d41baca0872e98f8.tar.gz
xine-lib-3a6da3fcaef64afe71e1e1a0d41baca0872e98f8.tar.bz2
Fix crash with corrupted WMV files when checking for aspect ratio information.
--HG-- extra : transplant_source : kW%D0IN%9D%8D%D4l%F6%3C%D0%CF%9CT%A9%B2%7D%9E%E9
-rw-r--r--src/demuxers/asfheader.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/demuxers/asfheader.c b/src/demuxers/asfheader.c
index 1b71a0b19..e9a36fc29 100644
--- a/src/demuxers/asfheader.c
+++ b/src/demuxers/asfheader.c
@@ -545,12 +545,12 @@ static int asf_header_parse_metadata(asf_header_t *header_pub, uint8_t *buffer,
if (data_len >= 4)
{
char *name = asf_reader_get_string (&reader, name_len, iconv_cd);
- if (!strcmp (name, "AspectRatioX"))
+ if (name && !strcmp (name, "AspectRatioX"))
{
asf_reader_get_32 (&reader, &header->pub.aspect_ratios[stream_id].x);
data_len -= 4;
}
- else if (!strcmp (name, "AspectRatioY"))
+ else if (name && !strcmp (name, "AspectRatioY"))
{
asf_reader_get_32 (&reader, &header->pub.aspect_ratios[stream_id].y);
data_len -= 4;