diff options
| author | Tom Lane | 2015-02-20 05:11:42 +0000 |
|---|---|---|
| committer | Tom Lane | 2015-02-20 05:11:42 +0000 |
| commit | 09d8d110a604e52216102e73fb8475b7aa88f1d1 (patch) | |
| tree | 6ffdaba34c52c319aa32b3cb95cc93cdcefb6d65 /src/bin/pg_dump/dumputils.c | |
| parent | 2fb7a75f37d0beca80f45e15736ec8d50064228a (diff) | |
Use FLEXIBLE_ARRAY_MEMBER in a bunch more places.
Replace some bogus "x[1]" declarations with "x[FLEXIBLE_ARRAY_MEMBER]".
Aside from being more self-documenting, this should help prevent bogus
warnings from static code analyzers and perhaps compiler misoptimizations.
This patch is just a down payment on eliminating the whole problem, but
it gets rid of a lot of easy-to-fix cases.
Note that the main problem with doing this is that one must no longer rely
on computing sizeof(the containing struct), since the result would be
compiler-dependent. Instead use offsetof(struct, lastfield). Autoconf
also warns against spelling that offsetof(struct, lastfield[0]).
Michael Paquier, review and additional fixes by me.
Diffstat (limited to 'src/bin/pg_dump/dumputils.c')
| -rw-r--r-- | src/bin/pg_dump/dumputils.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/bin/pg_dump/dumputils.c b/src/bin/pg_dump/dumputils.c index 095c50770ba..d7506e119e2 100644 --- a/src/bin/pg_dump/dumputils.c +++ b/src/bin/pg_dump/dumputils.c @@ -1216,9 +1216,8 @@ simple_string_list_append(SimpleStringList *list, const char *val) { SimpleStringListCell *cell; - /* this calculation correctly accounts for the null trailing byte */ cell = (SimpleStringListCell *) - pg_malloc(sizeof(SimpleStringListCell) + strlen(val)); + pg_malloc(offsetof(SimpleStringListCell, val) +strlen(val) + 1); cell->next = NULL; strcpy(cell->val, val); |