Commit 46b4019b authored by Baptiste Coudurier's avatar Baptiste Coudurier

fix get_str16_nolen with odd len, fix #1065

Originally committed as revision 18929 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent c9d7cd6d
...@@ -122,11 +122,12 @@ static void get_str16(ByteIOContext *pb, char *buf, int buf_size) ...@@ -122,11 +122,12 @@ static void get_str16(ByteIOContext *pb, char *buf, int buf_size)
static void get_str16_nolen(ByteIOContext *pb, int len, char *buf, int buf_size) static void get_str16_nolen(ByteIOContext *pb, int len, char *buf, int buf_size)
{ {
char* q = buf; char* q = buf;
len /= 2; for (; len > 1; len -= 2) {
while (len--) {
uint8_t tmp; uint8_t tmp;
PUT_UTF8(get_le16(pb), tmp, if (q - buf < buf_size - 1) *q++ = tmp;) PUT_UTF8(get_le16(pb), tmp, if (q - buf < buf_size - 1) *q++ = tmp;)
} }
if (len > 0)
url_fskip(pb, len);
*q = '\0'; *q = '\0';
} }
......
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