From 65bc5ea95e608869fe57dae43e201ed47b98f9fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ingo=20Kl=C3=B6cker?= Date: Tue, 18 May 2021 09:44:53 +0200 Subject: scd:p15: Fix logic for appending product name to MANUFACTURER. * scd/app-p15.c (do_getattr): Append product name to MANUFACTURER if manufacturer_id does not already contain a bracket and if we have a product name. --- scd/app-p15.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scd/app-p15.c b/scd/app-p15.c index 90f6b4c99..3aa8122f5 100644 --- a/scd/app-p15.c +++ b/scd/app-p15.c @@ -4578,8 +4578,8 @@ do_getattr (app_t app, ctrl_t ctrl, const char *name) else if (!strcmp (name, "MANUFACTURER")) { if (app->app_local->manufacturer_id - && (app->app_local->card_product - || strchr (app->app_local->manufacturer_id, '['))) + && !strchr (app->app_local->manufacturer_id, '[') + && app->app_local->card_product) return send_status_printf (ctrl, "MANUFACTURER", "0 %s [%s]", app->app_local->manufacturer_id, cardproduct2str (app->app_local->card_product)); -- cgit v1.2.3