Skip to content

P
Postgres FD Implementation
Commit 46d61eb2 authored by Michael Meskes's avatar Michael Meskes
Browse files
Options

Fixed a buffer overrun that was masked on Linux systems.

parent 121dd1cd
Hide whitespace changes
Inline Side-by-side
Showing with 40 additions and 36 deletions
src/interfaces/ecpg/ChangeLog
View file @ 46d61eb2
...@@ -2095,11 +2095,13 @@ Mo Aug 14 10:39:59 CEST 2006 ...@@ -2095,11 +2095,13 @@ Mo Aug 14 10:39:59 CEST 2006
- Fixed broken newline on Windows. - Fixed broken newline on Windows.
- Fixed a nasty buffer underrun that only occured when using Informix - Fixed a nasty buffer underrun that only occured when using Informix
no_indicator NULL setting on timestamps and intervals. no_indicator NULL setting on timestamps and intervals.
<<<<<<< ChangeLog
Fr 18. Aug 17:32:54 CEST 2006 Fr 18. Aug 17:32:54 CEST 2006
- Changed lexer to no longer use the default rule. - Changed lexer to no longer use the default rule.
- Synced parser and keyword list. - Synced parser and keyword list.
- Fixed parsing of CONNECT statement so it accepts a C string again. - Fixed parsing of CONNECT statement so it accepts a C string again.
- Fixed a buffer overrun that was masked on Linux systems.
- Set ecpg library version to 5.2. - Set ecpg library version to 5.2.
- Set ecpg version to 4.2.1. - Set ecpg version to 4.2.1.
src/interfaces/ecpg/ecpglib/execute.c
View file @ 46d61eb2
/* $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. * 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 ...@@ -572,19 +572,21 @@ ECPGstore_input(const int lineno, const bool force_indicator, const struct varia
} }
if (**tobeinserted_p == '\0') if (**tobeinserted_p == '\0')
{ {
int asize = var->arrsize? var->arrsize : 1;
switch (var->type) switch (var->type)
{ {
int element; int element;
case ECPGt_short: case ECPGt_short:
if (!(mallocedval = ECPGalloc(var->arrsize * 20, lineno))) if (!(mallocedval = ECPGalloc(asize * 20, lineno)))
return false; return false;
if (var->arrsize > 1) if (asize > 1)
{ {
strcpy(mallocedval, "array ["); 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]); sprintf(mallocedval + strlen(mallocedval), "%hd,", ((short *) var->value)[element]);
strcpy(mallocedval + strlen(mallocedval) - 1, "]"); strcpy(mallocedval + strlen(mallocedval) - 1, "]");
...@@ -597,14 +599,14 @@ ECPGstore_input(const int lineno, const bool force_indicator, const struct varia ...@@ -597,14 +599,14 @@ ECPGstore_input(const int lineno, const bool force_indicator, const struct varia
break; break;
case ECPGt_int: case ECPGt_int:
if (!(mallocedval = ECPGalloc(var->arrsize * 20, lineno))) if (!(mallocedval = ECPGalloc(asize * 20, lineno)))
return false; return false;
if (var->arrsize > 1) if (asize > 1)
{ {
strcpy(mallocedval, "array ["); 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]); sprintf(mallocedval + strlen(mallocedval), "%d,", ((int *) var->value)[element]);
strcpy(mallocedval + strlen(mallocedval) - 1, "]"); strcpy(mallocedval + strlen(mallocedval) - 1, "]");
...@@ -617,14 +619,14 @@ ECPGstore_input(const int lineno, const bool force_indicator, const struct varia ...@@ -617,14 +619,14 @@ ECPGstore_input(const int lineno, const bool force_indicator, const struct varia
break; break;
case ECPGt_unsigned_short: case ECPGt_unsigned_short:
if (!(mallocedval = ECPGalloc(var->arrsize * 20, lineno))) if (!(mallocedval = ECPGalloc(asize * 20, lineno)))
return false; return false;
if (var->arrsize > 1) if (asize > 1)
{ {
strcpy(mallocedval, "array ["); 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]); sprintf(mallocedval + strlen(mallocedval), "%hu,", ((unsigned short *) var->value)[element]);
strcpy(mallocedval + strlen(mallocedval) - 1, "]"); strcpy(mallocedval + strlen(mallocedval) - 1, "]");
...@@ -637,14 +639,14 @@ ECPGstore_input(const int lineno, const bool force_indicator, const struct varia ...@@ -637,14 +639,14 @@ ECPGstore_input(const int lineno, const bool force_indicator, const struct varia
break; break;
case ECPGt_unsigned_int: case ECPGt_unsigned_int:
if (!(mallocedval = ECPGalloc(var->arrsize * 20, lineno))) if (!(mallocedval = ECPGalloc(asize * 20, lineno)))
return false; return false;
if (var->arrsize > 1) if (asize > 1)
{ {
strcpy(mallocedval, "array ["); 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]); sprintf(mallocedval + strlen(mallocedval), "%u,", ((unsigned int *) var->value)[element]);
strcpy(mallocedval + strlen(mallocedval) - 1, "]"); strcpy(mallocedval + strlen(mallocedval) - 1, "]");
...@@ -657,14 +659,14 @@ ECPGstore_input(const int lineno, const bool force_indicator, const struct varia ...@@ -657,14 +659,14 @@ ECPGstore_input(const int lineno, const bool force_indicator, const struct varia
break; break;
case ECPGt_long: case ECPGt_long:
if (!(mallocedval = ECPGalloc(var->arrsize * 20, lineno))) if (!(mallocedval = ECPGalloc(asize * 20, lineno)))
return false; return false;
if (var->arrsize > 1) if (asize > 1)
{ {
strcpy(mallocedval, "array ["); 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]); sprintf(mallocedval + strlen(mallocedval), "%ld,", ((long *) var->value)[element]);
strcpy(mallocedval + strlen(mallocedval) - 1, "]"); strcpy(mallocedval + strlen(mallocedval) - 1, "]");
...@@ -677,14 +679,14 @@ ECPGstore_input(const int lineno, const bool force_indicator, const struct varia ...@@ -677,14 +679,14 @@ ECPGstore_input(const int lineno, const bool force_indicator, const struct varia
break; break;
case ECPGt_unsigned_long: case ECPGt_unsigned_long:
if (!(mallocedval = ECPGalloc(var->arrsize * 20, lineno))) if (!(mallocedval = ECPGalloc(asize * 20, lineno)))
return false; return false;
if (var->arrsize > 1) if (asize > 1)
{ {
strcpy(mallocedval, "array ["); 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]); sprintf(mallocedval + strlen(mallocedval), "%lu,", ((unsigned long *) var->value)[element]);
strcpy(mallocedval + strlen(mallocedval) - 1, "]"); strcpy(mallocedval + strlen(mallocedval) - 1, "]");
...@@ -697,14 +699,14 @@ ECPGstore_input(const int lineno, const bool force_indicator, const struct varia ...@@ -697,14 +699,14 @@ ECPGstore_input(const int lineno, const bool force_indicator, const struct varia
break; break;
#ifdef HAVE_LONG_LONG_INT_64 #ifdef HAVE_LONG_LONG_INT_64
case ECPGt_long_long: case ECPGt_long_long:
if (!(mallocedval = ECPGalloc(var->arrsize * 30, lineno))) if (!(mallocedval = ECPGalloc(asize * 30, lineno)))
return false; return false;
if (var->arrsize > 1) if (asize > 1)
{ {
strcpy(mallocedval, "array ["); 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]); sprintf(mallocedval + strlen(mallocedval), "%lld,", ((long long *) var->value)[element]);
strcpy(mallocedval + strlen(mallocedval) - 1, "]"); strcpy(mallocedval + strlen(mallocedval) - 1, "]");
...@@ -717,14 +719,14 @@ ECPGstore_input(const int lineno, const bool force_indicator, const struct varia ...@@ -717,14 +719,14 @@ ECPGstore_input(const int lineno, const bool force_indicator, const struct varia
break; break;
case ECPGt_unsigned_long_long: case ECPGt_unsigned_long_long:
if (!(mallocedval = ECPGalloc(var->arrsize * 30, lineno))) if (!(mallocedval = ECPGalloc(asize * 30, lineno)))
return false; return false;
if (var->arrsize > 1) if (asize > 1)
{ {
strcpy(mallocedval, "array ["); 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]); sprintf(mallocedval + strlen(mallocedval), "%llu,", ((unsigned long long *) var->value)[element]);
strcpy(mallocedval + strlen(mallocedval) - 1, "]"); strcpy(mallocedval + strlen(mallocedval) - 1, "]");
...@@ -737,14 +739,14 @@ ECPGstore_input(const int lineno, const bool force_indicator, const struct varia ...@@ -737,14 +739,14 @@ ECPGstore_input(const int lineno, const bool force_indicator, const struct varia
break; break;
#endif /* HAVE_LONG_LONG_INT_64 */ #endif /* HAVE_LONG_LONG_INT_64 */
case ECPGt_float: case ECPGt_float:
if (!(mallocedval = ECPGalloc(var->arrsize * 25, lineno))) if (!(mallocedval = ECPGalloc(asize * 25, lineno)))
return false; return false;
if (var->arrsize > 1) if (asize > 1)
{ {
strcpy(mallocedval, "array ["); 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]); sprintf(mallocedval + strlen(mallocedval), "%.14g,", ((float *) var->value)[element]);
strcpy(mallocedval + strlen(mallocedval) - 1, "]"); strcpy(mallocedval + strlen(mallocedval) - 1, "]");
...@@ -757,14 +759,14 @@ ECPGstore_input(const int lineno, const bool force_indicator, const struct varia ...@@ -757,14 +759,14 @@ ECPGstore_input(const int lineno, const bool force_indicator, const struct varia
break; break;
case ECPGt_double: case ECPGt_double:
if (!(mallocedval = ECPGalloc(var->arrsize * 25, lineno))) if (!(mallocedval = ECPGalloc(asize * 25, lineno)))
return false; return false;
if (var->arrsize > 1) if (asize > 1)
{ {
strcpy(mallocedval, "array ["); 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]); sprintf(mallocedval + strlen(mallocedval), "%.14g,", ((double *) var->value)[element]);
strcpy(mallocedval + strlen(mallocedval) - 1, "]"); strcpy(mallocedval + strlen(mallocedval) - 1, "]");
......
src/interfaces/ecpg/test/complex/test4.pgc
View file @ 46d61eb2
...@@ -27,7 +27,7 @@ EXEC SQL BEGIN DECLARE SECTION; ...@@ -27,7 +27,7 @@ EXEC SQL BEGIN DECLARE SECTION;
int *did = &i; int *did = &i;
int a[10] = {9,8,7,6,5,4,3,2,1,0}; int a[10] = {9,8,7,6,5,4,3,2,1,0};
char text[25] = "klmnopqrst"; char text[25] = "klmnopqrst";
char *t = (char *)malloc(10); char *t = (char *)malloc(11);
double f; double f;
bool b = true; bool b = true;
EXEC SQL END DECLARE SECTION; EXEC SQL END DECLARE SECTION;
......
src/interfaces/ecpg/test/expected/complex-test4.c
View file @ 46d61eb2
...@@ -140,7 +140,7 @@ main (void) ...@@ -140,7 +140,7 @@ main (void)
char text [ 25 ] = "klmnopqrst" ; char text [ 25 ] = "klmnopqrst" ;
#line 30 "test4.pgc" #line 30 "test4.pgc"
char * t = ( char * ) malloc ( 10 ) ; char * t = ( char * ) malloc ( 11 ) ;
#line 31 "test4.pgc" #line 31 "test4.pgc"
double f ; double f ;
...@@ -184,14 +184,14 @@ if (sqlca.sqlcode < 0) sqlprint();} ...@@ -184,14 +184,14 @@ if (sqlca.sqlcode < 0) sqlprint();}
#line 46 "test4.pgc" #line 46 "test4.pgc"
{ ECPGdo(__LINE__, 0, 1, NULL, "insert into test ( f , i , a , text , b , t , err ) values( 404.90 , 3 , '{0,1,2,3,4,5,6,7,8,9}' , 'abcdefghij' , 'f' , 0 , 0 )", ECPGt_EOIT, ECPGt_EORT); { ECPGdo(__LINE__, 0, 1, NULL, "insert into test ( f , i , a , text , b , t , err ) values( 404.90 , 3 , '{0,1,2,3,4,5,6,7,8,9}' , 'abcdefghij' , 'f' , 0 , 0 ) ", ECPGt_EOIT, ECPGt_EORT);
#line 48 "test4.pgc" #line 48 "test4.pgc"
if (sqlca.sqlcode < 0) sqlprint();} if (sqlca.sqlcode < 0) sqlprint();}
#line 48 "test4.pgc" #line 48 "test4.pgc"
{ ECPGdo(__LINE__, 0, 1, NULL, "insert into test ( f , i , a , text , b , t , err ) values( 140787.0 , 2 , ? , ? , 't' , 2 , 14 )", { ECPGdo(__LINE__, 0, 1, NULL, "insert into test ( f , i , a , text , b , t , err ) values( 140787.0 , 2 , ? , ? , 't' , 2 , 14 ) ",
ECPGt_int,(a),(long)1,(long)10,sizeof(int), ECPGt_int,(a),(long)1,(long)10,sizeof(int),
ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L,
ECPGt_char,(text),(long)25,(long)1,(25)*sizeof(char), ECPGt_char,(text),(long)25,(long)1,(25)*sizeof(char),
...@@ -205,7 +205,7 @@ if (sqlca.sqlcode < 0) sqlprint();} ...@@ -205,7 +205,7 @@ if (sqlca.sqlcode < 0) sqlprint();}
{ ECPGdo(__LINE__, 0, 1, NULL, "insert into test ( f , i , a , text , b , t , err ) values( 14.07 , ? , ? , ? , ? , 1 , 147 )", { ECPGdo(__LINE__, 0, 1, NULL, "insert into test ( f , i , a , text , b , t , err ) values( 14.07 , ? , ? , ? , ? , 1 , 147 ) ",
ECPGt_int,&(did),(long)1,(long)0,sizeof(int), ECPGt_int,&(did),(long)1,(long)0,sizeof(int),
ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L,
ECPGt_int,(a),(long)1,(long)10,sizeof(int), ECPGt_int,(a),(long)1,(long)10,sizeof(int),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment