eden-emu/opus
15
0
Fork 0
mirror of https://github.com/xiph/opus.git synced 2025-06-01 16:17:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixes an aliasing bug in opus_packet_pad()

Browse source 
Trying to add padding in-place breaks when we have extensions,
which causes a memcpy() with overlapping data. Just doing a
copy instead.
This commit is contained in:
Jean-Marc Valin 2024-02-20 14:23:59 -05:00
parent ecc10d835d
commit d9d0e7292f
No known key found for this signature in database
GPG key ID: 5E5DD9A36F9189C8
1 changed files with 14 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/repacketizer.c
View file

@ -121,7 +121,7 @@ opus_int32 opus_repacketizer_out_range_impl(OpusRepacketizer *rp, int begin, int
int ext_begin=0, ext_len=0; int ext_begin=0, ext_len=0;
int ext_count, total_ext_count; int ext_count, total_ext_count;
VARDECL(opus_extension_data, all_extensions); VARDECL(opus_extension_data, all_extensions);
ALLOC_STACK; SAVE_STACK;
if (begin<0 || begin>=end || end>rp->nb_frames) if (begin<0 || begin>=end || end>rp->nb_frames)
{ {
@ -312,6 +312,7 @@ opus_int32 opus_repacketizer_out_range_impl(OpusRepacketizer *rp, int begin, int
while (ptr<data+maxlen) while (ptr<data+maxlen)
*ptr++=0; *ptr++=0;
} }
RESTORE_STACK;
return tot_size; return tot_size;
} }
@ -329,24 +330,32 @@ opus_int32 opus_packet_pad_impl(unsigned char *data, opus_int32 len, opus_int32
{ {
OpusRepacketizer rp; OpusRepacketizer rp;
opus_int32 ret; opus_int32 ret;
VARDECL(unsigned char, copy);
SAVE_STACK;
if (len < 1) if (len < 1)
return OPUS_BAD_ARG; return OPUS_BAD_ARG;
if (len==new_len) if (len==new_len)
return OPUS_OK; return OPUS_OK;
else if (len > new_len) else if (len > new_len)
return OPUS_BAD_ARG; return OPUS_BAD_ARG;
ALLOC(copy, len, unsigned char);
opus_repacketizer_init(&rp); opus_repacketizer_init(&rp);
/* Moving payload to the end of the packet so we can do in-place padding */ /* Moving payload to the end of the packet so we can do in-place padding */
OPUS_MOVE(data+new_len-len, data, len); OPUS_COPY(copy, data, len);
ret = opus_repacketizer_cat(&rp, data+new_len-len, len); ret = opus_repacketizer_cat(&rp, copy, len);
if (ret != OPUS_OK) if (ret != OPUS_OK)
return ret; return ret;
return opus_repacketizer_out_range_impl(&rp, 0, rp.nb_frames, data, new_len, 0, pad, extensions, nb_extensions); ret = opus_repacketizer_out_range_impl(&rp, 0, rp.nb_frames, data, new_len, 0, pad, extensions, nb_extensions);
RESTORE_STACK;
return ret;
} }
int opus_packet_pad(unsigned char *data, opus_int32 len, opus_int32 new_len) int opus_packet_pad(unsigned char *data, opus_int32 len, opus_int32 new_len)
{ {
opus_int32 ret = opus_packet_pad_impl(data, len, new_len, 1, NULL, 0); opus_int32 ret;
ALLOC_STACK;
ret = opus_packet_pad_impl(data, len, new_len, 1, NULL, 0);
RESTORE_STACK;
if (ret > 0) if (ret > 0)
return OPUS_OK; return OPUS_OK;
else else