Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit ce2a9f3

Browse files
author
Michael Meskes
committed
*** empty log message ***
1 parent 1bea3c3 commit ce2a9f3

File tree

4 files changed

+17
-4
lines changed

4 files changed

+17
-4
lines changed

src/interfaces/ecpg/ChangeLog

+7
Original file line numberDiff line numberDiff line change
@@ -913,3 +913,10 @@ Sat Apr 8 13:10:12 CEST 2000
913913
- Synced keyword.c.
914914
- Set library version to 3.1.0.
915915
- Set ecpg version to 2.7.0.
916+
917+
Mon May 15 10:51:31 CEST 2000
918+
919+
- Added patch by SAKAIDA Masaaki <sakaida@psn.co.jp> to fix segfault.
920+
- Set ecpg version to 2.7.1.
921+
922+

src/interfaces/ecpg/lib/data.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@ get_data(PGresult *results, int act_tuple, int act_field, int lineno,
1616

1717
ECPGlog("get_data line %d: RESULT: %s\n", lineno, pval ? pval : "");
1818

19-
/* Now the pval is a pointer to the value. */
20-
/* let's check is it really is an array if it should be */
19+
/* pval is a pointer to the value */
20+
/* let's check is it really is an array if it should be one */
2121
if (isarray)
2222
{
2323
if (*pval != '{')
2424
{
25-
ECPGlog("get_data data entry does not look like an array in line %d\n", lineno);
25+
ECPGlog("get_data: data entry does not look like an array in line %d\n", lineno);
2626
ECPGraise(lineno, ECPG_DATA_NOT_ARRAY, NULL);
2727
return (false);
2828
}

src/interfaces/ecpg/preproc/Makefile.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ include $(SRCDIR)/Makefile.global
33

44
MAJOR_VERSION=2
55
MINOR_VERSION=7
6-
PATCHLEVEL=0
6+
PATCHLEVEL=1
77

88
CFLAGS+=-I../include -DMAJOR_VERSION=$(MAJOR_VERSION) \
99
-DMINOR_VERSION=$(MINOR_VERSION) -DPATCHLEVEL=$(PATCHLEVEL) \

src/interfaces/ecpg/preproc/type.c

+6
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,12 @@ static void ECPGdump_a_struct(FILE *o, const char *name, const char *ind_name, l
198198
void
199199
ECPGdump_a_type(FILE *o, const char *name, struct ECPGtype * typ, const char *ind_name, struct ECPGtype * ind_typ, const char *prefix, const char *ind_prefix)
200200
{
201+
if (ind_typ == NULL)
202+
{
203+
ind_typ = &ecpg_no_indicator;
204+
ind_name = "no_indicator";
205+
}
206+
201207
switch (typ->typ)
202208
{
203209
case ECPGt_array:

0 commit comments

Comments
 (0)