mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
Fix cast of byte buffer to uint32 that was disregarding alignment
requirements. Now calculates crc byte at a time until aligned, then continues with uint32 optimized calculation. This fixes crashes during mlp decoding on sparc (at least, maybe others). Originally committed as revision 19160 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
be43ae6651
commit
d468ff0fdf
@ -115,7 +115,10 @@ uint32_t av_crc(const AVCRC *ctx, uint32_t crc, const uint8_t *buffer, size_t le
|
||||
const uint8_t *end= buffer+length;
|
||||
|
||||
#if !CONFIG_SMALL
|
||||
if(!ctx[256])
|
||||
if(!ctx[256]) {
|
||||
while(((intptr_t) buffer & 3) && buffer < end)
|
||||
crc = ctx[((uint8_t)crc) ^ *buffer++] ^ (crc >> 8);
|
||||
|
||||
while(buffer<end-3){
|
||||
crc ^= le2me_32(*(const uint32_t*)buffer); buffer+=4;
|
||||
crc = ctx[3*256 + ( crc &0xFF)]
|
||||
@ -123,6 +126,7 @@ uint32_t av_crc(const AVCRC *ctx, uint32_t crc, const uint8_t *buffer, size_t le
|
||||
^ctx[1*256 + ((crc>>16)&0xFF)]
|
||||
^ctx[0*256 + ((crc>>24) )];
|
||||
}
|
||||
}
|
||||
#endif
|
||||
while(buffer<end)
|
||||
crc = ctx[((uint8_t)crc) ^ *buffer++] ^ (crc >> 8);
|
||||
|
Loading…
Reference in New Issue
Block a user