projects
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix Makefile-OpenBSD.
[exim.git]
/
src
/
src
/
mime.c
diff --git
a/src/src/mime.c
b/src/src/mime.c
index 52c92ca85f7a4f1c5e4a538ebc85a3895d8c5c20..486fd3d1f9822b7edc78bd300929dab195ebf32e 100644
(file)
--- a/
src/src/mime.c
+++ b/
src/src/mime.c
@@
-1,4
+1,4
@@
-/* $Cambridge: exim/src/src/mime.c,v 1.
8 2005/06/27 14:29:43 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 *
/*************************************************
* Exim - an Internet mail transport agent *
@@
-159,7
+159,6
@@
uschar *mime_parse_line(uschar *buffer, uschar *data, uschar *encoding, int *num
/* byte 0 ---------------------- */
if (*(p+1) == 255) {
/* byte 0 ---------------------- */
if (*(p+1) == 255) {
- mime_set_anomaly(MIME_ANOMALY_BROKEN_BASE64);
break;
}
data[(*num_decoded)] = *p;
break;
}
data[(*num_decoded)] = *p;
@@
-171,7
+170,6
@@
uschar *mime_parse_line(uschar *buffer, uschar *data, uschar *encoding, int *num
p++;
/* byte 1 ---------------------- */
if (*(p+1) == 255) {
p++;
/* byte 1 ---------------------- */
if (*(p+1) == 255) {
- mime_set_anomaly(MIME_ANOMALY_BROKEN_BASE64);
break;
}
data[(*num_decoded)] = *p;
break;
}
data[(*num_decoded)] = *p;
@@
-183,7
+181,6
@@
uschar *mime_parse_line(uschar *buffer, uschar *data, uschar *encoding, int *num
p++;
/* byte 2 ---------------------- */
if (*(p+1) == 255) {
p++;
/* byte 2 ---------------------- */
if (*(p+1) == 255) {
- mime_set_anomaly(MIME_ANOMALY_BROKEN_BASE64);
break;
}
data[(*num_decoded)] = *p;
break;
}
data[(*num_decoded)] = *p;
@@
-243,11
+240,11
@@
FILE *mime_get_decode_file(uschar *pname, uschar *fname) {
filename = (uschar *)malloc(2048);
if ((pname != NULL) && (fname != NULL)) {
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,"w
b
+");
}
else if (pname == NULL) {
}
else if (pname == NULL) {
- f = fopen(CS fname,"w+");
+ f = fopen(CS fname,"w
b
+");
}
else if (fname == NULL) {
int file_nr = 0;
}
else if (fname == NULL) {
int file_nr = 0;
@@
-256,7
+253,7
@@
FILE *mime_get_decode_file(uschar *pname, uschar *fname) {
/* must find first free sequential filename */
do {
struct stat mystat;
/* 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)
file_nr++;
/* security break */
if (file_nr >= 1024)
@@
-264,7
+261,7
@@
FILE *mime_get_decode_file(uschar *pname, uschar *fname) {
result = stat(CS filename,&mystat);
}
while(result != -1);
result = stat(CS filename,&mystat);
}
while(result != -1);
- f = fopen(CS filename,"w+");
+ f = fopen(CS filename,"w
b
+");
};
/* set expansion variable */
};
/* set expansion variable */
@@
-292,7
+289,7
@@
int mime_decode(uschar **listptr) {
f_pos = ftell(mime_stream);
/* build default decode path (will exist since MBOX must be spooled up) */
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);
/* reserve a line and decoder buffer to work in */
buffer = (uschar *)malloc(MIME_MAX_LINE_LENGTH+1);
@@
-487,7
+484,7
@@
int mime_get_header(FILE *f, uschar *header) {
};
};
};
};
- if (
header[num_copied-1] != ';'
) {
+ if (
(num_copied > 0) && (header[num_copied-1] != ';')
) {
header[num_copied-1] = ';';
};
header[num_copied-1] = ';';
};
@@
-693,7
+690,7
@@
int mime_acl_check(uschar *acl, FILE *f, struct mime_boundary_context *context,
/* must find first free sequential filename */
do {
struct stat mystat;
/* 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)
file_nr++;
/* security break */
if (file_nr >= 128)