Update of /cvsroot/qmailadmin/qmailadmin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12941
Modified Files:
Tag: stable-1_2
ChangeLog qmailadmin.c
Log Message:
fix problem parsing language files that could result in SIGSEGV. [1242317]
Index: qmailadmin.c
===================================================================
RCS file: /cvsroot/qmailadmin/qmailadmin/qmailadmin.c,v
retrieving revision 1.6.2.8
retrieving revision 1.6.2.9
diff -u -d -r1.6.2.8 -r1.6.2.9
--- qmailadmin.c 23 Jan 2005 17:35:12 -0000 1.6.2.8
+++ qmailadmin.c 8 Aug 2005 20:53:03 -0000 1.6.2.9
@@ -304,6 +304,7 @@
size_t bytes_read;
char *lang_entries;
char *id;
+ char *p;
open_lang (lang);
fseek (lang_fs, 0, SEEK_END);
@@ -318,7 +319,9 @@
id = strtok (lang_entries, " \t");
while (id) {
- html_text[atoi(id)] = strtok (NULL, "\n");
+ p = strtok (NULL, "\n");
+ if (p == NULL) break;
+ html_text[atoi(id)] = p;
id = strtok (NULL, " \t");
}
Index: ChangeLog
===================================================================
RCS file: /cvsroot/qmailadmin/qmailadmin/ChangeLog,v
retrieving revision 1.15.2.70
retrieving revision 1.15.2.71
diff -u -d -r1.15.2.70 -r1.15.2.71
--- ChangeLog 11 Jul 2005 06:08:46 -0000 1.15.2.70
+++ ChangeLog 8 Aug 2005 20:53:03 -0000 1.15.2.71
@@ -6,6 +6,10 @@
Luis Gonzalo Constantini Von Rickel
- util.c: free sort_list in sort_cleanup(). [1182347]
+ Tom Collins
+ - qmailadmin.c: fix problem parsing language files that could
+ result in SIGSEGV. [1242317]
+
1.2.8 - released 4-Jul-05
Tom Collins
|
