From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 3 Dec 2018 20:39:39 +0000 (+0100)
Subject: format-table: never try to reuse cells that have color/url/uppercase set
X-Git-Tag: v240~143^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F11037%2Fhead;p=thirdparty%2Fsystemd.git

format-table: never try to reuse cells that have color/url/uppercase set

The table cell reusing code is supposed to be an internal memory
optimization, and not more. This means behaviour should be the same as
if we wouldn't reuse cells.
---

diff --git a/src/shared/format-table.c b/src/shared/format-table.c
index 6fdb583a72d..7d529801a1d 100644
--- a/src/shared/format-table.c
+++ b/src/shared/format-table.c
@@ -270,6 +270,14 @@ static bool table_data_matches(
         if (d->ellipsize_percent != ellipsize_percent)
                 return false;
 
+        /* If a color/url/uppercase flag is set, refuse to merge */
+        if (d->color)
+                return false;
+        if (d->url)
+                return false;
+        if (d->uppercase)
+                return false;
+
         k = table_data_size(type, data);
         l = table_data_size(d->type, d->data);