1 commit 65e061b76867a9ea7aeeb535341b790b90ae6c21
2 Author: Heiko Schlittermann (HS12-RIPE) <hs@schlittermann.de>
3 Date: Wed May 31 23:08:56 2017 +0200
5 Cleanup (prevent repeated use of -p/-oMr to avoid mem leak)
7 diff --git a/src/src/exim.c b/src/src/exim.c
8 index 67583e58..88e11977 100644
11 @@ -3106,7 +3106,14 @@ for (i = 1; i < argc; i++)
13 /* -oMr: Received protocol */
15 - else if (Ustrcmp(argrest, "Mr") == 0) received_protocol = argv[++i];
16 + else if (Ustrcmp(argrest, "Mr") == 0)
18 + if (received_protocol)
20 + fprintf(stderr, "received_protocol is set already\n");
23 + else received_protocol = argv[++i];
25 /* -oMs: Set sender host name */
27 @@ -3202,7 +3209,15 @@ for (i = 1; i < argc; i++)
31 - uschar *hn = Ustrchr(argrest, ':');
34 + if (received_protocol)
36 + fprintf(stderr, "received_protocol is set already\n");
40 + hn = Ustrchr(argrest, ':');
43 received_protocol = argrest;