Fix a formspec crash triggered by ae9b5e00989756bb676429530dfe81039009001c

[minetest.git] / src / httpfetch.h

diff --git a/src/httpfetch.h b/src/httpfetch.h
index f57ed878967d4f887ab75f1bf8449e9d3d9571fe..db43e3a4b8d400eaf6ffe81611ad69b07588a2eb 100644 (file)
--- a/src/httpfetch.h
+++ b/src/httpfetch.h
@@ -17,8 +17,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef HTTPFETCH_HEADER
-#define HTTPFETCH_HEADER
+#pragma once
 
 #include <vector>
 #include "util/string.h"
@@ -31,15 +30,15 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 struct HTTPFetchRequest
 {
-       std::string url;
+       std::string url = "";
 
        // Identifies the caller (for asynchronous requests)
        // Ignored by httpfetch_sync
-       unsigned long caller;
+       unsigned long caller = HTTPFETCH_DISCARD;
 
        // Some number that identifies the request
        // (when the same caller issues multiple httpfetch_async calls)
-       unsigned long request_id;
+       unsigned long request_id = 0;
 
        // Timeout for the whole transfer, in milliseconds
        long timeout;
@@ -49,7 +48,7 @@ struct HTTPFetchRequest
 
        // Indicates if this is multipart/form-data or
        // application/x-www-form-urlencoded.  POST-only.
-       bool multipart;
+       bool multipart = false;
 
        // POST fields.  Fields are escaped properly.
        // If this is empty a GET request is done instead.
@@ -61,7 +60,7 @@ struct HTTPFetchRequest
        // If not empty, should contain entries such as "Accept: text/html"
        std::vector<std::string> extra_headers;
 
-       //useragent to use
+       // useragent to use
        std::string useragent;
 
        HTTPFetchRequest();
@@ -69,34 +68,20 @@ struct HTTPFetchRequest
 
 struct HTTPFetchResult
 {
-       bool succeeded;
-       bool timeout;
-       long response_code;
-       std::string data;
+       bool succeeded = false;
+       bool timeout = false;
+       long response_code = 0;
+       std::string data = "";
        // The caller and request_id from the corresponding HTTPFetchRequest.
-       unsigned long caller;
-       unsigned long request_id;
+       unsigned long caller = HTTPFETCH_DISCARD;
+       unsigned long request_id = 0;
 
-       HTTPFetchResult()
-       {
-               succeeded = false;
-               timeout = false;
-               response_code = 0;
-               data = "";
-               caller = HTTPFETCH_DISCARD;
-               request_id = 0;
-       }
+       HTTPFetchResult() = default;
 
        HTTPFetchResult(const HTTPFetchRequest &fetch_request)
+           : caller(fetch_request.caller), request_id(fetch_request.request_id)
        {
-               succeeded = false;
-               timeout = false;
-               response_code = 0;
-               data = "";
-               caller = fetch_request.caller;
-               request_id = fetch_request.request_id;
        }
-
 };
 
 // Initializes the httpfetch module
@@ -126,8 +111,4 @@ void httpfetch_caller_free(unsigned long caller);
 
 // Performs a synchronous HTTP request. This blocks and therefore should
 // only be used from background threads.
-void httpfetch_sync(const HTTPFetchRequest &fetch_request,
-               HTTPFetchResult &fetch_result);
-
-
-#endif // !HTTPFETCH_HEADER
+void httpfetch_sync(const HTTPFetchRequest &fetch_request, HTTPFetchResult &fetch_result);