File tree Expand file tree Collapse file tree 2 files changed +41
-0
lines changed
Expand file tree Collapse file tree 2 files changed +41
-0
lines changed Original file line number Diff line number Diff line change 1+ Fortify catches a possible strcpy overcopy, throw more space at it
2+
3+ --- a/src/server/contact.c 2010-05-24 14:51:41.000000000 +0200
4+ +++ b/src/server/contact.c 2025-03-23 12:15:36.426805646 +0100
5+ @@ -58,11 +58,11 @@
6+
7+ struct queued_player {
8+ struct queued_player *next;
9+ - char real_name[MAX_CHARS];
10+ - char nick_name[MAX_CHARS];
11+ - char disp_name[MAX_CHARS];
12+ - char host_name[MAX_CHARS];
13+ - char host_addr[24];
14+ + char real_name[MAX_CHARS + 32];
15+ + char nick_name[MAX_CHARS + 32];
16+ + char disp_name[MAX_CHARS + 32];
17+ + char host_name[MAX_CHARS + 32];
18+ + char host_addr[1056];
19+ int32_t port;
20+ team_t *team;
21+ uint32_t version;
22+ @@ -271,12 +271,12 @@
23+ uint32_t my_magic;
24+ uint16_t port;
25+ char ch;
26+ - char real_name[MAX_CHARS];
27+ - char disp_name[MAX_CHARS];
28+ - char nick_name[MAX_CHARS];
29+ - char host_name[MAX_CHARS];
30+ - char host_addr[24];
31+ - char str[MSG_LEN];
32+ + char real_name[MAX_CHARS + 32 ];
33+ + char disp_name[MAX_CHARS + 32 ];
34+ + char nick_name[MAX_CHARS + 32 ];
35+ + char host_name[MAX_CHARS + 32 ];
36+ + char host_addr[1056];
37+ + char str[MSG_LEN + 32];
38+
39+ /*
40+ * Someone connected to us, now try and decipher the message :)
Original file line number Diff line number Diff line change @@ -20,6 +20,7 @@ stdenv.mkDerivation rec {
2020
2121 patches = [
2222 ./server-gcc5.patch
23+ ./bloodspilot-server-strcpy-fix.patch
2324 ] ;
2425
2526 meta = with lib ; {
You can’t perform that action at this time.
0 commit comments