Don't manage _sendData's memory

Clement committed 7 years ago

Commit b2704da1 parent ec9d1372 files · +20 −33Browse files

Showing the changes to libraries/script-engine/src/XMLHttpRequestClass.cpp (1 of 2 files). Show all

Unified · Split

libraries/script-engine/src/XMLHttpRequestClass.cpp+10−23

 XMLHttpRequestClass::XMLHttpRequestClass(QScriptEngine* engine) :
     _engine(engine),
-    _async(true),
+    _timer(this) {
-    _url(),
-    _method(""),
-    _responseType(""),
-    _request(),
-    _reply(NULL),
-    _sendData(NULL),
-    _rawResponseData(),
-    _responseData(""),
-    _onTimeout(QScriptValue::NullValue),
-    _onReadyStateChange(QScriptValue::NullValue),
-    _readyState(XMLHttpRequestClass::UNSENT),
-    _errorCode(QNetworkReply::NoError),
-    _timeout(0),
-    _timer(this),
-    _numRedirects(0) {
     _request.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true);
     _timer.setSingleShot(true);
 }
 XMLHttpRequestClass::~XMLHttpRequestClass() {
-    if (_reply) { delete _reply; }
+    if (_reply) { _reply->deleteLater(); }
-    if (_sendData) { delete _sendData; }
 }
 QScriptValue XMLHttpRequestClass::constructor(QScriptContext* context, QScriptEngine* engine) {
 void XMLHttpRequestClass::send(const QScriptValue& data) {
     if (_readyState == OPENED && !_reply) {
         if (!data.isNull()) {
-            _sendData = new QBuffer(this);
             if (data.isObject()) {
-                QByteArray ba = qscriptvalue_cast<QByteArray>(data);
+                _sendData = qscriptvalue_cast<QByteArray>(data);
-                _sendData->setData(ba);
             } else {
-                _sendData->setData(data.toString().toUtf8());
+                _sendData = data.toString().toUtf8();
             }
         }
         }
     }
+    disconnectFromReply(_reply);
+    _reply->deleteLater();
+    _reply = nullptr;
     setReadyState(DONE);
     emit requestComplete();
 }
         disconnectFromReply(_reply);
         _reply->abort();
         _reply->deleteLater();
-        _reply = NULL;
+        _reply = nullptr;
     }
 }