Fixes instances where an array should have been deleted but wasn't. From: Erik Hovland --- mythplugins/mythphone/mythphone/sipfsm.cpp | 4 ++-- mythplugins/mythphone/mythphone/tone.cpp | 2 +- mythplugins/mythphone/mythphone/vxml.cpp | 6 +++--- mythplugins/mythphone/mythphone/wavfile.cpp | 2 +- mythplugins/mythphone/mythphone/webcam.cpp | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/mythplugins/mythphone/mythphone/sipfsm.cpp b/mythplugins/mythphone/mythphone/sipfsm.cpp index 2efbef8..6ea457a 100644 --- a/mythplugins/mythphone/mythphone/sipfsm.cpp +++ b/mythplugins/mythphone/mythphone/sipfsm.cpp @@ -824,7 +824,7 @@ QString SipFsm::DetermineNatAddress() if (resp.contains("200 OK") && !resp.contains("", 1, 1); @@ -839,7 +839,7 @@ QString SipFsm::DetermineNatAddress() VERBOSE(VB_IMPORTANT, "SIP: Got invalid HTML response " "whilst detecting your NAT settings"); - delete httpResponse; + delete [] httpResponse; break; } } diff --git a/mythplugins/mythphone/mythphone/tone.cpp b/mythplugins/mythphone/mythphone/tone.cpp index 8cb8c0a..c01d87f 100644 --- a/mythplugins/mythphone/mythphone/tone.cpp +++ b/mythplugins/mythphone/mythphone/tone.cpp @@ -182,7 +182,7 @@ Tone::~Tone() Stop(); if (toneBuffer) - delete toneBuffer; + delete [] toneBuffer; toneBuffer = 0; } diff --git a/mythplugins/mythphone/mythphone/vxml.cpp b/mythplugins/mythphone/mythphone/vxml.cpp index 80bc8c3..549a1c5 100644 --- a/mythplugins/mythphone/mythphone/vxml.cpp +++ b/mythplugins/mythphone/mythphone/vxml.cpp @@ -327,7 +327,7 @@ bool vxmlParser::loadVxmlPage(QString strUrl, QString Method, QString Namelist, QString firstLine = resp.section('\n', 0); if ((firstLine.contains("200 OK")) && !resp.contains("")) { - delete httpResponse; + delete [] httpResponse; continue; } @@ -335,7 +335,7 @@ bool vxmlParser::loadVxmlPage(QString strUrl, QString Method, QString Namelist, script.setContent(Content); //cout << "Got VXML content\n" << Content << endl; } - delete httpResponse; + delete [] httpResponse; break; } } @@ -845,7 +845,7 @@ void vxmlParser::PlayBeep(int freqHz, int volume, int ms) Rtp->Transmit(beepBuffer, Samples); waitUntilFinished(false); - delete beepBuffer; + delete [] beepBuffer; } diff --git a/mythplugins/mythphone/mythphone/wavfile.cpp b/mythplugins/mythphone/mythphone/wavfile.cpp index 06cf45a..aefbece 100644 --- a/mythplugins/mythphone/mythphone/wavfile.cpp +++ b/mythplugins/mythphone/mythphone/wavfile.cpp @@ -28,7 +28,7 @@ wavfile::wavfile() wavfile::~wavfile() { if (loaded && audio) - delete audio; + delete [] audio; } bool wavfile::load(const char *Filename) diff --git a/mythplugins/mythphone/mythphone/webcam.cpp b/mythplugins/mythphone/mythphone/webcam.cpp index 7a94474..9e345fb 100644 --- a/mythplugins/mythphone/mythphone/webcam.cpp +++ b/mythplugins/mythphone/mythphone/webcam.cpp @@ -219,7 +219,7 @@ void Webcam::camClose() #endif if (picbuff1) - delete picbuff1; + delete [] picbuff1; picbuff1 = 0; }