fixed bug with potentially changing global variable in thread

[rocksndiamonds.git] / src / files.c

diff --git a/src/files.c b/src/files.c
index bb3832bd082ed26e354eb9fe5234c6299b0f692c..8c37e1c01fde9d33f1583e3e8f25f21f96936dab 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -9002,14 +9002,10 @@ void SaveScore(int nr)
   SaveScoreToFilename(filename);
 }
 
-static void ExecuteAsThread(SDL_ThreadFunction function, char *name, int data,
+static void ExecuteAsThread(SDL_ThreadFunction function, char *name, void *data,
                            char *error)
 {
-  static int data_static;
-
-  data_static = data;
-
-  SDL_Thread *thread = SDL_CreateThread(function, name, &data_static);
+  SDL_Thread *thread = SDL_CreateThread(function, name, data);
 
   if (thread != NULL)
     SDL_DetachThread(thread);
@@ -9098,17 +9094,28 @@ static void DownloadServerScoreToCache(int nr)
   checked_free(response);
 }
 
-static int DownloadServerScoreToCacheThread(void *data)
+struct DownloadServerScoreToCacheThreadData
 {
-  DownloadServerScoreToCache(*(int *)data);
+  int level_nr;
+};
+
+static int DownloadServerScoreToCacheThread(void *data_raw)
+{
+  struct DownloadServerScoreToCacheThreadData *data = data_raw;
+
+  DownloadServerScoreToCache(data->level_nr);
 
   return 0;
 }
 
 static void DownloadServerScoreToCacheAsThread(int nr)
 {
+  static struct DownloadServerScoreToCacheThreadData data;
+
+  data.level_nr = nr;
+
   ExecuteAsThread(DownloadServerScoreToCacheThread,
-                 "DownloadServerScoreToCache", nr,
+                 "DownloadServerScoreToCache", &data,
                  "download scores from server");
 }
 
@@ -9276,6 +9283,8 @@ static void UploadScoreToServerExt(struct HttpRequest *request,
   char *levelset_identifier = getEscapedJSON(leveldir_current->identifier);
   char *levelset_name       = getEscapedJSON(leveldir_current->name);
   char *levelset_author     = getEscapedJSON(leveldir_current->author);
+  char *level_name          = getEscapedJSON(level.name);
+  char *level_author        = getEscapedJSON(level.author);
   char *player_name         = getEscapedJSON(score_entry->name);
 
   snprintf(request->body, MAX_HTTP_BODY_SIZE,
@@ -9287,6 +9296,9 @@ static void UploadScoreToServerExt(struct HttpRequest *request,
           "  \"levelset_num_levels\":  \"%d\",\n"
           "  \"levelset_first_level\": \"%d\",\n"
           "  \"level_nr\":             \"%d\",\n"
+          "  \"level_name\":           \"%s\",\n"
+          "  \"level_author\":         \"%s\",\n"
+          "  \"rate_time_over_score\": \"%d\",\n"
           "  \"player_name\":          \"%s\",\n"
           "  \"score\":                \"%d\",\n"
           "  \"time\":                 \"%d\",\n"
@@ -9299,7 +9311,10 @@ static void UploadScoreToServerExt(struct HttpRequest *request,
           levelset_author,
           leveldir_current->levels,
           leveldir_current->first_level,
-          level_nr,
+          nr,
+          level_name,
+          level_author,
+          level.rate_time_over_score,
           player_name,
           score_entry->score,
           score_entry->time,
@@ -9311,6 +9326,8 @@ static void UploadScoreToServerExt(struct HttpRequest *request,
   checked_free(levelset_identifier);
   checked_free(levelset_name);
   checked_free(levelset_author);
+  checked_free(level_name);
+  checked_free(level_author);
   checked_free(player_name);
 
   ConvertHttpRequestBodyToServerEncoding(request);
@@ -9343,17 +9360,28 @@ static void UploadScoreToServer(int nr)
   checked_free(response);
 }
 
-static int UploadScoreToServerThread(void *data)
+struct UploadScoreToServerThreadData
+{
+  int level_nr;
+};
+
+static int UploadScoreToServerThread(void *data_raw)
 {
-  UploadScoreToServer(*(int *)data);
+  struct UploadScoreToServerThreadData *data = data_raw;
+
+  UploadScoreToServer(data->level_nr);
 
   return 0;
 }
 
 static void UploadScoreToServerAsThread(int nr)
 {
+  static struct UploadScoreToServerThreadData data;
+
+  data.level_nr = nr;
+
   ExecuteAsThread(UploadScoreToServerThread,
-                 "UploadScoreToServer", nr,
+                 "UploadScoreToServer", &data,
                  "upload score to server");
 }