database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-08 11:42:09 +03:00
Code Activity

Fixed a buffer overrun that was masked on Linux systems.

Browse Source
This commit is contained in:
Michael Meskes
2006-08-18 16:30:53 +00:00
parent 121dd1cdf5
commit 46d61eb218
4 changed files with 40 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
/* $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/execute.c,v 1.58 2006/08/09 09:08:31 meskes Exp $ */
/* $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/execute.c,v 1.59 2006/08/18 16:30:53 meskes Exp $ */
/*
* The aim is to get a simpler inteface to the database routines.
@ -572,19 +572,21 @@ ECPGstore_input(const int lineno, const bool force_indicator, const struct varia
}
if (**tobeinserted_p == '\0')
{
int asize = var->arrsize? var->arrsize : 1;
switch (var->type)
{
int element;
case ECPGt_short:
if (!(mallocedval = ECPGalloc(var->arrsize * 20, lineno)))
if (!(mallocedval = ECPGalloc(asize * 20, lineno)))
return false;
if (var->arrsize > 1)
if (asize > 1)
{
strcpy(mallocedval, "array [");
for (element = 0; element < var->arrsize; element++)
for (element = 0; element < asize; element++)
sprintf(mallocedval + strlen(mallocedval), "%hd,", ((short *) var->value)[element]);
strcpy(mallocedval + strlen(mallocedval) - 1, "]");
@ -597,14 +599,14 @@ ECPGstore_input(const int lineno, const bool force_indicator, const struct varia
break;
case ECPGt_int:
if (!(mallocedval = ECPGalloc(var->arrsize * 20, lineno)))
if (!(mallocedval = ECPGalloc(asize * 20, lineno)))
return false;
if (var->arrsize > 1)
if (asize > 1)
{
strcpy(mallocedval, "array [");
for (element = 0; element < var->arrsize; element++)
for (element = 0; element < asize; element++)
sprintf(mallocedval + strlen(mallocedval), "%d,", ((int *) var->value)[element]);
strcpy(mallocedval + strlen(mallocedval) - 1, "]");
@ -617,14 +619,14 @@ ECPGstore_input(const int lineno, const bool force_indicator, const struct varia
break;
case ECPGt_unsigned_short:
if (!(mallocedval = ECPGalloc(var->arrsize * 20, lineno)))
if (!(mallocedval = ECPGalloc(asize * 20, lineno)))
return false;
if (var->arrsize > 1)
if (asize > 1)
{
strcpy(mallocedval, "array [");
for (element = 0; element < var->arrsize; element++)
for (element = 0; element < asize; element++)
sprintf(mallocedval + strlen(mallocedval), "%hu,", ((unsigned short *) var->value)[element]);
strcpy(mallocedval + strlen(mallocedval) - 1, "]");
@ -637,14 +639,14 @@ ECPGstore_input(const int lineno, const bool force_indicator, const struct varia
break;
case ECPGt_unsigned_int:
if (!(mallocedval = ECPGalloc(var->arrsize * 20, lineno)))
if (!(mallocedval = ECPGalloc(asize * 20, lineno)))
return false;
if (var->arrsize > 1)
if (asize > 1)
{
strcpy(mallocedval, "array [");
for (element = 0; element < var->arrsize; element++)
for (element = 0; element < asize; element++)
sprintf(mallocedval + strlen(mallocedval), "%u,", ((unsigned int *) var->value)[element]);
strcpy(mallocedval + strlen(mallocedval) - 1, "]");
@ -657,14 +659,14 @@ ECPGstore_input(const int lineno, const bool force_indicator, const struct varia
break;
case ECPGt_long:
if (!(mallocedval = ECPGalloc(var->arrsize * 20, lineno)))
if (!(mallocedval = ECPGalloc(asize * 20, lineno)))
return false;
if (var->arrsize > 1)
if (asize > 1)
{
strcpy(mallocedval, "array [");
for (element = 0; element < var->arrsize; element++)
for (element = 0; element < asize; element++)
sprintf(mallocedval + strlen(mallocedval), "%ld,", ((long *) var->value)[element]);
strcpy(mallocedval + strlen(mallocedval) - 1, "]");
@ -677,14 +679,14 @@ ECPGstore_input(const int lineno, const bool force_indicator, const struct varia
break;
case ECPGt_unsigned_long:
if (!(mallocedval = ECPGalloc(var->arrsize * 20, lineno)))
if (!(mallocedval = ECPGalloc(asize * 20, lineno)))
return false;
if (var->arrsize > 1)
if (asize > 1)
{
strcpy(mallocedval, "array [");
for (element = 0; element < var->arrsize; element++)
for (element = 0; element < asize; element++)
sprintf(mallocedval + strlen(mallocedval), "%lu,", ((unsigned long *) var->value)[element]);
strcpy(mallocedval + strlen(mallocedval) - 1, "]");
@ -697,14 +699,14 @@ ECPGstore_input(const int lineno, const bool force_indicator, const struct varia
break;
#ifdef HAVE_LONG_LONG_INT_64
case ECPGt_long_long:
if (!(mallocedval = ECPGalloc(var->arrsize * 30, lineno)))
if (!(mallocedval = ECPGalloc(asize * 30, lineno)))
return false;
if (var->arrsize > 1)
if (asize > 1)
{
strcpy(mallocedval, "array [");
for (element = 0; element < var->arrsize; element++)
for (element = 0; element < asize; element++)
sprintf(mallocedval + strlen(mallocedval), "%lld,", ((long long *) var->value)[element]);
strcpy(mallocedval + strlen(mallocedval) - 1, "]");
@ -717,14 +719,14 @@ ECPGstore_input(const int lineno, const bool force_indicator, const struct varia
break;
case ECPGt_unsigned_long_long:
if (!(mallocedval = ECPGalloc(var->arrsize * 30, lineno)))
if (!(mallocedval = ECPGalloc(asize * 30, lineno)))
return false;
if (var->arrsize > 1)
if (asize > 1)
{
strcpy(mallocedval, "array [");
for (element = 0; element < var->arrsize; element++)
for (element = 0; element < asize; element++)
sprintf(mallocedval + strlen(mallocedval), "%llu,", ((unsigned long long *) var->value)[element]);
strcpy(mallocedval + strlen(mallocedval) - 1, "]");
@ -737,14 +739,14 @@ ECPGstore_input(const int lineno, const bool force_indicator, const struct varia
break;
#endif /* HAVE_LONG_LONG_INT_64 */
case ECPGt_float:
if (!(mallocedval = ECPGalloc(var->arrsize * 25, lineno)))
if (!(mallocedval = ECPGalloc(asize * 25, lineno)))
return false;
if (var->arrsize > 1)
if (asize > 1)
{
strcpy(mallocedval, "array [");
for (element = 0; element < var->arrsize; element++)
for (element = 0; element < asize; element++)
sprintf(mallocedval + strlen(mallocedval), "%.14g,", ((float *) var->value)[element]);
strcpy(mallocedval + strlen(mallocedval) - 1, "]");
@ -757,14 +759,14 @@ ECPGstore_input(const int lineno, const bool force_indicator, const struct varia
break;
case ECPGt_double:
if (!(mallocedval = ECPGalloc(var->arrsize * 25, lineno)))
if (!(mallocedval = ECPGalloc(asize * 25, lineno)))
return false;
if (var->arrsize > 1)
if (asize > 1)
{
strcpy(mallocedval, "array [");
for (element = 0; element < var->arrsize; element++)
for (element = 0; element < asize; element++)
sprintf(mallocedval + strlen(mallocedval), "%.14g,", ((double *) var->value)[element]);
strcpy(mallocedval + strlen(mallocedval) - 1, "]");