-/* $Cambridge: exim/src/src/mime.c,v 1.6 2005/03/08 16:57:28 ph10 Exp $ */
+/* $Cambridge: exim/src/src/mime.c,v 1.12 2005/08/16 12:32:32 tom Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
/* byte 0 ---------------------- */
if (*(p+1) == 255) {
- mime_set_anomaly(MIME_ANOMALY_BROKEN_BASE64);
break;
}
data[(*num_decoded)] = *p;
p++;
/* byte 1 ---------------------- */
if (*(p+1) == 255) {
- mime_set_anomaly(MIME_ANOMALY_BROKEN_BASE64);
break;
}
data[(*num_decoded)] = *p;
p++;
/* byte 2 ---------------------- */
if (*(p+1) == 255) {
- mime_set_anomaly(MIME_ANOMALY_BROKEN_BASE64);
break;
}
data[(*num_decoded)] = *p;
filename = (uschar *)malloc(2048);
if ((pname != NULL) && (fname != NULL)) {
- snprintf(CS filename, 2048, "%s/%s", pname, fname);
- f = fopen(CS filename,"w+");
+ (void)string_format(filename, 2048, "%s/%s", pname, fname);
+ f = fopen(CS filename,"wb+");
}
else if (pname == NULL) {
- f = fopen(CS fname,"w+");
+ f = fopen(CS fname,"wb+");
}
else if (fname == NULL) {
int file_nr = 0;
/* must find first free sequential filename */
do {
struct stat mystat;
- snprintf(CS filename,2048,"%s/%s-%05u", pname, message_id, file_nr);
+ (void)string_format(filename,2048,"%s/%s-%05u", pname, message_id, file_nr);
file_nr++;
/* security break */
if (file_nr >= 1024)
result = stat(CS filename,&mystat);
}
while(result != -1);
- f = fopen(CS filename,"w+");
+ f = fopen(CS filename,"wb+");
};
/* set expansion variable */
f_pos = ftell(mime_stream);
/* build default decode path (will exist since MBOX must be spooled up) */
- snprintf(CS decode_path,1024,"%s/scan/%s",spool_directory,message_id);
+ (void)string_format(decode_path,1024,"%s/scan/%s",spool_directory,message_id);
/* reserve a line and decoder buffer to work in */
buffer = (uschar *)malloc(MIME_MAX_LINE_LENGTH+1);
}
- fclose(decode_file);
+ (void)fclose(decode_file);
clearerr(mime_stream);
fseek(mime_stream,f_pos,SEEK_SET);
c = fgetc(f);
if (c == EOF) break;
if ( (c == '\t') || (c == ' ') ) continue;
- ungetc(c,f);
+ (void)ungetc(c,f);
};
/* end of the header, terminate with ';' */
c = ';';
};
};
- if (header[num_copied-1] != ';') {
+ if ((num_copied > 0) && (header[num_copied-1] != ';')) {
header[num_copied-1] = ';';
};
}
-int mime_acl_check(FILE *f, struct mime_boundary_context *context, uschar
- **user_msgptr, uschar **log_msgptr) {
+int mime_acl_check(uschar *acl, FILE *f, struct mime_boundary_context *context,
+ uschar **user_msgptr, uschar **log_msgptr) {
int rc = OK;
uschar *header = NULL;
struct mime_boundary_context nested_context;
header = (uschar *)malloc(MIME_MAX_HEADER_SIZE+1);
if (header == NULL) {
log_write(0, LOG_PANIC,
- "acl_smtp_mime: can't allocate %d bytes of memory.", MIME_MAX_HEADER_SIZE+1);
+ "MIME ACL: can't allocate %d bytes of memory.", MIME_MAX_HEADER_SIZE+1);
return DEFER;
};
mime_is_coverletter = !(context && context->context == MBC_ATTACHMENT);
/* call ACL handling function */
- rc = acl_check(ACL_WHERE_MIME, NULL, acl_smtp_mime, user_msgptr, log_msgptr);
+ rc = acl_check(ACL_WHERE_MIME, NULL, acl, user_msgptr, log_msgptr);
mime_stream = NULL;
mime_current_boundary = NULL;
else
nested_context.context = MBC_COVERLETTER_ONESHOT;
- rc = mime_acl_check(f, &nested_context, user_msgptr, log_msgptr);
+ rc = mime_acl_check(acl, f, &nested_context, user_msgptr, log_msgptr);
if (rc != OK) break;
}
else if ( (mime_content_type != NULL) &&
/* must find first free sequential filename */
do {
struct stat mystat;
- snprintf(CS filename,2048,"%s/scan/%s/__rfc822_%05u", spool_directory, message_id, file_nr);
+ (void)string_format(filename,2048,"%s/scan/%s/__rfc822_%05u", spool_directory, message_id, file_nr);
file_nr++;
/* security break */
if (file_nr >= 128)