XQF/xqf
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

it's an array of char, not an array of pointers

Browse Source
This commit is contained in:
Thomas Debesse 2014-11-09 02:42:35 +01:00
parent e69d6bfadb
commit 96dafb20dc
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/game.c
View File

@ -715,8 +715,8 @@ static void quake_parse_server (char *token[], int n, struct server *server) {
server->name = g_strdup (token[2]); server->name = g_strdup (token[2]);
} }
else { else {
server->name = g_malloc0 (sizeof(char*) * strlen (token[2])); server->name = g_malloc0 (sizeof (char) * strlen (token[2]) + 1);
debug(6, "maxsize:%d", (int) (sizeof(char*) * strlen (token[2]))); debug(6, "maxsize:%d", (int) (sizeof (char) * strlen (token[2]) + 1));
q3_unescape (server->name, token[2]); q3_unescape (server->name, token[2]);
} }
} }
@ -1317,7 +1317,7 @@ static char *jk3_gametypes[MAX_JK3_TYPES] = {
#define MAX_ZEQ2LITE_TYPES 1 #define MAX_ZEQ2LITE_TYPES 1
static char *zeq2lite_gametypes[MAX_ZEQ2LITE_TYPES] = { static char *zeq2lite_gametypes[MAX_ZEQ2LITE_TYPES] = {
"Struggle" // 0 - Struggle "Struggle" // 0 - Struggle
}; };
struct q3a_gametype_s { struct q3a_gametype_s {
@ -1839,7 +1839,7 @@ static void q3_analyze_serverinfo (struct server *s) {
if (s->type == COD_SERVER) { if (s->type == COD_SERVER) {
if (s->gametype) { if (s->gametype) {
// unescape in place, for backward compatibility // unescape in place, for backward compatibility
gchar* tmp_gametype = g_malloc0 (sizeof(gchar*) * strlen (s->gametype)); gchar* tmp_gametype = g_malloc0 (sizeof (gchar) * strlen (s->gametype) + 1);
q3_unescape(tmp_gametype, s->gametype); q3_unescape(tmp_gametype, s->gametype);
strcpy(s->gametype, tmp_gametype); strcpy(s->gametype, tmp_gametype);
g_free(tmp_gametype); g_free(tmp_gametype);