summaryrefslogtreecommitdiff
path: root/src
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:03 +0100
commit4eae1e6f5da8e7cd011c483d867b5bd8e92c7955 (patch)
tree1bacd69768ef59c3d04de7279086735279f8652e /src
parenta99922f966f57fcccee3b6e02a9df62789493dbc (diff)
Cope with indicator arrays that do not have the correct length.
Patch by: "Rader, David" <davidr@openscg.com>
Diffstat (limited to 'src')
-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 6c2645965ee..9d59167750d 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);