diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-10 19:58:15 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-10 19:58:19 +0200 |
| commit | 07206deed103452f4530fbae099d830244417944 (patch) | |
| tree | 3a574cbe37cc4d521fb59e37f0055e855e986277 | |
| parent | 0a3a0edd52b98aec27d1b8c63c85cb52ff46d40e (diff) | |
| parent | 1db88c33f2c0225aae160cc412b62dfaa3a34cbc (diff) | |
| download | ffmpeg-07206deed103452f4530fbae099d830244417944.tar.gz | |
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
Suggest recompilation with openssl or gnutls if the https protocol is not found.
lavf/utils.c: Avoid a null pointer dereference on oom after duration_error allocation.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/avio.c | 2 | ||||
| -rw-r--r-- | libavformat/utils.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/libavformat/avio.c b/libavformat/avio.c index 73b2a29801..5916e46a2e 100644 --- a/libavformat/avio.c +++ b/libavformat/avio.c @@ -241,6 +241,8 @@ int ffurl_alloc(URLContext **puc, const char *filename, int flags, return url_alloc_for_protocol (puc, up, filename, flags, int_cb); } *puc = NULL; + if (!strcmp("https", proto_str)) + av_log(NULL, AV_LOG_WARNING, "https protocol not found, recompile with openssl or gnutls enabled.\n"); return AVERROR_PROTOCOL_NOT_FOUND; } diff --git a/libavformat/utils.c b/libavformat/utils.c index bdee64484b..070c224ecd 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -2859,6 +2859,8 @@ int avformat_find_stream_info(AVFormatContext *ic, AVDictionary **options) if (!st->info->duration_error) st->info->duration_error = av_mallocz(sizeof(st->info->duration_error[0])*2); + if (!st->info->duration_error) + return AVERROR(ENOMEM); // if(st->codec->codec_type == AVMEDIA_TYPE_VIDEO) // av_log(NULL, AV_LOG_ERROR, "%f\n", dts); |