Count backslash - CHAR in node->len

diff --git a/src/main/xlat.c b/src/main/xlat.c
index c077e3d139aa529589206c9e238169ec3cab66a4..0f66897d182147cb251f3b8bd02720d6048fd9bb 100644 (file)
--- a/src/main/xlat.c
+++ b/src/main/xlat.c
@@ -1400,7 +1400,9 @@ static ssize_t xlat_tokenize_literal(TALLOC_CTX *ctx, char *fmt, xlat_exp_t **he
                                *error = "Invalid escape at end of string";
                                return -(p - fmt);
                        }
+
                        p += 2;
+                       node->len += 2;
                        continue;
                }
 
@@ -2469,6 +2471,7 @@ static ssize_t xlat_expand_struct(char **out, size_t outlen, REQUEST *request, x
        }
 
        len = strlen(buff);
+
        /*
         *      If out doesn't point to an existing buffer
         *      copy the pointer to our buffer over.

diff --git a/src/tests/unit/xlat.txt b/src/tests/unit/xlat.txt
index 8306b9b46c6a6b73795c177e34291533db2004b8..8b0bf5eb2f554ec86f37a8c63e47cf5f03cccc38 100644 (file)
--- a/src/tests/unit/xlat.txt
+++ b/src/tests/unit/xlat.txt
@@ -128,3 +128,10 @@ data /([A-Z0-9\-]*)_%{Calling-Station-Id}/
 
 xlat %{length:1 + 2
 data ERROR offset 14 'Missing closing brace at end of string'
+
+xlat "%t\tfoo"
+data "%t\tfoo"
+
+xlat "%t\t%{Client-IP-Address}"
+data "%t\t%{Client-IP-Address}"
+