From nobody Thu Jun 18 04:39:57 2026 X-Original-To: dev-commits-src-branches@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 4ggp193blSz6jQ77 for ; Thu, 18 Jun 2026 04:39:57 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ggp191tRPz3nkt for ; Thu, 18 Jun 2026 04:39:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1781757597; 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=6f56PdD3v5VuOgSQBVPF7jAr3JitTwrE3XACRryYf0Y=; b=Twh67KYwjTaEUc4bw5X5SW2Wmde3I4YDGlnfdvO+ESe1LwN3BLipfH8HpMTexbYgsUqBV6 rkzvyGgOCJmGjjl8GMsvMPQOR0A/SsAIWeWHRkB/RSNctLl+NknJgDxPt4jTUFCgNQTp18 0wSzZxkL6K1sjxuO89V4Alq6eEgXaRB6Z+qPh3tRrQa73Arll0q5fkJwL3sOAevRJIZfXP trMuE4f2VkGcKvX90SLsQW6Y+Tdm66Q1UrnwPKnWhcAg0xwP5ZDXUM5cOcKqY9a1s5ZINc 4OU5Z9CEB/hRAf1CvZcPS+vdVWaPE3inX87gzZxKiiE9cIFjEOYEb1VqOwRCnQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1781757597; a=rsa-sha256; cv=none; b=cdHPEBMuLnAyzf7PexGgskz1pDu/GTJrfaQiRoKIG/WSwcBBZ893yr1HQYONLeQo/b7I1T +rLqD5+LuNdaCDuMdkfWWo706kJQflPG3HTpCo5JtcAc+qcNO/GtYNB73nq4X3dn6m6BpF toEHHcKbQTOJ/ApO01FV1ovqi1JJhRFZyff02nc7qeXK+vi3qSrgjT8VUJDIKzeCffpU5K k8JO0EC0MHPg1yVC7vP53/18CS61yyxiGxxomPPQZQ2tk+ZA2zNpAFi6lqASBf8w92DyNb BSl751BJIVTlu1dd78xFX/SK90FgoRPDzOoRcV5qKZ6UiQNjw706jBBOiUcgbg== 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=1781757597; 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=6f56PdD3v5VuOgSQBVPF7jAr3JitTwrE3XACRryYf0Y=; b=MSnDavOAZxDLxxG5sMCt7yQaEBbBK89c86D7doh3D2yzq0+pG83DURUlSYma8eUtC0ygKr sMHZignQNuN8mQtgYS2xKuYaH2HRPHjNsUagYcqB7FaabODFKw+zgnuSMa3FkVyvGDA+tS sCZdYM9BnITOYA1LAa7imOv78D3/UUdTCtydJbSMC6EhTB8MaG+a7iogXzH1eZPMvcb10S ibvtD+ePc7mj6WM+ECaZEe9PxERrtluh/+ww+w8BB7j4rGAIqp8kNW7cUdUjVeima6TRZb FXKHOyrlBDWuWqQz8AK/7XggB2HcADGPPbSkF4ci2n3i3VBUCtSyzo7aXyldzw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4ggp190cQqzkCP for ; Thu, 18 Jun 2026 04:39:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1c649 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 18 Jun 2026 04:39:57 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 939a39d91c56 - stable/15 - rtld parse_integer(): support binary, octal, and hex C notations List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/stable/15 X-Git-Reftype: branch X-Git-Commit: 939a39d91c568d99739f2d9b14d780a34bccdc7a Auto-Submitted: auto-generated Date: Thu, 18 Jun 2026 04:39:57 +0000 Message-Id: <6a33769d.1c649.3bb596a5@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=939a39d91c568d99739f2d9b14d780a34bccdc7a commit 939a39d91c568d99739f2d9b14d780a34bccdc7a Author: Konstantin Belousov AuthorDate: 2026-06-12 13:55:27 +0000 Commit: Konstantin Belousov CommitDate: 2026-06-17 18:24:56 +0000 rtld parse_integer(): support binary, octal, and hex C notations (cherry picked from commit 4249a9bc098dd9e32105a2965e76abd702de4d4a) --- 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); }