actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Prevent setting the position of a nullptr

Browse Source 
Also implemented copy just in case
This commit is contained in:
sukibaby
2024-06-09 21:07:49 -07:00
committed by teejusb
parent 339aafcd65
commit 47ff2cf095
1 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/RageSoundReader_Chain.cpp
+21 -10
View File
@@ -42,8 +42,16 @@ RageSoundReader_Chain::~RageSoundReader_Chain()
RageSoundReader_Chain *RageSoundReader_Chain::Copy() const
{
// XXX
FAIL_M("unimplemented");
RageSoundReader_Chain* copy = new RageSoundReader_Chain();
copy->m_iPreferredSampleRate = this->m_iPreferredSampleRate;
copy->m_iActualSampleRate = this->m_iActualSampleRate;
copy->m_iChannels = this->m_iChannels;
copy->m_iCurrentFrame = this->m_iCurrentFrame;
copy->m_iNextSound = this->m_iNextSound;
copy->m_apActiveSounds = this->m_apActiveSounds; // Shallow copy
copy->m_apLoadedSounds = this->m_apLoadedSounds; // Shallow copy
copy->m_aSounds = this->m_aSounds; // Shallow copy
return copy;
}
/* The same sound may be used several times, and by several different chains. Avoid
@@ -200,15 +208,18 @@ int RageSoundReader_Chain::SetPosition( int iFrame )
break;
/* Find the RageSoundReader. */
ActivateSound( pSound );
RageSoundReader *pReader = pSound->pSound;
int iOffsetFrames = iFrame - iOffsetFrame;
if( pReader->SetPosition(iOffsetFrames) == 0 )
if (pSound->pSound == nullptr) // Only activate if not already active
{
/* We're past the end of this sound. */
ReleaseSound( pSound );
continue;
ActivateSound(pSound);
RageSoundReader* pReader = pSound->pSound;
int iOffsetFrames = iFrame - iOffsetFrame;
if (pReader->SetPosition(iOffsetFrames) == 0)
{
/* We're past the end of this sound. */
ReleaseSound(pSound);
continue;
}
}
}