mirror/flatpak
1
0
Fork 0
mirror of https://github.com/flatpak/flatpak.git synced 2026-07-05 05:37:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

table printer: Be more careful with shrink

Browse Source 
Ensure that 0 <= shrink[i] <= widths[i],
to avoid bad situations.

Closes: #2496
Approved by: matthiasclasen
This commit is contained in:
Matthias Clasen
2018-12-28 10:03:38 -05:00
committed by Atomic Bot
parent a133041bdd
commit f4e42ec071
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/flatpak-table-printer.c
View File

@@ -464,11 +464,10 @@ flatpak_table_printer_print_full (FlatpakTablePrinter *printer,
if (!ellipsize)
continue;
shrinkable += widths[i];
if (col && col->title)
shrinkable -= strlen (col->title);
shrinkable += MAX (0, widths[i] - strlen (col->title));
else
shrinkable -= 5;
shrinkable += MAX (0, widths[i] - 5);
}
for (i = 0; i < printer->columns->len && i < printer->n_columns; i++)
@@ -478,15 +477,16 @@ flatpak_table_printer_print_full (FlatpakTablePrinter *printer,
if (ellipsize)
{
int sh = widths[i];
int sh;
if (col && col->title)
sh = MAX (0, sh - strlen (col->title));
sh = MAX (0, widths[i] - strlen (col->title));
else
sh = MAX (0, sh - 5);
shrinks[i] = shortfall * (sh / (double)shrinkable);
sh = MAX (0, widths[i] - 5);
shrinks[i] = MIN (shortfall * (sh / (double)shrinkable), widths[i]);
leftover -= shrinks[i];
}
}
last = leftover + 1;
while (leftover > 0 && leftover < last)
{