From 837cc40b0e51028fdc51f8f890eba4e25e3bd2a6 Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Tue, 5 Apr 2022 08:15:45 -0700 Subject: [PATCH] pivot-table: Avoid null dereference in "pspp-output dump" in corner cases. --- src/output/pivot-table.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/output/pivot-table.c b/src/output/pivot-table.c index 6ba4c16f2e..4744e66c4b 100644 --- a/src/output/pivot-table.c +++ b/src/output/pivot-table.c @@ -1939,6 +1939,8 @@ compose_headings (const struct pivot_table *pt, static void free_headings (const struct pivot_axis *axis, char ***headings) { + if (!headings) + return; for (size_t i = 0; i < axis->label_depth; i++) { for (size_t j = 0; j < axis->extent; j++) @@ -2103,7 +2105,7 @@ pivot_table_dump (const struct pivot_table *table, int indentation) { if (x) fputs ("; ", stdout); - if (column_headings[y][x]) + if (column_headings && column_headings[y] && column_headings[y][x]) fputs (column_headings[y][x], stdout); } putchar ('\n'); -- 2.30.2