Revert "Fix error introduced when refactoring some of the code."

This reverts commit 04730852a0c96baa796ad3f1b52631daaa798977.

diff --git a/bacula/src/cats/myingres.c b/bacula/src/cats/myingres.c
index a52e9356d1b48e43e8993980f371a7af5a5d1a13..42a7fbfd2618219a42f442341a1d9634cff3df62 100644 (file)
--- a/bacula/src/cats/myingres.c
+++ b/bacula/src/cats/myingres.c
@@ -60,8 +60,8 @@ short INGgetCols(INGconn *dbconn, const char *query, bool transaction)
   
    short number = -1;
    IISQLDA *sqlda;
-   sqlda = (IISQLDA *)malloc(IISQDA_HEAD_SIZE + IISQDA_VAR_SIZE);
-   memset(sqlda, 0, (IISQDA_HEAD_SIZE + IISQDA_VAR_SIZE));
+   sqlda = (IISQLDA *)malloc(IISQDA_HEAD_SIZE + (number * IISQDA_VAR_SIZE));
+   memset(sqlda, 0, (IISQDA_HEAD_SIZE + (number * IISQDA_VAR_SIZE)));
    sqlda->sqln = number;
    stmt = bstrdup(query);
    /*

diff --git a/bacula/src/cats/myingres.sc b/bacula/src/cats/myingres.sc
index ad19f9135952e6c0d074cddb25b2277de5f10a6c..adebe2e6f0017be69ada2378bc57046f576a1c35 100644 (file)
--- a/bacula/src/cats/myingres.sc
+++ b/bacula/src/cats/myingres.sc
@@ -57,8 +57,8 @@ short INGgetCols(INGconn *dbconn, const char *query, bool transaction)
    short number = -1;
    IISQLDA *sqlda;
 
-   sqlda = (IISQLDA *)malloc(IISQDA_HEAD_SIZE + IISQDA_VAR_SIZE);
-   memset(sqlda, 0, (IISQDA_HEAD_SIZE + IISQDA_VAR_SIZE));
+   sqlda = (IISQLDA *)malloc(IISQDA_HEAD_SIZE + (number * IISQDA_VAR_SIZE));
+   memset(sqlda, 0, (IISQDA_HEAD_SIZE + (number * IISQDA_VAR_SIZE)));
    
    sqlda->sqln = number;