Merge pull request jgilje#18 from TTKMedia/master

Player crash fixes

src/v2mconv.cpp

@@ -22,13 +22,19 @@ static ssbase readfile(const unsigned char *inptr, const int inlen)
     ssbase base;
     memset(&base, 0, sizeof(base));
 
+    if (inlen < 12) return base;
+
     base.timediv  = (*((uint32_t*)(d)));
     base.timediv2 = 10000*base.timediv;
     base.maxtime  = *((uint32_t*)(d + 4));
     base.gdnum    = *((uint32_t*)(d + 8));
+
     d += 12;
     base.gptr = d;
+
+    if (inlen  - 12 < 10*base.gdnum) return base;
     d += 10*base.gdnum;
+
     for (int ch = 0; ch < 16; ch++)
     {
         ssbase::_basech &c = base.chan[ch];
@@ -73,14 +79,10 @@ static ssbase readfile(const unsigned char *inptr, const int inlen)
         base.spsize = *((uint32_t*)d);
         d += 4;
         base.speechdata = d;
-        if (base.spsize > inlen - (d - inptr))
-        {
-            base.spsize = inlen - (d - inptr);
-        }
         d += base.spsize;
 
         // small sanity check
-        if (base.spsize < 0 || base.spsize > 8192)
+        if (base.spsize < 0 || base.spsize > 8192 || (d - inptr) > inlen)
         {
             base.spsize = 0;
             base.speechdata = 0;

src/v2mplayer.cpp

@@ -148,6 +148,7 @@ void V2MPlayer::Reset()
     m_state.beat  = 0;
     m_state.tick  = 0;
     m_state.smplrem = 0;
+    m_state.cursmpl = 0;
 
     if (m_samplerate)
     {
@@ -309,6 +310,7 @@ void V2MPlayer::Play(uint32_t a_time)
             m_state.smpldelta = -1;
     }
 
+    m_state.cursmpl    = cursmpl;
     m_state.smpldelta -= (destsmpl - cursmpl);
     m_fadeval    = 1.0f;
     m_fadedelta  = 0.0f;

src/v2mplayer.h

@@ -76,10 +76,12 @@ class V2MPlayer
         reinterpret_cast<V2MPlayer*>(a_this)->Render(a_buffer, a_len);
     }
 
-  bool NoEnd();
-  uint32_t Length();
+    bool NoEnd();
 
-  // returns if song is currently playing
+    // returns song length
+    uint32_t Length();
+
+    // returns if song is currently playing
     bool IsPlaying();
 
     #ifdef V2MPLAYER_SYNC_FUNCTIONS