Browse Source

Merge commit '8692e6284f5169257a537c8fc25addf32fc67c87'

* commit '8692e6284f5169257a537c8fc25addf32fc67c87':
  rdt: check malloc calls

Merged-by: Michael Niedermayer <michaelni@gmx.at>
tags/n2.3
Michael Niedermayer 11 years ago
parent
commit
726316240b
1 changed files with 6 additions and 2 deletions
  1. +6
    -2
      libavformat/rdt.c

+ 6
- 2
libavformat/rdt.c View File

@@ -399,6 +399,8 @@ rdt_parse_b64buf (unsigned int *target_len, const char *p)
}
*target_len = len * 3 / 4;
target = av_mallocz(*target_len + FF_INPUT_BUFFER_PADDING_SIZE);
if (!target)
return NULL;
av_base64_decode(target, p, *target_len);
return target;
}
@@ -521,8 +523,10 @@ static PayloadContext *
rdt_new_context (void)
{
PayloadContext *rdt = av_mallocz(sizeof(PayloadContext));

int ret = avformat_open_input(&rdt->rmctx, "", &ff_rdt_demuxer, NULL);
int ret;
if (!rdt)
return NULL;
ret = avformat_open_input(&rdt->rmctx, "", &ff_rdt_demuxer, NULL);
if (ret < 0) {
av_free(rdt);
return NULL;


Loading…
Cancel
Save