Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit8d6a07f

Browse files
author
Michael Meskes
committed
Fix handling of array of char pointers in ecpglib.
When array of char * was used as target for a FETCH statement returning morethan one row, it tried to store all the result in the first element. Instead itshould dump array of char pointers with right offset, use the address insteadof the value of the C variable while reading the array and treat such variableas char **, instead of char * for pointer arithmetic.Patch by Ashutosh Bapat <ashutosh.bapat@enterprisedb.com>
1 parent14ea893 commit8d6a07f

File tree

3 files changed

+31
-3
lines changed

3 files changed

+31
-3
lines changed

‎src/interfaces/ecpg/ecpglib/data.c

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -455,6 +455,14 @@ ecpg_get_data(const PGresult *results, int act_tuple, int act_field, int lineno,
455455
{
456456
char*str= (char*) (var+offset*act_tuple);
457457

458+
/*
459+
* If varcharsize is unknown and the offset is that of
460+
* char *, then this variable represents the array of
461+
* character pointers. So, use extra indirection.
462+
*/
463+
if (varcharsize==0&&offset==sizeof(char*))
464+
str=*(char**)str;
465+
458466
if (varcharsize==0||varcharsize>size)
459467
{
460468
strncpy(str,pval,size+1);

‎src/interfaces/ecpg/ecpglib/execute.c

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1930,7 +1930,14 @@ ecpg_do_prologue(int lineno, const int compat, const int force_indicator,
19301930
var->arrsize=va_arg(args,long);
19311931
var->offset=va_arg(args,long);
19321932

1933-
if (var->arrsize==0||var->varcharsize==0)
1933+
/*
1934+
* Unknown array size means pointer to an array.
1935+
* Unknown varcharsize usually also means pointer. But if the
1936+
* type is character and the array size is known, it is an
1937+
* array of pointers to char, so use var->pointer as it is.
1938+
*/
1939+
if (var->arrsize==0||
1940+
(var->varcharsize==0&& ((var->type!=ECPGt_char&&var->type!=ECPGt_unsigned_char)|| (var->arrsize <=1))))
19341941
var->value=*((char**) (var->pointer));
19351942
else
19361943
var->value=var->pointer;

‎src/interfaces/ecpg/preproc/type.c

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -448,7 +448,8 @@ ECPGdump_a_simple(FILE *o, const char *name, enum ECPGttype type,
448448
caseECPGt_unsigned_char:
449449
caseECPGt_char_variable:
450450
caseECPGt_string:
451-
451+
{
452+
char*sizeof_name="char";
452453
/*
453454
* we have to use the pointer except for arrays with given
454455
* bounds, ecpglib will distinguish between * and []
@@ -458,12 +459,24 @@ ECPGdump_a_simple(FILE *o, const char *name, enum ECPGttype type,
458459
(atoi(varcharsize)==0&&strcmp(varcharsize,"0")!=0)||
459460
(atoi(arrsize)==0&&strcmp(arrsize,"0")!=0))
460461
&&siz==NULL)
462+
{
461463
sprintf(variable,"(%s%s)",prefix ?prefix :"",name);
464+
if ((type==ECPGt_char||type==ECPGt_unsigned_char)&&
465+
strcmp(varcharsize,"0")==0)
466+
{
467+
/*
468+
* If this is an array of char *, the offset would be
469+
* sizeof(char *) and not sizeof(char).
470+
*/
471+
sizeof_name="char *";
472+
}
473+
}
462474
else
463475
sprintf(variable,"&(%s%s)",prefix ?prefix :"",name);
464476

465-
sprintf(offset,"(%s)*sizeof(char)",strcmp(varcharsize,"0")==0 ?"1" :varcharsize);
477+
sprintf(offset,"(%s)*sizeof(%s)",strcmp(varcharsize,"0")==0 ?"1" :varcharsize,sizeof_name);
466478
break;
479+
}
467480
caseECPGt_numeric:
468481

469482
/*

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp