| 1 |
jer 10/12/01 00:38:44 |
| 2 |
|
| 3 |
Added: netperf-2.4.5-netserver.patch |
| 4 |
Log: |
| 5 |
Fix buffer overflow, compiler warnings (bug #337422). |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha6/cvs/Linux i686) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 net-analyzer/netperf/files/netperf-2.4.5-netserver.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/netperf/files/netperf-2.4.5-netserver.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/netperf/files/netperf-2.4.5-netserver.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: netperf-2.4.5-netserver.patch |
| 16 |
=================================================================== |
| 17 |
# Set DEBUG_LOG_FILE location |
| 18 |
# Fix compiler warnings (bug #337422): |
| 19 |
netserver.c: In function ‘process_requests’: |
| 20 |
netserver.c:287: warning: array subscript is above array bounds |
| 21 |
inlined from ‘process_requests’ at netserver.c:268: |
| 22 |
/usr/include/bits/stdio2.h:65: warning: call to __builtin___snprintf_chk will always overflow destination buffer |
| 23 |
inlined from ‘process_requests’ at netserver.c:284: |
| 24 |
/usr/include/bits/stdio2.h:65: warning: call to __builtin___snprintf_chk will always overflow destination buffer |
| 25 |
|
| 26 |
--- a/src/netserver.c |
| 27 |
+++ b/src/netserver.c |
| 28 |
@@ -142,7 +142,7 @@ |
| 29 |
|
| 30 |
#ifndef DEBUG_LOG_FILE |
| 31 |
#ifndef WIN32 |
| 32 |
-#define DEBUG_LOG_FILE "/tmp/netperf.debug" |
| 33 |
+#define DEBUG_LOG_FILE "/var/log/netperf.debug" |
| 34 |
#else |
| 35 |
#define DEBUG_LOG_FILE "c:\\temp\\netperf.debug" |
| 36 |
#endif /* WIN32 */ |
| 37 |
@@ -266,7 +266,7 @@ |
| 38 |
(!strstr(local_machine,delims[i])) && |
| 39 |
(!strstr(local_version,delims[i]))) { |
| 40 |
snprintf((char *)netperf_response.content.test_specific_data, |
| 41 |
- sizeof(netperf_response) - 7, |
| 42 |
+ MAXSPECDATA, |
| 43 |
"%c%s%c%s%c%s%c%s", |
| 44 |
delims[i][0], |
| 45 |
local_sysname, |
| 46 |
@@ -282,15 +282,15 @@ |
| 47 |
if (i == 4) { |
| 48 |
/* none of the delimiters were unique, use the last one */ |
| 49 |
snprintf((char *)netperf_response.content.test_specific_data, |
| 50 |
- sizeof(netperf_response) - 7, |
| 51 |
+ MAXSPECDATA, |
| 52 |
"%c%s%c%s%c%s%c%s", |
| 53 |
- delims[i][0], |
| 54 |
+ delims[3][0], |
| 55 |
"NoDelimUnique", |
| 56 |
- delims[i][0], |
| 57 |
+ delims[3][0], |
| 58 |
"NoDelimUnique", |
| 59 |
- delims[i][0], |
| 60 |
+ delims[3][0], |
| 61 |
"NoDelimUnique", |
| 62 |
- delims[i][0], |
| 63 |
+ delims[3][0], |
| 64 |
"NoDelimUnique"); |
| 65 |
} |
| 66 |
send_response_n(0); |
Archives