Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 102631
Collapse All | Expand All

(-)openttd-0.4.0.1/console_cmds.c (-1 / +1 lines)
Lines 1101-1107 DEF_CONSOLE_HOOK(ConProcPlayerName) Link Here
1101
			SEND_COMMAND(PACKET_CLIENT_SET_NAME)(_network_player_name);
1101
			SEND_COMMAND(PACKET_CLIENT_SET_NAME)(_network_player_name);
1102
		} else {
1102
		} else {
1103
			if (NetworkFindName(_network_player_name)) {
1103
			if (NetworkFindName(_network_player_name)) {
1104
				NetworkTextMessage(NETWORK_ACTION_NAME_CHANGE, 1, false, ci->client_name, _network_player_name);
1104
				NetworkTextMessage(NETWORK_ACTION_NAME_CHANGE, 1, false, ci->client_name, "%s", _network_player_name);
1105
				ttd_strlcpy(ci->client_name, _network_player_name, sizeof(ci->client_name));
1105
				ttd_strlcpy(ci->client_name, _network_player_name, sizeof(ci->client_name));
1106
				NetworkUpdateClientInfo(NETWORK_SERVER_INDEX);
1106
				NetworkUpdateClientInfo(NETWORK_SERVER_INDEX);
1107
			}
1107
			}
(-)openttd-0.4.0.1/network.c (-1 / +1 lines)
Lines 96-102 void CDECL NetworkTextMessage(NetworkAct Link Here
96
	StringID TempStr = STR_NULL;
96
	StringID TempStr = STR_NULL;
97
97
98
	va_start(va, str);
98
	va_start(va, str);
99
	vsprintf(buf, str, va);
99
	vsnprintf(buf, sizeof(buf), str, va);
100
	va_end(va);
100
	va_end(va);
101
101
102
	switch (action) {
102
	switch (action) {
(-)openttd-0.4.0.1/network_client.c (-2 / +2 lines)
Lines 344-350 DEF_CLIENT_RECEIVE_COMMAND(PACKET_SERVER Link Here
344
	if (ci != NULL) {
344
	if (ci != NULL) {
345
		if (playas == ci->client_playas && strcmp(name, ci->client_name) != 0) {
345
		if (playas == ci->client_playas && strcmp(name, ci->client_name) != 0) {
346
			// Client name changed, display the change
346
			// Client name changed, display the change
347
			NetworkTextMessage(NETWORK_ACTION_NAME_CHANGE, 1, false, ci->client_name, name);
347
			NetworkTextMessage(NETWORK_ACTION_NAME_CHANGE, 1, false, ci->client_name, "%s", name);
348
		} else if (playas != ci->client_playas) {
348
		} else if (playas != ci->client_playas) {
349
			// The player changed from client-player..
349
			// The player changed from client-player..
350
			// Do not display that for now
350
			// Do not display that for now
Lines 687-693 DEF_CLIENT_RECEIVE_COMMAND(PACKET_SERVER Link Here
687
687
688
	ci = NetworkFindClientInfoFromIndex(index);
688
	ci = NetworkFindClientInfoFromIndex(index);
689
	if (ci != NULL) {
689
	if (ci != NULL) {
690
		NetworkTextMessage(NETWORK_ACTION_LEAVE, 1, false, ci->client_name, str);
690
		NetworkTextMessage(NETWORK_ACTION_LEAVE, 1, false, ci->client_name, "%s", str);
691
691
692
		// The client is gone, give the NetworkClientInfo free
692
		// The client is gone, give the NetworkClientInfo free
693
		ci->client_index = NETWORK_EMPTY_INDEX;
693
		ci->client_index = NETWORK_EMPTY_INDEX;
(-)openttd-0.4.0.1/network_server.c (-2 / +2 lines)
Lines 936-942 DEF_SERVER_RECEIVE_COMMAND(PACKET_CLIENT Link Here
936
936
937
	NetworkGetClientName(client_name, sizeof(client_name), cs);
937
	NetworkGetClientName(client_name, sizeof(client_name), cs);
938
938
939
	NetworkTextMessage(NETWORK_ACTION_LEAVE, 1, false, client_name, str);
939
	NetworkTextMessage(NETWORK_ACTION_LEAVE, 1, false, client_name, "%s", str);
940
940
941
	FOR_ALL_CLIENTS(new_cs) {
941
	FOR_ALL_CLIENTS(new_cs) {
942
		if (new_cs->status > STATUS_AUTH) {
942
		if (new_cs->status > STATUS_AUTH) {
Lines 1111-1117 DEF_SERVER_RECEIVE_COMMAND(PACKET_CLIENT Link Here
1111
	if (ci != NULL) {
1111
	if (ci != NULL) {
1112
		// Display change
1112
		// Display change
1113
		if (NetworkFindName(client_name)) {
1113
		if (NetworkFindName(client_name)) {
1114
			NetworkTextMessage(NETWORK_ACTION_NAME_CHANGE, 1, false, ci->client_name, client_name);
1114
			NetworkTextMessage(NETWORK_ACTION_NAME_CHANGE, 1, false, ci->client_name, "%s", client_name);
1115
			ttd_strlcpy(ci->client_name, client_name, sizeof(ci->client_name));
1115
			ttd_strlcpy(ci->client_name, client_name, sizeof(ci->client_name));
1116
			NetworkUpdateClientInfo(ci->client_index);
1116
			NetworkUpdateClientInfo(ci->client_index);
1117
		}
1117
		}
(-)openttd-0.4.0.1/os2.c (-1 / +1 lines)
Lines 642-648 static long CDECL MidiSendCommand(const Link Here
642
	va_list va;
642
	va_list va;
643
	char buf[512];
643
	char buf[512];
644
	va_start(va, cmd);
644
	va_start(va, cmd);
645
	vsprintf(buf, cmd, va);
645
	vsnprintf(buf, sizeof(buf), cmd, va);
646
	va_end(va);
646
	va_end(va);
647
	return mciSendString(buf, NULL, 0, NULL, 0);
647
	return mciSendString(buf, NULL, 0, NULL, 0);
648
}
648
}
(-)openttd-0.4.0.1/strgen/strgen.c (-2 / +2 lines)
Lines 84-90 void warning(const char *s, ...) { Link Here
84
	char buf[1024];
84
	char buf[1024];
85
	va_list va;
85
	va_list va;
86
	va_start(va, s);
86
	va_start(va, s);
87
	vsprintf(buf, s, va);
87
	vsnprintf(buf, sizeof(buf), s, va);
88
	va_end(va);
88
	va_end(va);
89
	fprintf(stderr, "%d: ERROR: %s\n", _cur_line, buf);
89
	fprintf(stderr, "%d: ERROR: %s\n", _cur_line, buf);
90
	_warnings = true;
90
	_warnings = true;
Lines 94-100 void NORETURN error(const char *s, ...) Link Here
94
	char buf[1024];
94
	char buf[1024];
95
	va_list va;
95
	va_list va;
96
	va_start(va, s);
96
	va_start(va, s);
97
	vsprintf(buf, s, va);
97
	vsnprintf(buf, sizeof(buf), s, va);
98
	va_end(va);
98
	va_end(va);
99
	fprintf(stderr, "%d: FATAL: %s\n", _cur_line, buf);
99
	fprintf(stderr, "%d: FATAL: %s\n", _cur_line, buf);
100
	exit(1);
100
	exit(1);
(-)openttd-0.4.0.1/texteff.c (-1 / +1 lines)
Lines 57-63 void CDECL AddTextMessage(uint16 color, Link Here
57
	int length;
57
	int length;
58
58
59
	va_start(va, message);
59
	va_start(va, message);
60
	vsprintf(buf, message, va);
60
	vsnprintf(buf, sizeof(buf), message, va);
61
	va_end(va);
61
	va_end(va);
62
62
63
	/* Special color magic */
63
	/* Special color magic */
(-)openttd-0.4.0.1/ttd.c (-3 / +3 lines)
Lines 70-76 void CDECL error(const char *s, ...) { Link Here
70
	va_list va;
70
	va_list va;
71
	char buf[512];
71
	char buf[512];
72
	va_start(va, s);
72
	va_start(va, s);
73
	vsprintf(buf, s, va);
73
	vsnprintf(buf, sizeof(buf), s, va);
74
	va_end(va);
74
	va_end(va);
75
75
76
	ShowOSErrorBox(buf);
76
	ShowOSErrorBox(buf);
Lines 86-92 void CDECL ShowInfoF(const char *str, .. Link Here
86
	va_list va;
86
	va_list va;
87
	char buf[1024];
87
	char buf[1024];
88
	va_start(va, str);
88
	va_start(va, str);
89
	vsprintf(buf, str, va);
89
	vsnprintf(buf, sizeof(buf), str, va);
90
	va_end(va);
90
	va_end(va);
91
	ShowInfo(buf);
91
	ShowInfo(buf);
92
}
92
}
Lines 99-105 char * CDECL str_fmt(const char *str, .. Link Here
99
	char *p;
99
	char *p;
100
100
101
	va_start(va, str);
101
	va_start(va, str);
102
	len = vsprintf(buf, str, va);
102
	len = vsnprintf(buf, sizeof(buf), str, va);
103
	va_end(va);
103
	va_end(va);
104
	p = malloc(len + 1);
104
	p = malloc(len + 1);
105
	if (p)
105
	if (p)
(-)openttd-0.4.0.1/win32.c (-1 / +1 lines)
Lines 841-847 static long CDECL MidiSendCommand(const Link Here
841
	char buf[512];
841
	char buf[512];
842
842
843
	va_start(va, cmd);
843
	va_start(va, cmd);
844
	vsprintf(buf, cmd, va);
844
	vsnprintf(buf, sizeof(buf), cmd, va);
845
	va_end(va);
845
	va_end(va);
846
	return mciSendStringA(buf, NULL, 0, 0);
846
	return mciSendStringA(buf, NULL, 0, 0);
847
}
847
}

Return to bug 102631