| @@ -33,7 +33,7 @@ · 32 unmodified lines |
| 33 | int ff_dovi_get_metadata(DOVIContext *s, AVDOVIMetadata **out_metadata) | 33 | int ff_dovi_get_metadata(DOVIContext *s, AVDOVIMetadata **out_metadata) |
| 34 | { | 34 | { |
| 35 | AVDOVIMetadata *dovi; | 35 | AVDOVIMetadata *dovi; |
| 36 | size_t dovi_size, ext_sz; | 36 | size_t dovi_size; |
| 37 | | 37 | |
| 38 | if (!s->mapping || !s->color) | 38 | if (!s->mapping || !s->color) |
| 39 | return 0; /* incomplete dovi metadata */ | 39 | return 0; /* incomplete dovi metadata */ |
| @@ -47,10 +47,14 @@ int ff_dovi_get_metadata(DOVIContext *s, AVDOVIMetadata **out_metadata) · 7 unmodified lines |
| 47 | COPY(AVDOVIRpuDataHeader, av_dovi_get_header(dovi), &s->header, ext_mapping_idc_5_7); | 47 | COPY(AVDOVIRpuDataHeader, av_dovi_get_header(dovi), &s->header, ext_mapping_idc_5_7); |
| 48 | COPY(AVDOVIDataMapping, av_dovi_get_mapping(dovi), s->mapping, nlq_pivots); | 48 | COPY(AVDOVIDataMapping, av_dovi_get_mapping(dovi), s->mapping, nlq_pivots); |
| 49 | COPY(AVDOVIColorMetadata, av_dovi_get_color(dovi), s->color, source_diagonal); | 49 | COPY(AVDOVIColorMetadata, av_dovi_get_color(dovi), s->color, source_diagonal); |
| 50 | ext_sz = FFMIN(sizeof(AVDOVIDmData), dovi->ext_block_size); | 50 | |
| 51 | for (int i = 0; i < s->num_ext_blocks; i++) | 51 | if (s->ext_blocks) { |
| 52 | memcpy(av_dovi_get_ext(dovi, i), &s->ext_blocks[i], ext_sz); | 52 | const DOVIExt *ext = s->ext_blocks; |
| 53 | dovi->num_ext_blocks = s->num_ext_blocks; | 53 | size_t ext_sz = FFMIN(sizeof(AVDOVIDmData), dovi->ext_block_size); |
| | 54 | for (int i = 0; i < ext->num_dm; i++) |
| | 55 | memcpy(av_dovi_get_ext(dovi, i), &ext->dm[i], ext_sz); |
| | 56 | dovi->num_ext_blocks = ext->num_dm; |
| | 57 | } |
| 54 | | 58 | |
| 55 | *out_metadata = dovi; | 59 | *out_metadata = dovi; |
| 56 | return dovi_size; | 60 | return dovi_size; |
| @@ -279,20 +283,24 @@ static int parse_ext_v2(DOVIContext *s, GetBitContext *gb, AVDOVIDmData *dm, · 222 unmodified lines |
| 279 | static int parse_ext_blocks(DOVIContext *s, GetBitContext *gb, int ver) | 283 | static int parse_ext_blocks(DOVIContext *s, GetBitContext *gb, int ver) |
| 280 | { | 284 | { |
| 281 | int num_ext_blocks, ext_block_length, start_pos, parsed_bits, ret; | 285 | int num_ext_blocks, ext_block_length, start_pos, parsed_bits, ret; |
| | 286 | DOVIExt *ext = s->ext_blocks; |
| 282 | | 287 | |
| 283 | num_ext_blocks = get_ue_golomb_31(gb); | 288 | num_ext_blocks = get_ue_golomb_31(gb); |
| 284 | align_get_bits(gb); | 289 | align_get_bits(gb); |
| 285 | if (s->num_ext_blocks + num_ext_blocks > AV_DOVI_MAX_EXT_BLOCKS) | | |
| 286 | return AVERROR_INVALIDDATA; | | |
| 287 | | 290 | |
| 288 | if (!s->ext_blocks) { | 291 | if (!ext) { |
| 289 | s->ext_blocks = ff_refstruct_allocz(sizeof(AVDOVIDmData) * AV_DOVI_MAX_EXT_BLOCKS); | 292 | ext = s->ext_blocks = ff_refstruct_allocz(sizeof(*s->ext_blocks)); |
| 290 | if (!s->ext_blocks) | 293 | if (!ext) |
| 291 | return AVERROR(ENOMEM); | 294 | return AVERROR(ENOMEM); |
| 292 | } | 295 | } |
| 293 | | 296 | |
| 294 | while (num_ext_blocks--) { | 297 | while (num_ext_blocks--) { |
| 295 | AVDOVIDmData *dm = &s->ext_blocks[s->num_ext_blocks++]; | 298 | AVDOVIDmData *dm; |
| | 299 | |
| | 300 | if (ext->num_dm >= FF_ARRAY_ELEMS(ext->dm)) |
| | 301 | return AVERROR_INVALIDDATA; |
| | 302 | dm = &ext->dm[ext->num_dm++]; |
| | 303 | |
| 296 | ext_block_length = get_ue_golomb_31(gb); | 304 | ext_block_length = get_ue_golomb_31(gb); |
| 297 | dm->level = get_bits(gb, 8); | 305 | dm->level = get_bits(gb, 8); |
| 298 | start_pos = get_bits_count(gb); | 306 | start_pos = get_bits_count(gb); |
| @@ -666,7 +674,8 @@ int ff_dovi_rpu_parse(DOVIContext *s, const uint8_t *rpu, size_t rpu_size, · 367 unmodified lines |
| 666 | color->source_diagonal = get_bits(gb, 10); | 674 | color->source_diagonal = get_bits(gb, 10); |
| 667 | | 675 | |
| 668 | /* Parse extension blocks */ | 676 | /* Parse extension blocks */ |
| 669 | s->num_ext_blocks = 0; | 677 | if (s->ext_blocks) |
| | 678 | s->ext_blocks->num_dm = 0; |
| 670 | if ((ret = parse_ext_blocks(s, gb, 1)) < 0) { | 679 | if ((ret = parse_ext_blocks(s, gb, 1)) < 0) { |
| 671 | ff_dovi_ctx_unref(s); | 680 | ff_dovi_ctx_unref(s); |
| 672 | return ret; | 681 | return ret; |
| @@ -680,7 +689,7 @@ int ff_dovi_rpu_parse(DOVIContext *s, const uint8_t *rpu, size_t rpu_size, · 7 unmodified lines |
| 680 | } | 689 | } |
| 681 | } else { | 690 | } else { |
| 682 | s->color = &ff_dovi_color_default; | 691 | s->color = &ff_dovi_color_default; |
| 683 | s->num_ext_blocks = 0; | 692 | ff_refstruct_unref(&s->ext_blocks); |
| 684 | } | 693 | } |
| 685 | | 694 | |
| 686 | return 0; | 695 | return 0; |