[vlc-devel] [PATCH] stream: error out on a failed conversion

[Rémi Denis-Courmont]

On vendredi 23 juin 2017 17:59:59 EEST Thomas Guillem wrote:
> On Fri, Jun 23, 2017, at 17:55, Rémi Denis-Courmont wrote:
> > On vendredi 23 juin 2017 15:27:53 EEST Shaleen wrote:
> > > From 96521880d5cd05a6ebba077dde47cc9c26c1d008 Mon Sep 17 00:00:00 2001
> > > From: Shaleen Jain <shaleen.jain95 at gmail.com>
> > > Date: Fri, 23 Jun 2017 15:26:40 +0530
> > > Subject: [PATCH] stream: error out on a failed conversion
> > > 
> > > ---
> > > 
> > >  src/input/stream.c | 4 +++-
> > >  1 file changed, 3 insertions(+), 1 deletion(-)
> > > 
> > > diff --git a/src/input/stream.c b/src/input/stream.c
> > > index affc7b2c0d..a7ea3bfa43 100644
> > > --- a/src/input/stream.c
> > > +++ b/src/input/stream.c
> > > @@ -327,10 +327,12 @@ char *vlc_stream_ReadLine( stream_t *s )
> > > 
> > >              p_in = p_line;
> > >              p_out = psz_new_line;
> > > 
> > > -            if( vlc_iconv( priv->text.conv, &p_in, &i_in, &p_out,
> > > &i_out )
> > > == (size_t)-1 )
> > > +            if( priv->text.conv == (vlc_iconv_t)-1 ||
> > 
> > AFAICT, that's logically impossible now.
> 
> Ah ? I think it's possible if you first call vlc_stream_ReadLine() after
> a seek.
> (OK, you have to be dumb to do that, so maybe we can put an assert
> instead)

How do you get to the multibyte branch in that case? AFAICT, VLC only ever 
probed for UTF-16 at offset 0.

And I don't think it's necessarily dumb. It would make sense if a file format 
would mix binary and monobyte text,

-- 
Rémi