From patchwork Fri Jul 12 07:58:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Eggers X-Patchwork-Id: 1959693 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlegroups.com header.i=@googlegroups.com header.a=rsa-sha256 header.s=20230601 header.b=rZcqwC/D; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=googlegroups.com (client-ip=2607:f8b0:4864:20::23e; helo=mail-oi1-x23e.google.com; envelope-from=swupdate+bncbdk7hq7yrekrbp6eyo2amgqekchx6uq@googlegroups.com; receiver=patchwork.ozlabs.org) Received: from mail-oi1-x23e.google.com (mail-oi1-x23e.google.com [IPv6:2607:f8b0:4864:20::23e]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4WL3rj0Kz6z1xqj for ; Fri, 12 Jul 2024 17:58:59 +1000 (AEST) Received: by mail-oi1-x23e.google.com with SMTP id 5614622812f47-3d92b366160sf1570916b6e.3 for ; Fri, 12 Jul 2024 00:58:59 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1720771136; cv=pass; d=google.com; s=arc-20160816; b=ANGgXrJKIqS0ZxiGDJNqXPRHQCHpSuZFSCmmUeSWo5dUvH81iN5+BWT5xAlUT7ZOM+ 49zh+xX5BELn20Wzq6zx7WxgwV+RYh35D4nVMwiUNjSj154FKuZ41mQpvZTa1MFjMkrM LNhZvZmMg6g2kir8X3Pkt5eno26Vyh3vwwSOeuRPbR/S7G/+2UVTKAlnP8n0gGVkETlN esSKk9duknWO2PHTR54FaG37W/Z9mor7zcBBUxfE5bd5yZWKVdisqezi5JapAfgzGPzG FnWglz+qWXGaVmtRJ8OCyYtj0RKT5CmlUurzpIj1VOitWdV8nruVxGpw825v79xz6QBf elXw== ARC-Message-Signature: i=3; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:message-id:date :subject:cc:to:from:sender:dkim-signature; bh=YPH7/TtRhNDKUZyL86FFpM6RokdRrvfKch+bfnZ9/io=; fh=v8U4CL6cbb87VAasu/zLWkmWrw0SIE/F82RKihdIBrM=; b=YtNT8fhll7Q2BRPX5WmQ0q/Gpozse9CYFm0XmObZe5ROQCgSAHcr2QKofEz1ToGwbI gjy7dHiaBRC463z5b4zN1ovlLED4NVGsxBp5rOBB3XfA7jH3dKfo/PEvz/LsOLIHkjA7 H0MyWMWpeCgeM+pu/KDXbiDW1YLZShnQKvjT8KHX/5ZW5IFVoO+yG44oGBDOr/rjnwY9 i693/Cmlw3Z49ZUpaxKIcRXX4zWsOMGQxzcR2zgafcTaibddZnxaleR6LhgYIolTzZOU wGT0qDNyPdpW6LXTlLY3pX3cs0tjBsHK0PKJlTi+44dbN4586WGFW6yoJLSeaUdFhYRH LTHA==; darn=patchwork.ozlabs.org ARC-Authentication-Results: i=3; gmr-mx.google.com; dkim=pass header.i=@arri.de header.s=selector1 header.b=PtfUtCoA; arc=pass (i=1); spf=pass (google.com: domain of ceggers@arri.de designates 2a01:111:f400:7e1a::609 as permitted sender) smtp.mailfrom=CEggers@arri.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=arri.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1720771136; x=1721375936; darn=patchwork.ozlabs.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:message-id:date:subject:cc:to:from :sender:from:to:cc:subject:date:message-id:reply-to; bh=YPH7/TtRhNDKUZyL86FFpM6RokdRrvfKch+bfnZ9/io=; b=rZcqwC/DR5HOSuhFzRo5GqtxD2LTahLZDQCkwgAh1dhv6DT5llrlQr14j/fjSQyO/6 /dmY7MVmhv+MONj/SNiXV7UnREHhESJoXqrToUaSdva3dIFxET3+fLiJJqNW0OhlOx1A PjKAJJxqePTVrmpCq2uhopCw/wXLYKC6ydLR12ITqkrtvufL1pPnEHp0GTMAcDnR1EAD qD6/WuMYhuzN0tvz0dhqLV14i0wp0+qDe648V4qkb6d0ucGP5zcAvDAx65KqWv7oYmv3 +1AsCAVMqahT94N+tiuS53+ldawngRbwkXHHzebz9OL5ZYgS57ygH9xBQnlLtM+0pc2X cYAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720771136; x=1721375936; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:mime-version :message-id:date:subject:cc:to:from:x-beenthere:x-gm-message-state :sender:from:to:cc:subject:date:message-id:reply-to; bh=YPH7/TtRhNDKUZyL86FFpM6RokdRrvfKch+bfnZ9/io=; b=Tm1umw658m+wA76JjHteu3SN0J6maWmd/nF8VN49uKyUh/9IAyIAN5KBbL3y7IBYxz gyfjQ06gcmWVBs4jQ916/NMrujYBJN6deCkpTc2Nd2Dc4kbj4MhPhbTCYpq1Hru5j40s NgfbXoJenGHrfMel/ZMUyH1l1SwXKZEiOLiZHkbGB672Yvke4vFpKx9JmpoQX05Er29g W8YUjQItNaCicBh6VaynKlUA++FB3Q+tV5YQgBbQ/8b+RaRT/Mf8PttFD019H+R5gbO2 /5f38fCGli4lt/iSmTsVKb0YEIJiQOGwRAfbvYeDPCTeOFVEFM98SqELhcyBwyFbBNUt VnSA== Sender: swupdate@googlegroups.com X-Forwarded-Encrypted: i=3; AJvYcCXEeh1+Ddl1zcolpb0G6fEj1HdaHpjO4fM3kCgAgl7jyPia3BOGrhTKSEpD4niwg3n/4ejjdNWdX8P+aBuWWDUGk32XKVLmL6aqQ/1v9g== X-Gm-Message-State: AOJu0YxYJS+tN9p3e8HH5KPaWMcMjJs/Xo0Q7N599T5RK60oq1NZ9yeM NwHzCJ1efBpalTYufcxvQaMbRbaYGEggKWS3Dor06TBHdgkLnvIw X-Google-Smtp-Source: AGHT+IGS9xZhv6QWeKdpxvg1QB+vpJjSra0dN2GpiTbWtUnoglx/tuPYO9PhymfsmZt5iHECBTWfTQ== X-Received: by 2002:a05:6870:d69e:b0:254:cbaf:1216 with SMTP id 586e51a60fabf-25eae9ded17mr10370128fac.27.1720771136402; Fri, 12 Jul 2024 00:58:56 -0700 (PDT) X-BeenThere: swupdate@googlegroups.com Received: by 2002:a05:6870:ac96:b0:25e:21ca:4fa3 with SMTP id 586e51a60fabf-2603ad6e775ls865734fac.1.-pod-prod-08-us; Fri, 12 Jul 2024 00:58:55 -0700 (PDT) X-Received: by 2002:a05:6358:c31d:b0:1aa:c492:1d34 with SMTP id e5c5f4694b2df-1aade0ef77cmr845877955d.23.1720771135193; Fri, 12 Jul 2024 00:58:55 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1720771135; cv=pass; d=google.com; s=arc-20160816; b=bX8VzIxfCVOyzI9+YzsyMBHERypYZtOrApR6RpRZO+ZtuPSO6XK4uLLwCTD85M4dDG MmYxWp5vkbA3MF5zYEROw9bjaooZ252fsx5xvrHc3UnXd4LYrRpELfXwin60GlPcfNV8 IapXHQnpmwI7S/SsNaSZ4JWulaOIRnToznHt6y9MntTCi0o/lq7d4Rug6Nb19mGjY5wK iTW0aHdb33ylQ40d/u6JPXUEe/HMhQDREtIaOCYGpSERgiisrjRRkt8k1QLY+PqSOknz LkRVKjHNCfJ/xRsbz9mRVSVEZfrnKKsyBo3H9JZVigbrGqupAEZv2NtIJ2dFos2fAGX+ Urlw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:dkim-signature; bh=1NP8w4HA64+sE9rNHFfbZN4AB42laYhlxZ3h98Nnbho=; fh=T7h4rjZiMQKk0t0vLDA2xoyxi2P2C4rl/eNWE3aKl6A=; b=hSFGgPeX6RrikNLrOQFicSmexJ1jrQFlfAq7o9JX3Ge9EZqocd32sm0gLhd1tH76Ul m85Klg90nXNQY3n+OI1JsD+J0X2n6OA4+luu0Nk7W7lrwCTqgKXId0oc6PLwtxumShO+ iiht+/KaKFOKWDaqU4wx69ijZk858yktCvTJ5jQWSfUp2PqQncLkJbBzfDySUDhcdEna Z0x4hhrndAjwpSWwrDXFJ/fXIi3IHVOydxQEvSvoHUrpG2DLWN0zrGeymRG4YnwugMSG 3HGuSS7B8XBnZ0r2+BiL1VmRN/n/A8uHlgR5gYv8Y18jQa75JnWxrHq+K33pn8SjZVGi 44UQ==; dara=google.com ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@arri.de header.s=selector1 header.b=PtfUtCoA; arc=pass (i=1); spf=pass (google.com: domain of ceggers@arri.de designates 2a01:111:f400:7e1a::609 as permitted sender) smtp.mailfrom=CEggers@arri.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=arri.de Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on20609.outbound.protection.outlook.com. [2a01:111:f400:7e1a::609]) by gmr-mx.google.com with ESMTPS id 41be03b00d2f7-77d63e92ae0si387718a12.5.2024.07.12.00.58.54 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 12 Jul 2024 00:58:54 -0700 (PDT) Received-SPF: pass (google.com: domain of ceggers@arri.de designates 2a01:111:f400:7e1a::609 as permitted sender) client-ip=2a01:111:f400:7e1a::609; ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=IwBW8McGww8ge5qfRFfsz8W5qW3h4UEL0FUN56YZ0bIx0igHXPhlxN890+yg8GCkLMAR0LPR42g3DOhtimaoGd1j2PAZmc90tIVzfHJsOsPK0QXE12a2Wxe7WERfdfNmv8mIbKBgqg8W8vU8j30U5DjLJ7nNrCI8xIqhbnIBCb3FNLeIiOmlGexGroqQ9uvfgJyupDN9FXVDRChcL40pLNAFhXSaPEJCKv7HieWx0c0L5l/A+7v57qrtkdHEjf8Q1xeTHt/er+5Z9+i/BG+yVE5gLexNZV88mLBFwxxbJRkhvckdJfaefu5H18ls5ANUtN86Ky+qt6QISn6NuUpC9w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=1NP8w4HA64+sE9rNHFfbZN4AB42laYhlxZ3h98Nnbho=; b=EeeG86pV/ALv55CCuwPe0aeeh2DF62HKLbqz5fQsgpKH4s7r+dq/hPucTzZIF/4EZmJHIU+2+1lR14iq3l9uFUivuRBHeIggIiHi1wIZGjWJ3MRKxhRqy/njANqSvxfQHQsjNGKt+PyuGwZw47jcX7LznA3rpJ+LkstvuiRSMTCUpm9j765R2+xFLO8iBIohE2TjKe4bl6dFILpBQHAmOtNdCz2EVe2tr850/ikQkacNfboTV0kC5NXwoUSxc3rvUaA5q66uV4gJ/qIwi2W39mKHappEhDCsVgNEqYQdVdPku/crEyWru8KJV2ROt/rZp5FT/OD6HLDYcuFQHthlzg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=fail (sender ip is 217.111.95.7) smtp.rcpttodomain=googlegroups.com smtp.mailfrom=arri.de; dmarc=fail (p=none sp=none pct=100) action=none header.from=arri.de; dkim=none (message not signed); arc=none (0) Received: from DUZPR01CA0071.eurprd01.prod.exchangelabs.com (2603:10a6:10:3c2::16) by AM9PR07MB8002.eurprd07.prod.outlook.com (2603:10a6:20b:2fc::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7784.8; Fri, 12 Jul 2024 07:58:51 +0000 Received: from DB5PEPF00014B9C.eurprd02.prod.outlook.com (2603:10a6:10:3c2:cafe::32) by DUZPR01CA0071.outlook.office365.com (2603:10a6:10:3c2::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.23 via Frontend Transport; Fri, 12 Jul 2024 07:58:51 +0000 X-MS-Exchange-Authentication-Results: spf=fail (sender IP is 217.111.95.7) smtp.mailfrom=arri.de; dkim=none (message not signed) header.d=none;dmarc=fail action=none header.from=arri.de; Received-SPF: Fail (protection.outlook.com: domain of arri.de does not designate 217.111.95.7 as permitted sender) receiver=protection.outlook.com; client-ip=217.111.95.7; helo=mta.arri.de; Received: from mta.arri.de (217.111.95.7) by DB5PEPF00014B9C.mail.protection.outlook.com (10.167.8.170) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.17 via Frontend Transport; Fri, 12 Jul 2024 07:58:51 +0000 Received: from N9W6SW14.arri.de (192.168.54.130) by mta.arri.de (10.10.18.5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1258.34; Fri, 12 Jul 2024 09:58:50 +0200 From: Christian Eggers To: CC: , Christian Eggers Subject: [swupdate] [PATCH] parser: libconfig: allow implicit conversion from INT to INT64 Date: Fri, 12 Jul 2024 09:58:34 +0200 Message-ID: <20240712075834.10605-1-ceggers@arri.de> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 X-Originating-IP: [192.168.54.130] X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DB5PEPF00014B9C:EE_|AM9PR07MB8002:EE_ X-MS-Office365-Filtering-Correlation-Id: 54541c40-c3d0-4b9c-8bde-08dca24877f3 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700013|82310400026|1800799024|376014; X-Microsoft-Antispam-Message-Info: 9Q+PWv2IKvtmc4yAnsSAXf8Eggp5f0XzthzTLbpDBVmpDtzXPW8epO8jus189X83LkfvTNW99VbKjyRUhLFvCSqDYJLOe5XPjJP5T3B6MrawQhiswYdqiAXB6DYkFM3uQrzFcSUPlj99i3XsOEbq0agnvFqvr8d/0bWpNJuwJsovZyGCc4G6kf/rzLAUQWDqcQS4C0neCNq886nbgPg3zayIBEDycaHe57wW6ooBtCC/XlpVAyOMuy45/YlL8SADktbJUb0ggLaKAwpYwP7XV0X5MDQBLYzBKVx6nGgmM6+T6EMz+DPr/TBZQjrPVILoJjF5J5lEbWRMT9RSTLjTHtvevwc5ELcqO4qpmC2Qxd6PBzz25V0VBFWK5j0w2TEWQz9rzbNKJq7gyafWYflp2LQ7kBt/1L9RXpcqRupBFY2vRmxI/kKGcndgCM+UWzxA8Cw9D+ybl+coVABYeaJOjwweJxx2REwQQ1R56WiA7q6fhburhxtzAQEzEkVpIxluLGoaxj7vPbN7qf0NY2CrupLCYQ3vP9zLBOqdBKbySib7zHCYUh6+OSCN4uQevds9K46YVzp4g0ImvFbH9oDYy4qe2eHegy6301m6GtcYE4onKfYKO4QGFBbnbdh2vy9FHhYIi+jWZA6DQsQ4aBeE0M9WLCy0mvekcLnPN9ZUUyX6Q4ERGPaV5kjRYLF6v1BcflFnQtgyGQ44FfgeRHEfUBAXlqnTSdQTfmYFlU9sUWNVUL6eJEcJ7xkG/J0XRgFnnh1GYE4lAEb3j4dRxBOnPnFjQ+EWNofAh6CRzmNr6iRnsJzH9Vd/5BqEVuAghJubOVF8LfQyJ1y3jnhOe/QBniaytII1aUdKJEze/srBlhn61ogAnLjY01yEpPPyXid1/XWtv3E9yC5mQtrzXBALjZ6KdEeN2Ce749KORVmC+DOLQnCb3T3LbW/M/MtYe11RWtMK9AnAUj4ZTD5NBUFAujl/fnOYcoCRBRd4ICXEj69p/e+C3LKV+l05hqUckYQWr7S5cXeApbVqd9uXeIiobJ3YvE2jSV/74+W8/kWy14rrKKIxPpo7wPi9sg+vhebPaizXOc6S8ang3XZjn53eaLr3c/05/E3ltS0e202S4WrsdCNl1wg3zBAsrobikEQGIIYgYYDufX6RxI9nUL4H3dR+mQ6ldfpmBlu50yLFGCCmjIgQjofaYWaOCfBRiHTQnhQUW9V4PWGdga9DfF4bQIwie8tB8IyHNsNCkmsszsndRezcz9XLtku83PZSWdAJ13ZhYpS/jDZT7hLRxXQIbrL7Pl3Vv/fiIQK9/kgJh2845dcaQTGyTyCxdKGcjvqm2mjvRg+n+uuR/8GhMXfC57/TdAQx4zNTMNNIqSWHFhiyQp3zNap5xS7bqkdYIJBe X-Forefront-Antispam-Report: CIP:217.111.95.7;CTRY:DE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mta.arri.de;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(36860700013)(82310400026)(1800799024)(376014);DIR:OUT;SFP:1101; X-OriginatorOrg: arri.de X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jul 2024 07:58:51.2937 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 54541c40-c3d0-4b9c-8bde-08dca24877f3 X-MS-Exchange-CrossTenant-Id: e6a73a5a-614d-4c51-b3e3-53b660a9433a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=e6a73a5a-614d-4c51-b3e3-53b660a9433a;Ip=[217.111.95.7];Helo=[mta.arri.de] X-MS-Exchange-CrossTenant-AuthSource: DB5PEPF00014B9C.eurprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR07MB8002 X-Original-Sender: ceggers@arri.de X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@arri.de header.s=selector1 header.b=PtfUtCoA; arc=pass (i=1); spf=pass (google.com: domain of ceggers@arri.de designates 2a01:111:f400:7e1a::609 as permitted sender) smtp.mailfrom=CEggers@arri.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=arri.de Precedence: list Mailing-list: list swupdate@googlegroups.com; contact swupdate+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: swupdate@googlegroups.com X-Google-Group-Id: 605343134186 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , Since 1db0aefe57de ("Enforce type check in sw-description"), GET_FIELD_INT64() does not assign a config value anymore if the type detected by libconfig differs. This type check needs to be slightly relaxed to allow assignment of parsed INT32 values when a INT64 is expected. Otherwise this would require conversion of the sw-description in the .swu files which breaks compatiblity with existing update files. Link: https://groups.google.com/g/swupdate/c/UeALEHCAusQ Signed-off-by: Christian Eggers --- corelib/parsing_library_libconfig.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/corelib/parsing_library_libconfig.c b/corelib/parsing_library_libconfig.c index ddb79f6fb152..727697448ac4 100644 --- a/corelib/parsing_library_libconfig.c +++ b/corelib/parsing_library_libconfig.c @@ -42,8 +42,13 @@ static unsigned int map_field_type(field_type_t type) static void get_value_libconfig(const config_setting_t *e, void *dest, field_type_t expected_type) { int type = config_setting_type(e); - if (type != map_field_type(expected_type)) - return; + if (type != map_field_type(expected_type)) { + /* Only allow implicit conversion from INT to INT64 */ + if (type == CONFIG_TYPE_INT && expected_type == TYPE_INT64) + type = CONFIG_TYPE_INT64; + else + return; + } switch (type) { case CONFIG_TYPE_INT: *(int *)dest = config_setting_get_int(e);