summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnton Khirnov <[email protected]>2012-06-15 19:58:11 +0200
committerAnton Khirnov <[email protected]>2012-10-06 09:40:46 +0200
commit77d43bf42d76a1a3ccd8ea25937664c7f9d4bcac (patch)
tree78b0bf7909a549b79b738d85fdcd2c4a3a1f0f48
parent899d95efe12f1e250b361837c1c8c06df9ac9b86 (diff)
lavf: don't segfault when a NULL filename is passed to avformat_open_input()
This can easily happen when the caller is using a custom AVIOContext. Behave as if the filename was an empty string in this case. CC: [email protected] (cherry picked from commit a5db8e4a1a5449cc7a61e963c9fa698a4f22131b) Signed-off-by: Anton Khirnov <[email protected]> (cherry picked from commit 7124fa5d3640e5b8089dd13b22a09038b2ec5216) Signed-off-by: Anton Khirnov <[email protected]>
-rw-r--r--libavformat/utils.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c
index 57fc836c64..5f3da495fd 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -622,7 +622,7 @@ int avformat_open_input(AVFormatContext **ps, const char *filename, AVInputForma
}
s->duration = s->start_time = AV_NOPTS_VALUE;
- av_strlcpy(s->filename, filename, sizeof(s->filename));
+ av_strlcpy(s->filename, filename ? filename : "", sizeof(s->filename));
/* allocate private data */
if (s->iformat->priv_data_size > 0) {