Commit fcead451 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

stream_ReadLine: bytes per char is either 1 or 2

parent 62d1845e
...@@ -1573,8 +1573,7 @@ char *stream_ReadLine( stream_t *s ) ...@@ -1573,8 +1573,7 @@ char *stream_ReadLine( stream_t *s )
const uint8_t *p = p_data; const uint8_t *p = p_data;
const uint8_t *p_last = p + i_data - s->p_text->i_char_width; const uint8_t *p_last = p + i_data - s->p_text->i_char_width;
if( s->p_text->i_char_width == 2 ) assert( s->p_text->i_char_width == 2 );
{
if( s->p_text->b_little_endian == true) if( s->p_text->b_little_endian == true)
{ {
/* UTF-16LE: 0A 00 <LF> */ /* UTF-16LE: 0A 00 <LF> */
...@@ -1587,7 +1586,6 @@ char *stream_ReadLine( stream_t *s ) ...@@ -1587,7 +1586,6 @@ char *stream_ReadLine( stream_t *s )
while( p <= p_last && ( p[1] != 0x0A || p[0] != 0x00 ) ) while( p <= p_last && ( p[1] != 0x0A || p[0] != 0x00 ) )
p += 2; p += 2;
} }
}
if( p > p_last ) if( p > p_last )
{ {
...@@ -1595,7 +1593,7 @@ char *stream_ReadLine( stream_t *s ) ...@@ -1595,7 +1593,7 @@ char *stream_ReadLine( stream_t *s )
} }
else else
{ {
psz_eol = (char *)p + ( s->p_text->i_char_width - 1 ); psz_eol = (char *)p + 1;
} }
} }
......
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