From nobody Mon Mar 28 15:24:14 2022 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 CB3C61A305A0; Mon, 28 Mar 2022 15:24:15 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KRxLl1pkKz3Nh5; Mon, 28 Mar 2022 15:24:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648481055; 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=S6wtlhDUcII+RNalrnkRvCErrVy9zHyGdOz6+3xtJvQ=; b=j9zyPkd85LRgV4Ibcfp9LKgiM822hBE0PyL2NvNhR4bEgLTTwlorZ75MYo5E+XlOn3yKAa Hzuw+GLq16hkKijLbeKDIdO5VrAGLJ6ocfv9g9bM/uGwFlPnBeTEaiGg89Ep59MwVKzaSD EHZLiV6wJ2AeUXJsESjHmCY1LP21bOy7PDgGQgu7yMEOr98Nfpf7auzZratTg54i1DIUtz Igjgcxz4rUziMMKfjxsQ6elebzUEW96ldRGSNMUShHl4SYNlnRm5MKL0deP5BoVHkKstWi j8RIJMfZu8fATvGjzSLwhpkjlNYDSEYnmVgwd+fQzsm1hv+4SbtZ+xCVyk8CSg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id F1DEA45C0; Mon, 28 Mar 2022 15:24:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 22SFOErP086500; Mon, 28 Mar 2022 15:24:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22SFOEbW086499; Mon, 28 Mar 2022 15:24:14 GMT (envelope-from git) Date: Mon, 28 Mar 2022 15:24:14 GMT Message-Id: <202203281524.22SFOEbW086499@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 6e13794fbe6e - main - libc: Restore fp state upon flush error in fputc 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6e13794fbe6e82c21365d0fd66769bf8b19c0197 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648481055; 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=S6wtlhDUcII+RNalrnkRvCErrVy9zHyGdOz6+3xtJvQ=; b=H3KMxjrzHSb7Kard3XiGmqsyoeB3H1qmrkMGfXJP6yfg2gk3HYnfwbgd+VGxjskozo8jiU 7V/7NIfTV677Xor/UV771tVkyFDPxoaSDcpgGt3A2Nf3Iqjz6afYYcKItEDOu5lTHBsZYx 4TtWopF54IbboYKP6YUlDouIZDYJuXUV1Fn6Eo1Mhzim8UbzMkxByAMNXlANd/WzP33oaw mold7NcUO2CxI4Zesy3pWATVvckFsBtI7pYT7UEE0wwsxAm2kBYx83x+wDIDfqnmsiQEFX Kxl6N3KrWFoestDMinbzOdKszZurvEuw5mHmbVGMnYty3nEFutJkTpgt+7NAjw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648481055; a=rsa-sha256; cv=none; b=VzPxY66i6lAy/nggg5C2C9hB/6o2jfey5oC5ujiZCl0xlXGp/UTOnmNX+PNN1y50Lt3feC 2frX+GI5MLh/vVjW2FDTBFX26fpAB8ybGiIpxIAGH/dVnqdpNRYf85+/JA2Y/eO55WdQGj FrO0Bj1RUwxFabaaZeF+tI9n2/sJ7g13BpxQbfl0Q9f74UhyETOZJhNCQA750kVa5fm5LJ LYUUIpkZcJ2JQRbQQtjrsZf+IWjaHh6kVEVZiogJQKfxiYbLr0vT5aU2nyEWE6BoYn/xrb h0lBORP1FCm6ubnC4SL4bDkNdPml7/E1QYVBry718W7wnMPfpvoIj426NxMYjA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=6e13794fbe6e82c21365d0fd66769bf8b19c0197 commit 6e13794fbe6e82c21365d0fd66769bf8b19c0197 Author: Mark Johnston AuthorDate: 2022-03-25 14:46:24 +0000 Commit: Mark Johnston CommitDate: 2022-03-28 15:23:46 +0000 libc: Restore fp state upon flush error in fputc This is akin to commit bafaa70b6f9098d83d074968c8e6747ecec1e118. Reported by: Guy Yur Fixes: 86a16ada1ea6 MFC after: 3 days Sponsored by: The FreeBSD Foundation --- lib/libc/stdio/wbuf.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/lib/libc/stdio/wbuf.c b/lib/libc/stdio/wbuf.c index e1aa70243e94..6cd75145a271 100644 --- a/lib/libc/stdio/wbuf.c +++ b/lib/libc/stdio/wbuf.c @@ -52,6 +52,7 @@ __FBSDID("$FreeBSD$"); int __swbuf(int c, FILE *fp) { + unsigned char *old_p; int n; /* @@ -87,8 +88,15 @@ __swbuf(int c, FILE *fp) } fp->_w--; *fp->_p++ = c; - if (++n == fp->_bf._size || (fp->_flags & __SLBF && c == '\n')) - if (__fflush(fp)) + old_p = fp->_p; + if (++n == fp->_bf._size || (fp->_flags & __SLBF && c == '\n')) { + if (__fflush(fp)) { + if (fp->_p == old_p) { + fp->_p--; + fp->_w++; + } return (EOF); + } + } return (c); }