summaryrefslogtreecommitdiff
path: root/package/netperf/netperf-2.4.5-netserver.patch
blob: d841c1c70a7578bc6f6ee8ab6431cc75b4792291 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/net-analyzer/netperf/files/netperf-2.4.5-netserver.patch?view=log
# Set DEBUG_LOG_FILE location
# Fix compiler warnings (bug #337422):
	netserver.c: In function ‘process_requests’:
	netserver.c:287: warning: array subscript is above array bounds
	inlined from ‘process_requests’ at netserver.c:268:
	/usr/include/bits/stdio2.h:65: warning: call to __builtin___snprintf_chk will always overflow destination buffer
	inlined from ‘process_requests’ at netserver.c:284:
	/usr/include/bits/stdio2.h:65: warning: call to __builtin___snprintf_chk will always overflow destination buffer

--- a/src/netserver.c
+++ b/src/netserver.c
@@ -142,7 +142,7 @@
 
 #ifndef DEBUG_LOG_FILE
 #ifndef WIN32
-#define DEBUG_LOG_FILE "/tmp/netperf.debug"
+#define DEBUG_LOG_FILE "/var/log/netperf.debug"
 #else
 #define DEBUG_LOG_FILE "c:\\temp\\netperf.debug"
 #endif  /* WIN32 */
@@ -266,7 +266,7 @@
 	      (!strstr(local_machine,delims[i])) &&
 	      (!strstr(local_version,delims[i]))) {
 	    snprintf((char *)netperf_response.content.test_specific_data,
-		     sizeof(netperf_response) - 7,
+		     MAXSPECDATA,
 		     "%c%s%c%s%c%s%c%s",
 		     delims[i][0],
 		     local_sysname,
@@ -282,15 +282,15 @@
 	if (i == 4) {
 	  /* none of the delimiters were unique, use the last one */
 	  snprintf((char *)netperf_response.content.test_specific_data,
-		   sizeof(netperf_response) - 7,
+		   MAXSPECDATA,
 		   "%c%s%c%s%c%s%c%s",
-		   delims[i][0],
+		   delims[3][0],
 		   "NoDelimUnique",
-		   delims[i][0],
+		   delims[3][0],
 		   "NoDelimUnique",
-		   delims[i][0],
+		   delims[3][0],
 		   "NoDelimUnique",
-		   delims[i][0],
+		   delims[3][0],
 		   "NoDelimUnique");
 	}
 	send_response_n(0);