Harden plaintext authenticator

[users/heiko/exim.git] / src / src / auths / get_data.c

diff --git a/src/src/auths/get_data.c b/src/src/auths/get_data.c
index 37dcd37cc54a43ed6fe23780eb58df3ad46d822b..efb4d6d8b6897f493373c3712451050bbe4f066f 100644 (file)
--- a/src/src/auths/get_data.c
+++ b/src/src/auths/get_data.c
@@ -174,11 +174,7 @@ for (int i = 0; i < len; i++)
     if (ss[i+1] != '^')
       ss[i] = 0;
     else
-      {
-      i++;
-      len--;
-      memmove(ss + i, ss + i + 1, len - i);
-      }
+      if (--len > ++i) memmove(ss + i, ss + i + 1, len - i);
 
 /* The first string is attached to the AUTH command; others are sent
 unembellished. */