File tree Expand file tree Collapse file tree 6 files changed +44
-12
lines changed Expand file tree Collapse file tree 6 files changed +44
-12
lines changed Original file line number Diff line number Diff line change @@ -380,9 +380,15 @@ static int ProcessHeaders( decoder_t *p_dec )
380
380
}
381
381
else
382
382
{
383
+ void * p_extra = realloc ( p_dec -> fmt_out .p_extra ,
384
+ p_dec -> fmt_in .i_extra );
385
+ if ( unlikely ( p_extra == NULL ) )
386
+ {
387
+ ret = VLC_ENOMEM ;
388
+ goto cleanup ;
389
+ }
390
+ p_dec -> fmt_out .p_extra = p_extra ;
383
391
p_dec -> fmt_out .i_extra = p_dec -> fmt_in .i_extra ;
384
- p_dec -> fmt_out .p_extra = xrealloc ( p_dec -> fmt_out .p_extra ,
385
- p_dec -> fmt_out .i_extra );
386
392
memcpy ( p_dec -> fmt_out .p_extra ,
387
393
p_dec -> fmt_in .p_extra , p_dec -> fmt_out .i_extra );
388
394
}
Original file line number Diff line number Diff line change @@ -592,9 +592,14 @@ static int ProcessHeaders( decoder_t *p_dec )
592
592
#ifdef ENABLE_PACKETIZER
593
593
else
594
594
{
595
+ void * p_extra = realloc ( p_dec -> fmt_out .p_extra ,
596
+ p_dec -> fmt_in .i_extra );
597
+ if ( unlikely ( p_extra == NULL ) )
598
+ {
599
+ return VLC_ENOMEM ;
600
+ }
601
+ p_dec -> fmt_out .p_extra = p_extra ;
595
602
p_dec -> fmt_out .i_extra = p_dec -> fmt_in .i_extra ;
596
- p_dec -> fmt_out .p_extra = xrealloc ( p_dec -> fmt_out .p_extra ,
597
- p_dec -> fmt_out .i_extra );
598
603
memcpy ( p_dec -> fmt_out .p_extra ,
599
604
p_dec -> fmt_in .p_extra , p_dec -> fmt_out .i_extra );
600
605
}
Original file line number Diff line number Diff line change @@ -250,9 +250,13 @@ static int ProcessHeader(decoder_t* p_dec)
250
250
* latter are underspecified. */
251
251
252
252
if (p_sys -> b_packetizer ) {
253
+ void * p_extra = realloc (p_dec -> fmt_out .p_extra ,
254
+ p_dec -> fmt_in .i_extra );
255
+ if (unlikely (p_extra == NULL )) {
256
+ return VLC_ENOMEM ;
257
+ }
258
+ p_dec -> fmt_out .p_extra = p_extra ;
253
259
p_dec -> fmt_out .i_extra = p_dec -> fmt_in .i_extra ;
254
- p_dec -> fmt_out .p_extra = xrealloc (p_dec -> fmt_out .p_extra ,
255
- p_dec -> fmt_out .i_extra );
256
260
memcpy (p_dec -> fmt_out .p_extra ,
257
261
p_dec -> fmt_in .p_extra , p_dec -> fmt_out .i_extra );
258
262
}
Original file line number Diff line number Diff line change @@ -424,9 +424,14 @@ static int ProcessHeaders( decoder_t *p_dec )
424
424
425
425
if ( p_sys -> b_packetizer )
426
426
{
427
+ void * p_extra = realloc ( p_dec -> fmt_out .p_extra ,
428
+ p_dec -> fmt_in .i_extra );
429
+ if ( unlikely ( p_extra == NULL ) )
430
+ {
431
+ return VLC_ENOMEM ;
432
+ }
433
+ p_dec -> fmt_out .p_extra = p_extra ;
427
434
p_dec -> fmt_out .i_extra = p_dec -> fmt_in .i_extra ;
428
- p_dec -> fmt_out .p_extra = xrealloc ( p_dec -> fmt_out .p_extra ,
429
- p_dec -> fmt_out .i_extra );
430
435
memcpy ( p_dec -> fmt_out .p_extra ,
431
436
p_dec -> fmt_in .p_extra , p_dec -> fmt_out .i_extra );
432
437
}
Original file line number Diff line number Diff line change @@ -399,9 +399,16 @@ static int ProcessHeaders( decoder_t *p_dec )
399
399
}
400
400
else
401
401
{
402
+ void * p_extra = realloc ( p_dec -> fmt_out .p_extra ,
403
+ p_dec -> fmt_in .i_extra );
404
+ if ( unlikely ( p_extra == NULL ) )
405
+ {
406
+ /* Clean up the decoder setup info... we're done with it */
407
+ th_setup_free ( ts );
408
+ return VLC_ENOMEM ;
409
+ }
410
+ p_dec -> fmt_out .p_extra = p_extra ;
402
411
p_dec -> fmt_out .i_extra = p_dec -> fmt_in .i_extra ;
403
- p_dec -> fmt_out .p_extra = xrealloc ( p_dec -> fmt_out .p_extra ,
404
- p_dec -> fmt_out .i_extra );
405
412
memcpy ( p_dec -> fmt_out .p_extra ,
406
413
p_dec -> fmt_in .p_extra , p_dec -> fmt_out .i_extra );
407
414
}
Original file line number Diff line number Diff line change @@ -414,9 +414,14 @@ static int ProcessHeaders( decoder_t *p_dec )
414
414
}
415
415
else
416
416
{
417
+ void * p_extra = realloc ( p_dec -> fmt_out .p_extra ,
418
+ p_dec -> fmt_in .i_extra );
419
+ if ( unlikely ( p_extra == NULL ) )
420
+ {
421
+ return VLC_ENOMEM ;
422
+ }
423
+ p_dec -> fmt_out .p_extra = p_extra ;
417
424
p_dec -> fmt_out .i_extra = p_dec -> fmt_in .i_extra ;
418
- p_dec -> fmt_out .p_extra = xrealloc ( p_dec -> fmt_out .p_extra ,
419
- p_dec -> fmt_out .i_extra );
420
425
memcpy ( p_dec -> fmt_out .p_extra ,
421
426
p_dec -> fmt_in .p_extra , p_dec -> fmt_out .i_extra );
422
427
}
You can’t perform that action at this time.
0 commit comments