mirror/postgresql
2
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2024-12-27 08:39:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed remaining Coverity bugs.

Browse Source
This commit is contained in:
Michael Meskes 2006-07-05 10:49:56 +00:00
parent 2d0c1d3102
commit 956cbeb7ef
3 changed files with 30 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/interfaces/ecpg/ChangeLog
View File

@ -2040,5 +2040,9 @@ Mo Jun 26 16:08:23 CEST 2006
- Added missing braces to prevent a segfault after usage of an
undeclared cursor.
We Jul 5 12:17:28 CEST 2006
- Fixed remaining Coverity bugs.
- Set ecpg library version to 5.2.
- Set ecpg version to 4.2.1.

11
src/interfaces/ecpg/ecpglib/descriptor.c
View File

@ -1,6 +1,6 @@
/* dynamic SQL support routines
*
* $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/descriptor.c,v 1.16 2006/06/25 09:38:39 meskes Exp $
* $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/descriptor.c,v 1.17 2006/07/05 10:49:56 meskes Exp $
*/
#define POSTGRES_ECPG_INTERNAL
@ -249,7 +249,7 @@ ECPGget_desc(int lineno, const char *desc_name, int index,...)
data_var.ind_varcharsize = varcharsize;
data_var.ind_arrsize = arrsize;
data_var.ind_offset = offset;
if (data_var.ind_arrsize == 0 || data_var.ind_varcharsize == 0)
if ((data_var.ind_arrsize == 0 || data_var.ind_varcharsize == 0) && data_var.ind_pointer != NULL)
data_var.ind_value = *((void **) (data_var.ind_pointer));
else
data_var.ind_value = data_var.ind_pointer;
@ -397,7 +397,8 @@ ECPGget_desc(int lineno, const char *desc_name, int index,...)
setlocale(LC_NUMERIC, oldlocale);
ECPGfree(oldlocale);
}
else if (data_var.ind_type != ECPGt_NO_INDICATOR)
else if (data_var.ind_type != ECPGt_NO_INDICATOR && data_var.ind_pointer != NULL)
/* ind_type != NO_INDICATOR should always have ind_pointer != NULL but since this might be changed manually in the .c file let's play it safe */
{
/*
* this is like ECPGstore_result but since we don't have a data
@ -410,8 +411,9 @@ ECPGget_desc(int lineno, const char *desc_name, int index,...)
ECPGraise(lineno, ECPG_TOO_MANY_MATCHES, ECPG_SQLSTATE_CARDINALITY_VIOLATION, NULL);
return false;
}
/* allocate storage if needed */
if (data_var.ind_arrsize == 0 && data_var.ind_pointer != NULL && data_var.ind_value == NULL)
if (data_var.ind_arrsize == 0 && data_var.ind_value == NULL)
{
void *mem = (void *) ECPGalloc(data_var.ind_offset * ntuples, lineno);
if (!mem)
@ -420,6 +422,7 @@ ECPGget_desc(int lineno, const char *desc_name, int index,...)
ECPGadd_mem(mem, lineno);
data_var.ind_value = mem;
}
for (act_tuple = 0; act_tuple < ntuples; act_tuple++)
{
if (!get_int_item(lineno, data_var.ind_value, data_var.ind_type, -PQgetisnull(ECPGresult, act_tuple, index)))

25
src/interfaces/ecpg/ecpglib/execute.c
View File

@ -1,4 +1,4 @@
/* $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/execute.c,v 1.50 2006/06/26 09:20:09 meskes Exp $ */
/* $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/execute.c,v 1.51 2006/07/05 10:49:56 meskes Exp $ */
/*
* The aim is to get a simpler inteface to the database routines.
@ -876,12 +876,13 @@ ECPGstore_input(const int lineno, const bool force_indicator, const struct varia
{
char *str = NULL;
int slen;
numeric *nval = PGTYPESnumeric_new();
numeric *nval;
if (var->arrsize > 1)
{
for (element = 0; element < var->arrsize; element++, nval = PGTYPESnumeric_new())
for (element = 0; element < var->arrsize; element++)
{
nval = PGTYPESnumeric_new();
if (!nval)
return false;
@ -911,6 +912,7 @@ ECPGstore_input(const int lineno, const bool force_indicator, const struct varia
}
else
{
nval = PGTYPESnumeric_new();
if (!nval)
return false;
@ -1048,16 +1050,22 @@ ECPGstore_input(const int lineno, const bool force_indicator, const struct varia
case ECPGt_timestamp:
{
char *str = NULL;
char *str = NULL, *asc = NULL;
int slen;
if (var->arrsize > 1)
{
for (element = 0; element < var->arrsize; element++)
{
str = quote_postgres(PGTYPEStimestamp_to_asc(*(timestamp *) ((var + var->offset * element)->value)), lineno);
asc = PGTYPEStimestamp_to_asc(*(timestamp *) ((var + var->offset * element)->value));
if (!asc)
return false;
str = quote_postgres(asc, lineno);
ECPGfree(asc); /* we don't need this anymore so free it asap. */
if (!str)
return false;
slen = strlen(str);
if (!(mallocedval = ECPGrealloc(mallocedval, strlen(mallocedval) + slen + sizeof("array [], timestamp "), lineno)))
@ -1077,7 +1085,12 @@ ECPGstore_input(const int lineno, const bool force_indicator, const struct varia
}
else
{
str = quote_postgres(PGTYPEStimestamp_to_asc(*(timestamp *) (var->value)), lineno);
asc = PGTYPEStimestamp_to_asc(*(timestamp *) (var->value));
if (!asc)
return false;
str = quote_postgres(asc, lineno);
ECPGfree(asc); /* we don't need this anymore so free it asap. */
if (!str)
return false;
slen = strlen(str);