1063b058b4
Resolves: rhbz#1467312 Fixed multiple memory leaks Resolves: CVE-2017-1000369 Fixed typo causing exim-clamav to create /0750 directory Resolves: rhbz#1412028 On callout avoid SIZE option when doing recipient verification with caching enabled Resolves: rhbz#1482217 Fixed some minor whitespace problems in the spec
38 lines
962 B
Diff
38 lines
962 B
Diff
diff --git a/src/exim.c b/src/exim.c
|
|
index a6a1ea8..394bf84 100644
|
|
--- a/src/exim.c
|
|
+++ b/src/exim.c
|
|
@@ -3092,7 +3092,14 @@ for (i = 1; i < argc; i++)
|
|
|
|
/* -oMr: Received protocol */
|
|
|
|
- else if (Ustrcmp(argrest, "Mr") == 0) received_protocol = argv[++i];
|
|
+ else if (Ustrcmp(argrest, "Mr") == 0)
|
|
+
|
|
+ if (received_protocol)
|
|
+ {
|
|
+ fprintf(stderr, "received_protocol is set already\n");
|
|
+ exit(EXIT_FAILURE);
|
|
+ }
|
|
+ else received_protocol = argv[++i];
|
|
|
|
/* -oMs: Set sender host name */
|
|
|
|
@@ -3188,7 +3195,15 @@ for (i = 1; i < argc; i++)
|
|
|
|
if (*argrest != 0)
|
|
{
|
|
- uschar *hn = Ustrchr(argrest, ':');
|
|
+ uschar *hn;
|
|
+
|
|
+ if (received_protocol)
|
|
+ {
|
|
+ fprintf(stderr, "received_protocol is set already\n");
|
|
+ exit(EXIT_FAILURE);
|
|
+ }
|
|
+
|
|
+ hn = Ustrchr(argrest, ':');
|
|
if (hn == NULL)
|
|
{
|
|
received_protocol = argrest;
|