Cleanup .desktop file

[quix0rs-blobwars.git] / src / CMedalServer.cpp

diff --git a/src/CMedalServer.cpp b/src/CMedalServer.cpp
index 0cd6272fa8200173f41c75135191f40492d6bdd1..c3ac38230ce4f03a6cc73ddee5f030ac4a4076c6 100644 (file)
--- a/src/CMedalServer.cpp
+++ b/src/CMedalServer.cpp
@@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
 #include "headers.h"
-#include "SDL_mutex.h"
+#include <SDL/SDL_mutex.h>
 
 MedalServer::MedalServer()
 {
@@ -28,8 +28,8 @@ MedalServer::MedalServer()
        connected = false;
        gotRuby = false;
        
-       strcpy(message, "");
-       strcpy(rubyMessage, "");
+       message[0] = 0;
+       rubyMessage[0] = 0;
 }
 
 MedalServer::~MedalServer()
@@ -50,7 +50,7 @@ bool MedalServer::connect(const char *privateKey)
        
        debug(("Connected %s to %s:%d\n", privateKey, MEDAL_SERVER_HOST, MEDAL_SERVER_PORT));
        
-       strcpy(this->privateKey, privateKey);
+       strlcpy(this->privateKey, privateKey, sizeof this->privateKey);
        connected = true;
        
        return true;
@@ -70,7 +70,7 @@ int MedalServer::postMedal(const char *str)
        char *store;
        
        char medal[128];
-       strcpy(medal, str);
+       strlcpy(medal, str, sizeof medal);
        
        for (unsigned int i = 0 ; i < strlen(medal) ; i++)
        {
@@ -90,10 +90,9 @@ int MedalServer::postMedal(const char *str)
                return 0;
        }
        
-       char *in = new char[1024];
        char out[1024];
        
-       sprintf(out, "GET /addMedal/%s/MBS_%s HTTP/1.1\nHost: %s\nUser-Agent:BWMBS%.2f-%d\n\n", privateKey, medal, MEDAL_SERVER_HOST, VERSION, RELEASE);
+       snprintf(out, sizeof out, "GET /addMedal/%s/MBS_%s HTTP/1.1\nHost: %s\nUser-Agent:BWMBS%.2f-%d\n\n", privateKey, medal, MEDAL_SERVER_HOST, VERSION, RELEASE);
        
        //printf("%s\n", out);
        
@@ -108,6 +107,8 @@ int MedalServer::postMedal(const char *str)
                return 0;
        }
        
+       char *in = new char[1024];
+
        SDLNet_TCP_Recv(socket, in, 512);
        
        //printf("%s\n", in);
@@ -123,7 +124,7 @@ int MedalServer::postMedal(const char *str)
                        
                        if (response == 4)
                        {
-                               strcpy(rubyMessage, message);
+                               strlcpy(rubyMessage, message, sizeof rubyMessage);
                                gotRuby = true;
                        }
                        else
@@ -137,7 +138,7 @@ int MedalServer::postMedal(const char *str)
        
        debug(("MedalServer Response: %d '%s'\n", response, message))
        
-       delete in;
+       delete[] in;
        
        SDLNet_TCP_Close(socket);