Commit 5cc28812 authored by reimar's avatar reimar

Use bytestream_get_le16 to simplify offset/count calculation for mszh decompression.


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@19051 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 7ae78fa7
...@@ -43,6 +43,7 @@ ...@@ -43,6 +43,7 @@
#include "avcodec.h" #include "avcodec.h"
#include "get_bits.h" #include "get_bits.h"
#include "bytestream.h"
#include "lcl.h" #include "lcl.h"
#if CONFIG_ZLIB_DECODER #if CONFIG_ZLIB_DECODER
...@@ -96,10 +97,8 @@ static unsigned int mszh_decomp(unsigned char * srcptr, int srclen, unsigned cha ...@@ -96,10 +97,8 @@ static unsigned int mszh_decomp(unsigned char * srcptr, int srclen, unsigned cha
destptr += 4; destptr += 4;
srcptr += 4; srcptr += 4;
} else { } else {
ofs = *srcptr++; ofs = bytestream_get_le16(&srcptr);
cnt = *srcptr++; cnt = (ofs >> 11) + 1;
ofs += cnt * 256;
cnt = (cnt >> 3) + 1;
ofs &= 0x7ff; ofs &= 0x7ff;
cnt *= 4; cnt *= 4;
if (destptr_end - destptr < cnt) { if (destptr_end - destptr < cnt) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment