From nobody Sun Jun 14 01:02:33 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gdFNB243Vz6hWdh for ; Sun, 14 Jun 2026 01:02:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gdFNB0xv0z49MN for ; Sun, 14 Jun 2026 01:02:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1781398954; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CcPA/L8VYDGU46e0lb1Bg5HWKbaKyOmWRZNswF2ychM=; b=hwsmeRIHKgaAJ5Bbjqiw7i9ULNS7w/ZzcVPebdfKB52hx7e4wsMtJ1ZNf3h1udxAk4x45o fk6BPOV4p2eVJgstQHtejpK0KcXaBhSwVEElzPaQeMvc6/ZLkR30PMS5dwnzyHIpjzXdwF UyU5u843aIs3o86nL9XoRZlVVXQbbIc0RKyId/5F8owls9CceT+aqnR8aTY7DCNyaZ/7DS TUWy5eGAPqX+W0kUuOJJgknljUkzl0Vih8dMZABI+uh3rj22j3UP6QXJrw3ot+r0p1wps0 mPSZNwpCcqgHCaMvaJ5boNeLEocKB4KHBdbL0ZtKiHuk8wjonf8A315ggIQIFQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1781398954; a=rsa-sha256; cv=none; b=a+8YDi5tMs62l0I3iJoAELd6OjC/rxX9Zeib73tXPHvvVti1QwvJXrTTJn0EoRWJ7wKo54 j3Qf8K66tDMBtkwO9EwRHfiCGDLGnNFZ4wLU6KRpCgyuY39fGlbkT1McHF84Vk7nAzcwF0 VuGTSUBWyWutU0rNp+2aq0bu0EHLdmocl6on1dqm6eeYxLOKbnFc5LChLDBQB+U/CpIDpF RLRngP7a8XPYaL5pnPYphw3BsIhHO2dfDW0m5kNFNrWgkc30744HhirSkovs4aZW+f7io5 fDtT0YrkLoZk570jSFxIu8n6oJwoRaaXpumdw5cunxLFuNciRmEvrhBg3HdVXg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1781398954; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CcPA/L8VYDGU46e0lb1Bg5HWKbaKyOmWRZNswF2ychM=; b=KOBUajwlX8E9VomJII9OjgxrADd1YxJYRmqNjKVY0J2aYfWzS1oZ4j5Y7RBj9m9KtkwZLn PVQuWmJWHy5m3tr1bw4NLQTZM+5ePjzdCdkkYRZI2f22Rai0YaiqkoqmPVX1Yvx9VRI7gq ZY77CZF7Qg2il9A9Pdx8aZz19X8D+1KFeHFg8suEWwVg0hOKQRgdouGw4C2J9AUeem9CHU KacYOb8YCiRY50spIuk+nCo7ktE+GSoApQ+eReSaOm0qts3qK2Mbxu1n4VNXMHa1cAHH8q gz4QhAbxD76xEzom1tlFkJy0+JGvaPcPVYSSlYTRGszEcH6a/tQIFAUCWG04RQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gdFNB06ddzmtZ for ; Sun, 14 Jun 2026 01:02:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 219a3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 14 Jun 2026 01:02:33 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 4249a9bc098d - main - rtld parse_integer(): support binary, octal, and hex C notations List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4249a9bc098dd9e32105a2965e76abd702de4d4a Auto-Submitted: auto-generated Date: Sun, 14 Jun 2026 01:02:33 +0000 Message-Id: <6a2dfda9.219a3.5ef76443@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=4249a9bc098dd9e32105a2965e76abd702de4d4a commit 4249a9bc098dd9e32105a2965e76abd702de4d4a Author: Konstantin Belousov AuthorDate: 2026-06-12 13:55:27 +0000 Commit: Konstantin Belousov CommitDate: 2026-06-14 01:01:55 +0000 rtld parse_integer(): support binary, octal, and hex C notations Reviewed by: des, dim Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D57549 --- libexec/rtld-elf/rtld.c | 43 ++++++++++++++++++++++++++++++++++--------- 1 file changed, 34 insertions(+), 9 deletions(-) diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c index 29984e40b574..a72726684f0f 100644 --- a/libexec/rtld-elf/rtld.c +++ b/libexec/rtld-elf/rtld.c @@ -6537,27 +6537,52 @@ parse_args(char *argv[], int argc, bool *use_pathp, int *fdp, static int parse_integer(const char *str) { - static const int RADIX = 10; /* XXXJA: possibly support hex? */ + int radix; const char *orig; - int n; + int n, val; char c; + if (str[0] == '0') { + if (str[1] == 'x') { + str += 2; + radix = 16; + } else if (str[1] == 'b') { + str += 2; + radix = 2; + } else { + str += 1; + radix = 8; + } + } else { + radix = 10; + } orig = str; n = 0; for (c = *str; c != '\0'; c = *++str) { - if (c < '0' || c > '9') + if (c >= '0' && c <= '9') + val = c - '0'; + else if (c >= 'a' && c <= 'f') + val = c - 'a' + 10; + else if (c >= 'A' && c <= 'F') + val = c - 'A' + 10; + else + return (-1); + if (val >= radix) return (-1); - if (n > INT_MAX / RADIX) + if (n > INT_MAX / radix) return (-1); - n *= RADIX; - if (n > INT_MAX - (c - '0')) + n *= radix; + if (n > INT_MAX - val) return (-1); - n += c - '0'; + n += val; } - /* Make sure we actually parsed something. */ - if (str == orig) + /* + * Make sure we actually parsed something. + * Allow for lone '0'. + */ + if (str == orig && radix != 8) return (-1); return (n); }