1 |
tomjbe 10/10/04 15:19:36 |
2 |
|
3 |
Added: xlog-2.0.3-memmove.patch |
4 |
Log: |
5 |
Fix buffer overflow (bug #339652). Thanks for reporting Diego. |
6 |
|
7 |
(Portage version: 2.1.9.13/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.1 media-radio/xlog/files/xlog-2.0.3-memmove.patch |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-radio/xlog/files/xlog-2.0.3-memmove.patch?rev=1.1&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-radio/xlog/files/xlog-2.0.3-memmove.patch?rev=1.1&content-type=text/plain |
14 |
|
15 |
Index: xlog-2.0.3-memmove.patch |
16 |
=================================================================== |
17 |
diff -Nur src/logfile.old/oh1aa.c src/logfile/oh1aa.c |
18 |
--- src/logfile.old/oh1aa.c 2010-10-04 15:03:52.000000000 +0000 |
19 |
+++ src/logfile/oh1aa.c 2010-10-04 15:05:13.000000000 +0000 |
20 |
@@ -111,25 +111,25 @@ |
21 |
//0502201751OK2BMA 59 59 28 MHzSSB pavel 0 |
22 |
|
23 |
/* insert a space between date and time */ |
24 |
- memmove (buffer+7, buffer+6, MAXROWLEN); |
25 |
+ memmove (buffer+7, buffer+6, MAXROWLEN-7); |
26 |
buffer[6] = ' '; |
27 |
/* insert a space between time and call */ |
28 |
- memmove (buffer+12, buffer+11, MAXROWLEN); |
29 |
+ memmove (buffer+12, buffer+11, MAXROWLEN-12); |
30 |
buffer[11] = ' '; |
31 |
/* insert a space between call and myrst */ |
32 |
- memmove (buffer+24, buffer+23, MAXROWLEN); |
33 |
+ memmove (buffer+24, buffer+23, MAXROWLEN-24); |
34 |
buffer[24] = ' '; |
35 |
/* insert a space between myrst and rst */ |
36 |
- memmove (buffer+28, buffer+27, MAXROWLEN); |
37 |
+ memmove (buffer+28, buffer+27, MAXROWLEN-28); |
38 |
buffer[28] = ' '; |
39 |
/* insert a space between rst and band */ |
40 |
- memmove (buffer+32, buffer+31, MAXROWLEN); |
41 |
+ memmove (buffer+32, buffer+31, MAXROWLEN-32); |
42 |
buffer[32] = ' '; |
43 |
/* insert a space between band and mode */ |
44 |
- memmove (buffer+40, buffer+39, MAXROWLEN); |
45 |
+ memmove (buffer+40, buffer+39, MAXROWLEN-40); |
46 |
buffer[40] = ' '; |
47 |
/* insert a space between mode and remarks */ |
48 |
- memmove (buffer+45, buffer+44, MAXROWLEN); |
49 |
+ memmove (buffer+45, buffer+44, MAXROWLEN-45); |
50 |
buffer[45] = ' '; |
51 |
|
52 |
for (i = 0; i < oh1aa_field_nr; i++) |
53 |
diff -Nur src/logfile.old/trlog.c src/logfile/trlog.c |
54 |
--- src/logfile.old/trlog.c 2010-10-04 15:03:52.000000000 +0000 |
55 |
+++ src/logfile/trlog.c 2010-10-04 15:04:21.000000000 +0000 |
56 |
@@ -195,7 +195,7 @@ |
57 |
continue; |
58 |
|
59 |
/* insert a space between band and mode */ |
60 |
- memmove (buffer+4, buffer+3, MAXROWLEN); |
61 |
+ memmove (buffer+4, buffer+3, MAXROWLEN-4); |
62 |
buffer[3] = ' '; |
63 |
|
64 |
for (i = 0; i < trlog_field_nr - 1; i++) |