Ensure that error is always initialized
authorAlan T. DeKok <aland@freeradius.org>
Tue, 14 Mar 2017 23:44:43 +0000 (19:44 -0400)
committerAlan T. DeKok <aland@freeradius.org>
Tue, 14 Mar 2017 23:45:09 +0000 (19:45 -0400)
src/main/xlat.c

index 66ce913..3fec469 100644 (file)
@@ -1787,7 +1787,10 @@ static ssize_t xlat_tokenize_request(REQUEST *request, char const *fmt, xlat_exp
         *      much faster.
         */
        tokens = talloc_typed_strdup(request, fmt);
-       if (!tokens) return -1;
+       if (!tokens) {
+               error = "Out of memory";
+               return -1;
+       }
 
        slen = xlat_tokenize_literal(request, tokens, head, false, &error);
 
@@ -1806,6 +1809,7 @@ static ssize_t xlat_tokenize_request(REQUEST *request, char const *fmt, xlat_exp
         */
        if (slen < 0) {
                talloc_free(tokens);
+
                rad_assert(error != NULL);
 
                REMARKER(fmt, -slen, error);