Fix query bus error bug

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@1033 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/src/dird/ua_query.c b/bacula/src/dird/ua_query.c
index 8cffb370f50d1cd2e9fcbdb3b01cb56b47614de8..b179d5aba8dca4c04ddd6d7d65fe9bb0e5ac1af2 100644 (file)
--- a/bacula/src/dird/ua_query.c
+++ b/bacula/src/dird/ua_query.c
@@ -158,10 +158,11 @@ int querycmd(UAContext *ua, char *cmd)
    return 1;
 }
 
-static char *substitute_prompts(UAContext *ua, 
+static POOLMEM *substitute_prompts(UAContext *ua, 
                       char *query, char **prompt, int nprompt)
 {
-   char *new_query, *p, *q, *o;
+   char *p, *q, *o;
+   POOLMEM *new_query;
    int i, n, len, olen;
    char *subst[9];
 
@@ -171,8 +172,8 @@ static char *substitute_prompts(UAContext *ua,
    for (i=0; i<9; i++) {
       subst[i] = NULL;
    }
-   new_query = (char *)get_pool_memory(PM_MESSAGE);
-   new_query = (char *)check_pool_memory_size(new_query, strlen(query) +100);
+   new_query = get_pool_memory(PM_MESSAGE);
+   new_query = check_pool_memory_size(new_query, strlen(query) +100);
    o = new_query;
    olen = 0;
    for (q=query; (p=strchr(q, '%')); ) {
@@ -204,7 +205,7 @@ static char *substitute_prompts(UAContext *ua,
               p = (char *)malloc(len * 2 + 1);
               db_escape_string(p, ua->cmd, len);
               subst[n] = p;
-              o = (char *)check_pool_memory_size(o, olen + strlen(p) + 1);
+              new_query = check_pool_memory_size(new_query, olen + strlen(p) + 1);
               while (*p) {
                  *o++ = *p++;
                  olen++;
@@ -227,7 +228,7 @@ static char *substitute_prompts(UAContext *ua,
         }
       }
    }
-   o = (char *)check_pool_memory_size(o, olen + strlen(q) + 1);
+   new_query = check_pool_memory_size(new_query, olen + strlen(q) + 1);
    while (*q) {
       *o++ = *q++;
    }