callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make sure *datalength is > 0 before calling camel_mime_filter_filter

Browse Source 
2000-09-12  Jeffrey Stedfast  <fejj@helixcode.com>

	* camel-mime-parser.c (folder_scan_step): Make sure *datalength is
	> 0 before calling camel_mime_filter_filter otherwise we will get
	a segfault if the filter calls iconv().

svn path=/trunk/; revision=5395
This commit is contained in:
Jeffrey Stedfast
2000-09-13 01:42:12 +00:00
committed by Jeffrey Stedfast
parent cad6e285aa
commit fc4267680a
2 changed files with 23 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
camel/ChangeLog
View File

@ -1,3 +1,9 @@
2000-09-12 Jeffrey Stedfast <fejj@helixcode.com>
* camel-mime-parser.c (folder_scan_step): Make sure *datalength is
> 0 before calling camel_mime_filter_filter otherwise we will get
a segfault if the filter calls iconv().
2000-09-08 Christopher James Lahey <clahey@helixcode.com>
* providers/nntp/camel-nntp-auth.c,

32
camel/camel-mime-parser.c
View File

@ -1563,42 +1563,44 @@ tail_recurse:
folder_push_part(s, h);
s->state = type;
return;
case HSCAN_HEADER:
s->state = HSCAN_BODY;
case HSCAN_BODY:
h = s->parts;
*datalength = 0;
presize = SCAN_HEAD;
f = s->filters;
do {
hb = folder_scan_content(s, &state, databuffer, datalength);
if (*datalength>0) {
d(printf("Content raw: '%.*s'\n", *datalength, *databuffer));
hb = folder_scan_content (s, &state, databuffer, datalength);
if (*datalength > 0) {
d(printf ("Content raw: '%.*s'\n", *datalength, *databuffer));
while (f) {
camel_mime_filter_filter(f->filter, *databuffer, *datalength, presize,
databuffer, datalength, &presize);
camel_mime_filter_filter (f->filter, *databuffer, *datalength, presize,
databuffer, datalength, &presize);
f = f->next;
}
return;
}
} while (hb==h && *datalength>0);
} while (hb == h && *datalength > 0);
/* check for any filter completion data */
while (f) {
camel_mime_filter_filter(f->filter, *databuffer, *datalength, presize,
databuffer, datalength, &presize);
if (*datalength > 0) {
camel_mime_filter_filter (f->filter, *databuffer, *datalength, presize,
databuffer, datalength, &presize);
}
f = f->next;
}
if (*datalength > 0)
return;
s->state = HSCAN_BODY_END;
break;
case HSCAN_MULTIPART:
h = s->parts;
do {