virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-04-14 00:58:38 +02:00
Code Issues Releases Activity

check malloc return

Browse Source 
Originally committed as revision 11562 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Baptiste Coudurier 2008-01-19 15:21:30 +00:00
parent 8513ba097c
commit 57810910c7
1 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libavformat/mxf.c
View File

@ -281,6 +281,8 @@ static int mxf_decrypt_triplet(AVFormatContext *s, AVPacket *pkt, KLVPacket *klv
if (!mxf->aesc && s->key && s->keylen == 16) { if (!mxf->aesc && s->key && s->keylen == 16) {
mxf->aesc = av_malloc(av_aes_size); mxf->aesc = av_malloc(av_aes_size);
if (!mxf->aesc)
return -1;
av_aes_init(mxf->aesc, s->key, 128, 1); av_aes_init(mxf->aesc, s->key, 128, 1);
} }
// crypto context // crypto context
@ -368,6 +370,8 @@ static int mxf_read_packet(AVFormatContext *s, AVPacket *pkt)
static int mxf_add_metadata_set(MXFContext *mxf, void *metadata_set) static int mxf_add_metadata_set(MXFContext *mxf, void *metadata_set)
{ {
mxf->metadata_sets = av_realloc(mxf->metadata_sets, (mxf->metadata_sets_count + 1) * sizeof(*mxf->metadata_sets)); mxf->metadata_sets = av_realloc(mxf->metadata_sets, (mxf->metadata_sets_count + 1) * sizeof(*mxf->metadata_sets));
if (!mxf->metadata_sets)
return -1;
mxf->metadata_sets[mxf->metadata_sets_count] = metadata_set; mxf->metadata_sets[mxf->metadata_sets_count] = metadata_set;
mxf->metadata_sets_count++; mxf->metadata_sets_count++;
return 0; return 0;
@ -394,6 +398,8 @@ static int mxf_read_metadata_content_storage(MXFContext *mxf, ByteIOContext *pb,
if (mxf->packages_count >= UINT_MAX / sizeof(UID)) if (mxf->packages_count >= UINT_MAX / sizeof(UID))
return -1; return -1;
mxf->packages_refs = av_malloc(mxf->packages_count * sizeof(UID)); mxf->packages_refs = av_malloc(mxf->packages_count * sizeof(UID));
if (!mxf->packages_refs)
return -1;
url_fskip(pb, 4); /* useless size of objects, always 16 according to specs */ url_fskip(pb, 4); /* useless size of objects, always 16 according to specs */
get_buffer(pb, (uint8_t *)mxf->packages_refs, mxf->packages_count * sizeof(UID)); get_buffer(pb, (uint8_t *)mxf->packages_refs, mxf->packages_count * sizeof(UID));
break; break;
@ -430,6 +436,8 @@ static int mxf_read_metadata_material_package(MXFPackage *package, ByteIOContext
if (package->tracks_count >= UINT_MAX / sizeof(UID)) if (package->tracks_count >= UINT_MAX / sizeof(UID))
return -1; return -1;
package->tracks_refs = av_malloc(package->tracks_count * sizeof(UID)); package->tracks_refs = av_malloc(package->tracks_count * sizeof(UID));
if (!package->tracks_refs)
return -1;
url_fskip(pb, 4); /* useless size of objects, always 16 according to specs */ url_fskip(pb, 4); /* useless size of objects, always 16 according to specs */
get_buffer(pb, (uint8_t *)package->tracks_refs, package->tracks_count * sizeof(UID)); get_buffer(pb, (uint8_t *)package->tracks_refs, package->tracks_count * sizeof(UID));
break; break;
@ -471,6 +479,8 @@ static int mxf_read_metadata_sequence(MXFSequence *sequence, ByteIOContext *pb,
if (sequence->structural_components_count >= UINT_MAX / sizeof(UID)) if (sequence->structural_components_count >= UINT_MAX / sizeof(UID))
return -1; return -1;
sequence->structural_components_refs = av_malloc(sequence->structural_components_count * sizeof(UID)); sequence->structural_components_refs = av_malloc(sequence->structural_components_count * sizeof(UID));
if (!sequence->structural_components_refs)
return -1;
url_fskip(pb, 4); /* useless size of objects, always 16 according to specs */ url_fskip(pb, 4); /* useless size of objects, always 16 according to specs */
get_buffer(pb, (uint8_t *)sequence->structural_components_refs, sequence->structural_components_count * sizeof(UID)); get_buffer(pb, (uint8_t *)sequence->structural_components_refs, sequence->structural_components_count * sizeof(UID));
break; break;
@ -486,6 +496,8 @@ static int mxf_read_metadata_source_package(MXFPackage *package, ByteIOContext *
if (package->tracks_count >= UINT_MAX / sizeof(UID)) if (package->tracks_count >= UINT_MAX / sizeof(UID))
return -1; return -1;
package->tracks_refs = av_malloc(package->tracks_count * sizeof(UID)); package->tracks_refs = av_malloc(package->tracks_count * sizeof(UID));
if (!package->tracks_refs)
return -1;
url_fskip(pb, 4); /* useless size of objects, always 16 according to specs */ url_fskip(pb, 4); /* useless size of objects, always 16 according to specs */
get_buffer(pb, (uint8_t *)package->tracks_refs, package->tracks_count * sizeof(UID)); get_buffer(pb, (uint8_t *)package->tracks_refs, package->tracks_count * sizeof(UID));
break; break;
@ -532,6 +544,8 @@ static int mxf_read_metadata_generic_descriptor(MXFDescriptor *descriptor, ByteI
if (descriptor->sub_descriptors_count >= UINT_MAX / sizeof(UID)) if (descriptor->sub_descriptors_count >= UINT_MAX / sizeof(UID))
return -1; return -1;
descriptor->sub_descriptors_refs = av_malloc(descriptor->sub_descriptors_count * sizeof(UID)); descriptor->sub_descriptors_refs = av_malloc(descriptor->sub_descriptors_count * sizeof(UID));
if (!descriptor->sub_descriptors_refs)
return -1;
url_fskip(pb, 4); /* useless size of objects, always 16 according to specs */ url_fskip(pb, 4); /* useless size of objects, always 16 according to specs */
get_buffer(pb, (uint8_t *)descriptor->sub_descriptors_refs, descriptor->sub_descriptors_count * sizeof(UID)); get_buffer(pb, (uint8_t *)descriptor->sub_descriptors_refs, descriptor->sub_descriptors_count * sizeof(UID));
break; break;
@ -572,6 +586,8 @@ static int mxf_read_metadata_generic_descriptor(MXFDescriptor *descriptor, ByteI
break; break;
case 0x8201: /* Private tag used by SONY C0023S01.mxf */ case 0x8201: /* Private tag used by SONY C0023S01.mxf */
descriptor->extradata = av_malloc(size); descriptor->extradata = av_malloc(size);
if (!descriptor->extradata)
return -1;
descriptor->extradata_size = size; descriptor->extradata_size = size;
get_buffer(pb, descriptor->extradata, size); get_buffer(pb, descriptor->extradata, size);
break; break;
@ -884,6 +900,8 @@ static int mxf_read_local_tags(MXFContext *mxf, KLVPacket *klv, int (*read_child
MXFMetadataSet *ctx = ctx_size ? av_mallocz(ctx_size) : mxf; MXFMetadataSet *ctx = ctx_size ? av_mallocz(ctx_size) : mxf;
uint64_t klv_end= url_ftell(pb) + klv->length; uint64_t klv_end= url_ftell(pb) + klv->length;
if (!ctx)
return -1;
while (url_ftell(pb) + 4 < klv_end) { while (url_ftell(pb) + 4 < klv_end) {
int tag = get_be16(pb); int tag = get_be16(pb);
int size = get_be16(pb); /* KLV specified by 0x53 */ int size = get_be16(pb); /* KLV specified by 0x53 */