From mboxrd@z Thu Jan 1 00:00:00 1970 X-Msuck: nntp://news.gmane.org/gmane.linux.lib.musl.general/12862 Path: news.gmane.org!.POSTED!not-for-mail From: Andrei Vagin Newsgroups: gmane.linux.lib.musl.general Subject: [PATCH] scanf: handle the L modifier for integers Date: Thu, 31 May 2018 09:47:19 +0300 Message-ID: <20180531064719.6805-1-avagin@virtuozzo.com> Reply-To: musl@lists.openwall.com NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: blaine.gmane.org 1527768626 6661 195.159.176.226 (31 May 2018 12:10:26 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Thu, 31 May 2018 12:10:26 +0000 (UTC) Cc: Andrei Vagin To: musl@lists.openwall.com Original-X-From: musl-return-12878-gllmg-musl=m.gmane.org@lists.openwall.com Thu May 31 14:10:22 2018 Return-path: Envelope-to: gllmg-musl@m.gmane.org Original-Received: from mother.openwall.net ([195.42.179.200]) by blaine.gmane.org with smtp (Exim 4.84_2) (envelope-from ) id 1fOMPN-0001cB-Bo for gllmg-musl@m.gmane.org; Thu, 31 May 2018 14:10:21 +0200 Original-Received: (qmail 22143 invoked by uid 550); 31 May 2018 12:12:27 -0000 Mailing-List: contact musl-help@lists.openwall.com; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-ID: Original-Received: (qmail 11443 invoked from network); 31 May 2018 06:47:58 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=lqsS1En0v9mXDkmmfX34gtAdafAd9CrzqfFPfBUksQE=; b=B1VrUJaJuVnW6guLkB1eJmyoj3Emy4IfoYrVaOdYFXAzyj07GrvUqgZ4s1wIifWljDrnonHVAqo91Rs9RIdPyZsnzTM8Ss5Mca0aLckEdnlWQP8q8XpCsc3tUPY5vrbOlxoGQXgefjAcdR8R/oG4pXtYorU6qC1lXibvJSo8g68= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=avagin@virtuozzo.com; X-Mailer: git-send-email 2.14.3 X-Originating-IP: [73.140.212.29] X-ClientProxiedBy: MWHPR21CA0058.namprd21.prod.outlook.com (2603:10b6:300:db::20) To VI1PR08MB3264.eurprd08.prod.outlook.com (2603:10a6:803:3d::19) X-MS-PublicTrafficType: Email X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(7020095)(4652020)(5600026)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020);SRVR:VI1PR08MB3264; X-Microsoft-Exchange-Diagnostics: 1;VI1PR08MB3264;3:cCrgNqCaLQZaJtrRcvi+TGFdKcGcl7Ru+R1kN9D9Q1Lns7c3hvXaw89gM5yRZIyfnheDftHOFcXhQ1vaH6MSV1GUq8KoPnxpHKc61Hbi6CGqwZhUFal+a0ficFXR1JI2Ylx3ZZyPGIRh4JFlcj+OBwei9Dudrcq6Osd0QirP9UebtP8Nb34cDYXPEqH2nrSd4flN322iWyDLXnCi839sYLVT87PfWMyaRBGf1dgMYA5Paul4Z+ZZPsrCQMGwtthy;25:oP2RZbdi/WoUMNhEfDmy455Kc8fuTFa/yLbNE9v0mMn5tq0KCN7Ik6YE3RRKAVT8tRKIyglkZcKptwPgWctWrj2W4fMJM6ivGcHauL2FxmDs45zbaz8Xh/hmRNjVph2ODsafUGff2PwUxVfLueaA6wQm/MLAz6UNBDvv7Kp2W8UL46SvrJu2qTGKa0taTiraMfBKYX2T8FNskvDbGt9JdxCBvQuC+GPRKETVRp39ZCvKPtzduIHBugyR5hqAeboj+3TlMXhEF1ykCttONZR+sRh3J8rz1a1cWRQHvRqQs3i11Xv4QBX1PhITB2+rce940/noa6BbHpz08xb0ZqSXqA==;31:iN2YXLaUYTfscvLfUEVRfwiftFyAI+Rtffn6kGfQVVo6KHlJlx/bxbnxSjQLcZg/Rvc5rTBy1j1c4CfwptMGZ2qQCd2rTux138OTN3H0tBhvULeY+nP3vkCTV8Id0/WUIm0R2V+tal83KAgSrNNYiuv7QJRPUPlZ3M6VjpbOQJY0k g8dQqYe1U117a/XIyZgp4F7DqDkk05DmhxLI9q+irxDXiH9Aq5W0Ug93eBWB9E= X-MS-TrafficTypeDiagnostic: VI1PR08MB3264: X-Microsoft-Exchange-Diagnostics: 1;VI1PR08MB3264;20:Utd5HuT1Z47lWjZrMxlAnsCSp/9iEXwhOdGxElceE50MdgFRbdw3a9VRBCeT1q8jGg5QRRZrMnXiu8xssxfdy5DvIpBxyNwZAYZxcC89Hn3rKbXjbtUmD/JIkiZaoz1r6i2+AVyh865+zEyg1Tlt0EqY1FpcwjV5OHKBErMNLVyYmSae9ztEkVKeRBl/NdmmCjVgEAGrtBvyWKCAOmc9uwC5JRRfbimXQ4VQ/jrFQEeHlByDw2aQM5L0zmaEGEJfwq9pY4n7d+9B1uf51LdX299oZhyO2JIjRDcFjN7Jn+Qa1LUe5+s7MGIDkEn/fUJk1acJpIQz7GcIZpc51lCWFGAMDR11QAWo/j6GkGnEosYIKDKq2oYsLMVZba7t+0qoMXvwe7L+NFfW6Uine8rsF/FlM9NIBWYTTEYmiRu8n9ufFDCNOuXgzdTXLNd5+w+f6jSaI+WTn347PY1gfTmgwpNtIvfQJcgdCnAQ6VKhWayOXA+B/E6VYvSYjpisWKTH;4:BGY+Lz3He7MNnPx6Ok0UVocT7cdRX+e08r/pfLeDP7x3a8KSSyoK2r7KuwM+UNv+3NrA/McNVSxxnolu8k4Csk8mY4gBNCyYdLDTfVy821Sc9Vkzg3wXtSSdEvQi7ltnKsrUm3Y3/BWcd72mrlspVkfiM0Z3kPk+4tPgdie3L0VugFJyuWoUoMFKHrR9pVxldvRL+Ndd5jfi75bplpb0zEHJzO4dXTJSe2YXAJ9TKhuZYBgnydUGGzCVp5URjkia1DuzE9qbT bsjB7jU++yVnQ== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(6040522)(2401047)(5005006)(8121501046)(10201501046)(93006095)(93001095)(3231254)(944501410)(52105095)(3002001)(149027)(150027)(6041310)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123560045)(20161123558120)(6072148)(201708071742011)(7699016);SRVR:VI1PR08MB3264;BCL:0;PCL:0;RULEID:;SRVR:VI1PR08MB3264; X-Forefront-PRVS: 06891E23FB X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10019020)(6069001)(376002)(39850400004)(346002)(366004)(396003)(39380400002)(199004)(189003)(2361001)(478600001)(316002)(107886003)(53936002)(2616005)(5660300001)(476003)(575784001)(956004)(6666003)(6916009)(25786009)(8676002)(81166006)(81156014)(50226002)(8936002)(2351001)(4326008)(6512007)(305945005)(7736002)(6486002)(50466002)(36756003)(106356001)(48376002)(1076002)(3846002)(6116002)(52116002)(97736004)(51416003)(105586002)(386003)(6506007)(47776003)(16586007)(68736007)(26005)(16526019)(186003)(66066001)(2906002)(486006)(86362001)(1857600001);DIR:OUT;SFP:1102;SCL:1;SRVR:VI1PR08MB3264;H:localhost.localdomain;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;A:1;MX:1; Received-SPF: None (protection.outlook.com: virtuozzo.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;VI1PR08MB3264;23:qmo6J9ZPnyKxiCxstKINz1zG8WCqbDBgpQh0+VmNt?= =?us-ascii?Q?JJtPjKBgr0n+8gm4bOKZDne6tQjka76n9+Ny4F7UKChicQ3y9E0nEuz+WVYw?= =?us-ascii?Q?9zv2CyNpOd0oMoai12E2r+wo1DmgHfLUTeyUAk+NPme/Mlu7ONRXDmZYBeje?= =?us-ascii?Q?lXoLGgPyPxv5yZZ2Pd+N65MNhID/XMJTkkwNUGTaPCwzdSHhFRTDvaBdBA6N?= =?us-ascii?Q?QYy2qvwc4Lcwp230TtfLHjWrJV1TSVsbePHONd0siEtaMS2+CUl3R2Pqd2/C?= =?us-ascii?Q?60WGQdSeJnGzwshFn1rXZrsBclj2a7OQS0mZUVNxhb+kE8gxiUP+7dd54+FI?= =?us-ascii?Q?zryEwLLVvmXeFGIAzGpgX0LCAqs3P/yf9Jmv5tsS9fSw3kwmXwhHmapFXgZt?= =?us-ascii?Q?FI/OaoyziBHsZx0ntzvl3ucIAskDFVUnJD05bWyFSZoeg3dzAW7Lmie2kxUJ?= =?us-ascii?Q?3OtTDCiHVRz2s7b6nvzbtcVTb5HFmj3CO3WZa+0x+4LOSdTWs7ZsbSG7YimC?= =?us-ascii?Q?D+UdSrE8R5fcmvTBpDgucoGKNlnbxK1VUPcfSpT7SzyY3Vbv0QsGzEt5PUkj?= =?us-ascii?Q?hcSCgCjJ+oN5am4v3CWOqEz5T5CVI/pJfs4Lqr/fpP2qmLIrY1xeCO50cihP?= =?us-ascii?Q?AOzvbN X-Microsoft-Antispam-Message-Info: tVeFMLb2PyTdAl8KmYhd9mPVIqOhNtRCEIg4131hLNRTAgFy/DlOWd39IHNBEtPjLBTmPsPj+nTW8PWDsNBl8Kps57GmeW3kMYIrtXy4eZpJ70/MAvhvo+9bO+YWJfCjjO3NcKscwNJ6C3vEtb1R4yPXyJ3ZOQU0pjLVsYycYN/qizMRDwd3q0lpqnXAA32W X-Microsoft-Exchange-Diagnostics: 1;VI1PR08MB3264;6:8mzWAoZBjGjxa/Y9WBaPL7bL7wWRlMY/xiKbp3cRzHSvUG6tbeUJUFUqdSe3N3vDGwvtKO8pjqwcvmSjvKqf+EzKwPeHMnCwPGHTlmCoaERWVNeqqPqtuHlhbgwggT8+JoGD5wGgGh2gJ+DwxDGw7IMwwdWTh6LyNZZj3Gp9rVjYvC0W7cQ0XZGxTNRVZeFyX0jzRuKLeV67WH0WTg5oCdbLC3K6k2Q7Uupl6E1eXE+1PrXrnkptL/QCrluUFqxcFAXfQuybFyD3QESBAEv8eL4mmy1DNYl1iT/YfaN3MdbjMMSIBELMd84odwAw/5UZ8bx4kkYxrNTU6F9ntZeTKDKIY1RBc3kX5Z4NGpf5yaquO/o4p5nxDlFRkxg9aikqlrZgbVdlreix/Dr70vWPSx9K+AGbOElpjaPje49QKOfP4u3X5f1wd7kxZLeJev+EXQ+PodzHfp0WfuIvrp0HDA==;5:CqHj3H7Z2zWxvlElXYsSqOWaUJ7GwqEsPVj0NvrSH+KecYEMhZCLOjub9LuygwcnpdMyjyBJ/5j0wTaqH9y+Eo709M8RAlp1sZ5FsmORRSFVLipXdEaNsQz3ntBDNS3Qunc0dEFwdZZMrPDnd1XGlUgQfUdOAA2FRv7MhhAOTY0=;24:0wbnJrYvW+HyV+0pgXre+szEh64cAfRUZ27v6PpwKIEjXFcWyVGbKyZHhRrgTFLuDStt8NXKRW7iPHzDDKbWQ6stI4s54X9P8/+SNpvwyxM= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;VI1PR08MB3264;7:8XTFTkdpD2+yQ/cPNP4G3RmZuVJKYgLqL1M+QqjpBOHb7qL6Swdbm3wJE34+e5DUgyd3GGKVGVTy47u7ugHZl85i8qwy/DnRia3qNglej6ogIz+TeGvrr5LKujOzkGjsCoe+2Eh4ACCSshkxQ6ckFL1e1dQu0h38D+X50g9QmG/fNSIBFMXl8VNPNJGV7nOLrFYUbtBdtrjCxcPsHe7Acnw0uGJP6fy042d5xEkQwcki3QUs/KHnPpH4dXKWH/q1;20:ucytWUoPDOfXbJyUezHRpWa0QRQQfX2ssO75vUQp0czSedrEUXiLZqicVBKrA9Mi6uCGHe2jK/RPp2Uku5QmVeKdOQKS5H8YrcZm+qFGLhRDeTrQgiNVcqdrWR79Es17FT35Z2iMW/tWGmpB2Ma2P96Ir9WpuXMZxtKOLLiRCT4= X-MS-Office365-Filtering-Correlation-Id: 5eae2cc8-b308-44a8-395b-08d5c6c26ad6 X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 May 2018 06:47:45.4141 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 5eae2cc8-b308-44a8-395b-08d5c6c26ad6 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR08MB3264 Xref: news.gmane.org gmane.linux.lib.musl.general:12862 Archived-At: Look at this code: char str[] = "sigmask: 0x200"; long long mask = 0; int ret; ret = sscanf(str, "sigmask: %Lx", &mask)); printf("%d %llx\n", ret, mask); Without this patch, ret will be 1 and mask will be 0. It is obviously incorrect. According to the man page, L should work like ll: L Indicates that the conversion will be either e, f, or g and the next pointer is a pointer to long double or the conversion will be d, i, o, u, or x and the next pointer is a pointer to long long. Signed-off-by: Andrei Vagin --- src/stdio/vfscanf.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/stdio/vfscanf.c b/src/stdio/vfscanf.c index 9e030fc4..4d0d771e 100644 --- a/src/stdio/vfscanf.c +++ b/src/stdio/vfscanf.c @@ -36,6 +36,7 @@ static void store_int(void *dest, int size, unsigned long long i) *(long *)dest = i; break; case SIZE_ll: + case SIZE_L: *(long long *)dest = i; break; } -- 2.14.3