Browse Source

meta_engine: taglib: reject read on failed seek

pull/112/head
Francois Cartegnie 6 years ago
parent
commit
837b583e4e
  1. 19
      modules/meta_engine/taglib.cpp

19
modules/meta_engine/taglib.cpp

@ -156,6 +156,7 @@ public:
VlcIostream(stream_t* p_stream)
: m_stream( p_stream )
, m_previousPos( 0 )
, m_borked( false )
{
}
@ -173,6 +174,8 @@ public:
ByteVector readBlock(ulong length)
{
if(m_borked)
return ByteVector::null;
ByteVector res(length, 0);
ssize_t i_read = vlc_stream_Read( m_stream, res.data(), length);
if (i_read < 0)
@ -209,18 +212,29 @@ public:
void seek(long offset, Position p)
{
uint64_t pos = 0;
long len;
switch (p)
{
case Current:
pos = m_previousPos;
break;
case End:
pos = length();
len = length();
if(len > -1)
{
pos = len;
}
else
{
m_borked = true;
return;
}
break;
default:
break;
}
if (vlc_stream_Seek( m_stream, pos + offset ) == 0)
m_borked = (vlc_stream_Seek( m_stream, pos + offset ) != 0);
if(!m_borked)
m_previousPos = pos + offset;
}
@ -249,6 +263,7 @@ public:
private:
stream_t* m_stream;
int64_t m_previousPos;
bool m_borked;
};
static int ExtractCoupleNumberValues( vlc_meta_t* p_meta, const char *psz_value,

Loading…
Cancel
Save