Ticket #3927: mythsoap-null-terminate.2.patch

mythmovies/ignyte/mythsoap.cpp

@@ -1 @@
-#include <mythtv/mythcontext.h>
-
 #include "mythsoap.h"
+#include <iostream>
 
 void MythSoap::doSoapRequest(QString host, QString path, QString soapAction,
                              QString query)
@@ -35 +34 @@
 
 void MythSoap::httpDone(bool error)
 {
+    using namespace std;
     if (error)
     {
         cerr << "Error in mythsoap.o retrieving data: " << http.errorString() << endl << flush;
+        m_error = true;
     }
     else
     {
-        m_data = http.readAll();
-        //cout << "Data: " << m_data.data() << endl << flush;
+        const Q_ULONG len = http.bytesAvailable();
+        // QMemArray::assign() will own this so we don't have to delete it
+        char* buffer = new char[len + 1];
+        if(buffer) {
+            http.readBlock(buffer, len);
+            buffer[len] = '\0';
+            m_data.assign(buffer, len + 1);
+            //cout << "Data: " << m_data.data() << endl << flush;
+        } else {
+            cerr << "Failed to alloc memory in mythsoap.o" << endl;
+        }
     }
     m_done = true;
 }

mythmovies/ignyte/mythsoap.h

@@ -12 +12 @@
         QByteArray getResponseData();
         bool isDone();
         bool hasError();
+        inline QString getError() const { return http.errorString(); }
         MythSoap();
 
     private: