lib: var-expand - handle \{ and \} correctly

Do not treat these as embedded braces

diff --git a/src/lib/var-expand.c b/src/lib/var-expand.c
index 57c7fecda68be3b429d31cd769b8d3214ab8839f..5b07b370553d03a6881d8319bb81079ee3bb4cbd 100644 (file)
--- a/src/lib/var-expand.c
+++ b/src/lib/var-expand.c
@@ -556,8 +556,17 @@ int var_expand_with_funcs(string_t *dest, const char *str,
                        if (*str == '{' && (end = strchr(str, '}')) != NULL) {
                                /* %{long_key} */
                                unsigned int ctr = 1;
+                               bool escape = FALSE;
                                end = str;
                                while(*++end != '\0' && ctr > 0) {
+                                       if (!escape && *end == '\\') {
+                                               escape = TRUE;
+                                               continue;
+                                       }
+                                       if (escape) {
+                                               escape = FALSE;
+                                               continue;
+                                       }
                                        if (*end == '{') ctr++;
                                        if (*end == '}') ctr--;
                                }
@@ -659,6 +668,14 @@ var_get_key_range_full(const char *str, unsigned int *idx_r,
                /* long key */
                *idx_r = ++i;
                for (; str[i] != '\0'; i++) {
+                       if (!escape && str[i] == '\\') {
+                               escape = TRUE;
+                               continue;
+                       }
+                       if (escape) {
+                               escape = FALSE;
+                               continue;
+                       }
                        if (str[i] == '{')
                                depth++;
                        if (str[i] == '}') {