A few files that have dynamically allocated arrays that are not properly

de-allocated (forgot to use []).

3 files changed, 3 insertions, 3 deletions

diff --git a/core/multimedia/opieplayer/modplug/load_amf.cpp b/core/multimedia/opieplayer/modplug/load_amf.cpp
index 188b5f5..2cf131b 100644
--- a/core/multimedia/opieplayer/modplug/load_amf.cpp
+++ b/core/multimedia/opieplayer/modplug/load_amf.cpp
@@ -381,40 +381,40 @@ BOOL CSoundFile::ReadAMF(LPCBYTE lpStream, DWORD dwMemLength)
         }
         // Create the patterns from the list of tracks
         for (UINT iPat=0; iPat<pfh->numorders; iPat++)
         {
                 MODCOMMAND *p = AllocatePattern(PatternSize[iPat], m_nChannels);
                 if (!p) break;
                 Patterns[iPat] = p;
                 for (UINT iChn=0; iChn<m_nChannels; iChn++)
                 {
                         UINT nTrack = ptracks[iPat][iChn];
                         if ((nTrack) && (nTrack <= pfh->numtracks))
                         {
                                 UINT realtrk = pTrackMap[nTrack-1];
                                 if (realtrk)
                                 {
                                         realtrk--;
                                         if ((realtrk < realtrackcnt) && (pTrackData[realtrk]))
                                         {
                                                 AMF_Unpack(p+iChn, pTrackData[realtrk], PatternSize[iPat], m_nChannels);
                                         }
                                 }
                         }
                 }
         }
-        delete pTrackData;
+        delete [] pTrackData;
         // Read Sample Data
         for (UINT iSeek=1; iSeek<=maxsampleseekpos; iSeek++)
         {
                 if (dwMemPos >= dwMemLength) break;
                 for (UINT iSmp=0; iSmp<m_nSamples; iSmp++) if (iSeek == sampleseekpos[iSmp])
                 {
                         MODINSTRUMENT *pins = &Ins[iSmp+1];
                         dwMemPos += ReadSample(pins, RS_PCM8U, (LPCSTR)(lpStream+dwMemPos), dwMemLength-dwMemPos);
                         break;
                 }
         }
         return TRUE;
 }
 
 
diff --git a/core/multimedia/opieplayer/modplug/load_ams.cpp b/core/multimedia/opieplayer/modplug/load_ams.cpp
index 3dd1c2b..ad1cc01 100644
--- a/core/multimedia/opieplayer/modplug/load_ams.cpp
+++ b/core/multimedia/opieplayer/modplug/load_ams.cpp
@@ -605,27 +605,27 @@ void AMSUnpack(const char *psrc, UINT inputlen, char *pdest, UINT dmax, char pac
                                 UINT bl = al & bitcount;
                                 bl = ((bl|(bl<<8)) >> ((dh+8-count) & 7)) & 0xFF;
                                 bitcount = ((bitcount|(bitcount<<8)) >> 1) & 0xFF;
                                 pdest[k++] |= bl;
                                 if (k >= dmax)
                                 {
                                         k = 0;
                                         dh++;
                                 }
                         }
                         bitcount = ((bitcount|(bitcount<<8)) >> dh) & 0xFF;
                 }
         }
         // Delta Unpack
         {
                 signed char old = 0;
                 for (UINT i=0; i<dmax; i++)
                 {
                         int pos = ((LPBYTE)pdest)[i];
                         if ((pos != 128) && (pos & 0x80)) pos = -(pos & 0x7F);
                         old -= (signed char)pos;
                         pdest[i] = old;
                 }
         }
-        delete amstmp;
+        delete [] amstmp;
 }
 
diff --git a/core/multimedia/opieplayer/modplug/load_mdl.cpp b/core/multimedia/opieplayer/modplug/load_mdl.cpp
index 806b68b..e1f78d5 100644
--- a/core/multimedia/opieplayer/modplug/load_mdl.cpp
+++ b/core/multimedia/opieplayer/modplug/load_mdl.cpp
@@ -224,49 +224,49 @@ BOOL CSoundFile::ReadMDL(const BYTE *lpStream, DWORD dwMemLength)
                         pmib = (MDLINFOBLOCK *)(lpStream+dwMemPos);
                         memcpy(m_szNames[0], pmib->songname, 32);
                         norders = pmib->norders;
                         if (norders > MAX_ORDERS) norders = MAX_ORDERS;
                         m_nRestartPos = pmib->repeatpos;
                         m_nDefaultGlobalVolume = pmib->globalvol;
                         m_nDefaultTempo = pmib->tempo;
                         m_nDefaultSpeed = pmib->speed;
                         m_nChannels = 4;
                         for (i=0; i<32; i++)
                         {
                                 ChnSettings[i].nVolume = 64;
                                 ChnSettings[i].nPan = (pmib->channelinfo[i] & 0x7F) << 1;
                                 if (pmib->channelinfo[i] & 0x80)
                                         ChnSettings[i].dwFlags |= CHN_MUTE;
                                 else
                                         m_nChannels = i+1;
                         }
                         for (j=0; j<norders; j++) Order[j] = pmib->seq[j];
                         break;
                 // ME: song message
                 case 0x454D:
                         if (blocklen)
                         {
-                                if (m_lpszSongComments) delete m_lpszSongComments;
+                                if (m_lpszSongComments) delete [] m_lpszSongComments;
                                 m_lpszSongComments = new char[blocklen];
                                 if (m_lpszSongComments)
                                 {
                                         memcpy(m_lpszSongComments, lpStream+dwMemPos, blocklen);
                                         m_lpszSongComments[blocklen-1] = 0;
                                 }
                         }
                         break;
                 // PA: Pattern Data
                 case 0x4150:
                         npatterns = lpStream[dwMemPos];
                         if (npatterns > MAX_PATTERNS) npatterns = MAX_PATTERNS;
                         dwPos = dwMemPos + 1;
                         for (i=0; i<npatterns; i++)
                         {
                                 if (dwPos+18 >= dwMemLength) break;
                                 pmpd = (MDLPATTERNDATA *)(lpStream + dwPos);
                                 if (pmpd->channels > 32) break;
                                 PatternSize[i] = pmpd->lastrow+1;
                                 if (m_nChannels < pmpd->channels) m_nChannels = pmpd->channels;
                                 dwPos += 18 + 2*pmpd->channels;
                                 for (j=0; j<pmpd->channels; j++)
                                 {
                                         patterntracks[i*32+j] = pmpd->data[j];