Browse Source

nutdec: add malloc check and fix const to non-const conversion warnings

Signed-off-by: Mans Rullgard <mans@mansr.com>
tags/n0.11
Mans Rullgard 13 years ago
parent
commit
9d72c0527c
1 changed files with 6 additions and 2 deletions
  1. +6
    -2
      libavformat/nutdec.c

+ 6
- 2
libavformat/nutdec.c View File

@@ -305,14 +305,18 @@ static int decode_main_header(NUTContext *nut)
GET_V(nut->header_count, tmp < 128U) GET_V(nut->header_count, tmp < 128U)
nut->header_count++; nut->header_count++;
for (i = 1; i < nut->header_count; i++) { for (i = 1; i < nut->header_count; i++) {
uint8_t *hdr;
GET_V(nut->header_len[i], tmp > 0 && tmp < 256); GET_V(nut->header_len[i], tmp > 0 && tmp < 256);
rem -= nut->header_len[i]; rem -= nut->header_len[i];
if (rem < 0) { if (rem < 0) {
av_log(s, AV_LOG_ERROR, "invalid elision header\n"); av_log(s, AV_LOG_ERROR, "invalid elision header\n");
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
nut->header[i] = av_malloc(nut->header_len[i]);
avio_read(bc, nut->header[i], nut->header_len[i]);
hdr = av_malloc(nut->header_len[i]);
if (!hdr)
return AVERROR(ENOMEM);
avio_read(bc, hdr, nut->header_len[i]);
nut->header[i] = hdr;
} }
assert(nut->header_len[0] == 0); assert(nut->header_len[0] == 0);
} }


Loading…
Cancel
Save