summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Meskes <meskes@postgresql.org>2018-01-13 14:56:49 +0100
committerMichael Meskes <meskes@postgresql.org>2018-01-15 10:02:16 +0100
commit2c1c4b060c4381a83dd0500a73b26eb7dea4c693 (patch)
tree8abe7cff1cc87fd39fe82edb5ab125e1dbb1924b
parent8b0e5e7e7cf0f205d93677b39b4fcbe60dce3b34 (diff)
downloadpostgresql-2c1c4b060c4381a83dd0500a73b26eb7dea4c693.tar.gz
Cope with indicator arrays that do not have the correct length.
Patch by: "Rader, David" <davidr@openscg.com>
-rw-r--r--src/interfaces/ecpg/preproc/type.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/src/interfaces/ecpg/preproc/type.c b/src/interfaces/ecpg/preproc/type.c
index 6c2645965e..9d59167750 100644
--- a/src/interfaces/ecpg/preproc/type.c
+++ b/src/interfaces/ecpg/preproc/type.c
@@ -609,7 +609,17 @@ ECPGdump_a_struct(FILE *o, const char *name, const char *ind_name, char *arrsiz,
prefix, ind_prefix, arrsiz, type->struct_sizeof,
(ind_p != NULL) ? ind_type->struct_sizeof : NULL);
if (ind_p != NULL && ind_p != &struct_no_indicator)
+ {
ind_p = ind_p->next;
+ if (ind_p == NULL && p->next != NULL) {
+ mmerror(PARSE_ERROR, ET_WARNING, "indicator struct \"%s\" has too few members", ind_name);
+ ind_p = &struct_no_indicator;
+ }
+ }
+ }
+
+ if (ind_type != NULL && ind_p != NULL && ind_p != &struct_no_indicator) {
+ mmerror(PARSE_ERROR, ET_WARNING, "indicator struct \"%s\" has too many members", ind_name);
}
free(pbuf);