Details | Last modification | View Log | RSS feed
| Rev | Author | Line No. | Line |
|---|---|---|---|
| 34 | magnus | 1 | Author: Magnus Holmgren <holmgren@debian.org> |
| 2 | Description: Fix format-security warnings/errors |
||
| 3 | Replaces fprintf(stderr, str) with fputs(str, stderr) (where str in |
||
| 4 | most cases is argv[0]) and also one instance of sprintf (without |
||
| 5 | format string) with snprintf (with format string). |
||
| 6 | |||
| 7 | --- a/vnc_unixsrc/vncviewer/sockets.c |
||
| 8 | +++ b/vnc_unixsrc/vncviewer/sockets.c |
||
| 9 | @@ -482,7 +482,7 @@ fprintf(stderr, "R0: %06d\n", (int) dn); |
||
| 10 | ProcessXtEvents(); |
||
| 11 | i = 0; |
||
| 12 | } else { |
||
| 13 | - fprintf(stderr,programName); |
||
| 14 | + fputs(programName,stderr); |
||
| 15 | perror(": read"); |
||
| 16 | return False; |
||
| 17 | } |
||
| 18 | @@ -514,7 +514,7 @@ fprintf(stderr, "R1: %06d %06d %10.2f KB |
||
| 19 | ProcessXtEvents(); |
||
| 20 | i = 0; |
||
| 21 | } else { |
||
| 22 | - fprintf(stderr,programName); |
||
| 23 | + fputs(programName,stderr); |
||
| 24 | perror(": read"); |
||
| 25 | return False; |
||
| 26 | } |
||
| 27 | @@ -569,13 +569,13 @@ WriteExact(int sock, char *buf, int n) |
||
| 28 | FD_SET(rfbsock,&fds); |
||
| 29 | |||
| 30 | if (select(rfbsock+1, NULL, &fds, NULL, NULL) <= 0) { |
||
| 31 | - fprintf(stderr,programName); |
||
| 32 | + fputs(programName,stderr); |
||
| 33 | perror(": select"); |
||
| 34 | return False; |
||
| 35 | } |
||
| 36 | j = 0; |
||
| 37 | } else { |
||
| 38 | - fprintf(stderr,programName); |
||
| 39 | + fputs(programName,stderr); |
||
| 40 | perror(": write"); |
||
| 41 | return False; |
||
| 42 | } |
||
| 43 | @@ -608,13 +608,13 @@ ConnectToUnixSocket(char *file) { |
||
| 44 | |||
| 45 | sock = socket(AF_UNIX, SOCK_STREAM, 0); |
||
| 46 | if (sock < 0) { |
||
| 47 | - fprintf(stderr,programName); |
||
| 48 | + fputs(programName,stderr); |
||
| 49 | perror(": ConnectToUnixSocket: socket"); |
||
| 50 | return -1; |
||
| 51 | } |
||
| 52 | |||
| 53 | if (connect(sock, (struct sockaddr *)&addr, sizeof(addr)) < 0) { |
||
| 54 | - fprintf(stderr, programName); |
||
| 55 | + fputs(programName,stderr); |
||
| 56 | perror(": ConnectToUnixSocket: connect"); |
||
| 57 | close(sock); |
||
| 58 | return -1; |
||
| 59 | @@ -880,7 +880,7 @@ FindFreeTcpPort(void) |
||
| 60 | |||
| 61 | sock = socket(AF_INET, SOCK_STREAM, 0); |
||
| 62 | if (sock < 0) { |
||
| 63 | - fprintf(stderr,programName); |
||
| 64 | + fputs(programName,stderr); |
||
| 65 | perror(": FindFreeTcpPort: socket"); |
||
| 66 | return 0; |
||
| 67 | } |
||
| 68 | @@ -1084,7 +1084,7 @@ Bool |
||
| 69 | SetNonBlocking(int sock) |
||
| 70 | { |
||
| 71 | if (fcntl(sock, F_SETFL, O_NONBLOCK) < 0) { |
||
| 72 | - fprintf(stderr,programName); |
||
| 73 | + fputs(programName,stderr); |
||
| 74 | perror(": AcceptTcpConnection: fcntl"); |
||
| 75 | return False; |
||
| 76 | } |
||
| 77 | --- a/vnc_unixsrc/vncviewer/vncviewer.c |
||
| 78 | +++ b/vnc_unixsrc/vncviewer/vncviewer.c |
||
| 79 | @@ -130,7 +130,7 @@ void unixpw(char *instr, int vencrypt_pl |
||
| 80 | if (strlen(u) >= 100) { |
||
| 81 | exit(1); |
||
| 82 | } |
||
| 83 | - sprintf(username, u); |
||
| 84 | + snprintf(username, sizeof(username), "%s", u); |
||
| 85 | p = DoPasswordDialog(); |
||
| 86 | } else { |
||
| 87 | raiseme(1); |
||
| 88 | @@ -1133,7 +1133,7 @@ void printChat(char *str, Bool raise) { |
||
| 89 | if (raise) { |
||
| 90 | raiseme(0); |
||
| 91 | } |
||
| 92 | - fprintf(stderr, str); |
||
| 93 | + fputs(str, stderr); |
||
| 94 | } else { |
||
| 95 | if (raise) { |
||
| 96 | ShowChat(0, 0, 0, 0); |