Do the (expensive) LOCAL_USER_ADD only after we are sure
authorLuigi Rizzo <rizzo@icir.org>
Fri, 24 Mar 2006 18:33:48 +0000 (18:33 +0000)
committerLuigi Rizzo <rizzo@icir.org>
Fri, 24 Mar 2006 18:33:48 +0000 (18:33 +0000)
that arguments are valid.

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@14785 65c4cc65-6c06-0410-ace0-fbb531ad65f3

funcs/func_enum.c

index 5f1b01d..87f321e 100644 (file)
@@ -141,14 +141,14 @@ static int function_txtcidname(struct ast_channel *chan, char *cmd,
 
        buf[0] = '\0';
 
 
        buf[0] = '\0';
 
-       LOCAL_USER_ADD(u);
 
        if (ast_strlen_zero(data)) {
                ast_log(LOG_WARNING, "TXTCIDNAME requires an argument (number)\n");
 
        if (ast_strlen_zero(data)) {
                ast_log(LOG_WARNING, "TXTCIDNAME requires an argument (number)\n");
-               LOCAL_USER_REMOVE(u);
                return -1;
        }
 
                return -1;
        }
 
+       LOCAL_USER_ADD(u);
+
        res = ast_get_txt(chan, data, dest, sizeof(dest), tech, sizeof(tech), txt,
                          sizeof(txt));
 
        res = ast_get_txt(chan, data, dest, sizeof(dest), tech, sizeof(tech), txt,
                          sizeof(txt));