Commit 7ef61879 authored by Ramiro Polla's avatar Ramiro Polla

Check for return value of some context allocations.

Originally committed as revision 19826 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 600b9c5c
...@@ -483,6 +483,10 @@ static int read_ffserver_streams(AVFormatContext *s, const char *filename) ...@@ -483,6 +483,10 @@ static int read_ffserver_streams(AVFormatContext *s, const char *filename)
st = av_mallocz(sizeof(AVStream)); st = av_mallocz(sizeof(AVStream));
memcpy(st, ic->streams[i], sizeof(AVStream)); memcpy(st, ic->streams[i], sizeof(AVStream));
st->codec = avcodec_alloc_context(); st->codec = avcodec_alloc_context();
if (!st->codec) {
print_error(filename, AVERROR(ENOMEM));
av_exit(1);
}
memcpy(st->codec, ic->streams[i]->codec, sizeof(AVCodecContext)); memcpy(st->codec, ic->streams[i]->codec, sizeof(AVCodecContext));
s->streams[i] = st; s->streams[i] = st;
...@@ -2836,6 +2840,10 @@ static void opt_input_file(const char *filename) ...@@ -2836,6 +2840,10 @@ static void opt_input_file(const char *filename)
/* get default parameters from command line */ /* get default parameters from command line */
ic = avformat_alloc_context(); ic = avformat_alloc_context();
if (!ic) {
print_error(filename, AVERROR(ENOMEM));
av_exit(1);
}
memset(ap, 0, sizeof(*ap)); memset(ap, 0, sizeof(*ap));
ap->prealloced_context = 1; ap->prealloced_context = 1;
...@@ -3332,6 +3340,10 @@ static void opt_output_file(const char *filename) ...@@ -3332,6 +3340,10 @@ static void opt_output_file(const char *filename)
filename = "pipe:"; filename = "pipe:";
oc = avformat_alloc_context(); oc = avformat_alloc_context();
if (!oc) {
print_error(filename, AVERROR(ENOMEM));
av_exit(1);
}
if (!file_oformat) { if (!file_oformat) {
file_oformat = guess_format(NULL, filename, NULL); file_oformat = guess_format(NULL, filename, NULL);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment