From nobody Tue Feb 01 03:29:44 2022 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 7CCF319AF4F0; Tue, 1 Feb 2022 03:29:45 +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 4Jnr5j0KdWz4gbk; Tue, 1 Feb 2022 03:29:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643686185; 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=U3SvNgJ+e6ikwKfklsasJgJIHi2ybT+s/yszYILi+XY=; b=TbzDdOzLZARmo7akaL2tAhQe+awXf7yXF0uaL/+34u+7+IrgIeqMT2nXDGQqxQ4bsJZtN/ AXqUyVwpG7g1tgHrhjpU2V1Bneybw7YIYQ8pJMnh6cTh72kzITRuOXYvMQlrzPff/kD/oV oIdqCXhNsK0yoPukhDz/uiiLlOsXH4drwJ7OZZlEzRwQ3hoAEwlRoHMUy5LC0oCRqwn+nZ pETTXohhdhE5qF730jdpD3Dbs8PgFRWsaLwmX1jfJcEt2dPmOyyhlCcJhj8hL+/bfuvWSh hUqPXXXYD3ugp2TSWvstfNYiHEe8O/A64gvzqNAKOaWA4W0K4STl8wn0B9X/pw== 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 D93E3841; Tue, 1 Feb 2022 03:29:44 +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 2113Tie0088119; Tue, 1 Feb 2022 03:29:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2113Tinc088118; Tue, 1 Feb 2022 03:29:44 GMT (envelope-from git) Date: Tue, 1 Feb 2022 03:29:44 GMT Message-Id: <202202010329.2113Tinc088118@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: afa9a1f5ec99 - stable/13 - __sflush(): on write error, if nothing was written, reset FILE state back 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org 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/13 X-Git-Reftype: branch X-Git-Commit: afa9a1f5ec9974793a8744c55036ef5c4d08903d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643686185; 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=U3SvNgJ+e6ikwKfklsasJgJIHi2ybT+s/yszYILi+XY=; b=rAzrJqRDULa2jrxQ8CzGqx45fojGaPRLz7jWVBYDjEjwVfK3+2L9FKY6GM6zmw/aGOXQNy /jB+0SYgnvoGHFngq2LbhlzDEq5SY34NGzFAhkVe7N1t6+mDO2QExPgtCztCJGulUcDYYD anbFJ9afjRBgl93UL8SdqaYFAYzzR2Si6O0Zl9BSmnSOQMaXk9xswTH+0iXhwldfjlM9TT lnnXDwdhtKfVZhlUB/++Wz+jCRXE4TRbWMLO56Vf/MLU7pcXRpS9Zq/srERXgwSpE+//D9 K/X0RPV4RaNpx3RxMx3e3Z+9VAL6b2Q53jGCdBtmaERxJ5PBS3nK/Zs1nxRnSQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643686185; a=rsa-sha256; cv=none; b=lgDJKuxY4EIM25squZJLtsYbbqvStbmGCnPcrv0Ka5PLM8Beqq/Z49qCTwRsr7RL1mC8v9 ild5Mi93gdVsQ0ID2X7jhaFOXUhTEfKXHmbodWrm1L6X3/MPOl702ZL3f7iIMzPBgNEIPD 8W0WVQQ5CbuhkCd9ZYswqKuEyP+Gn+1QqNlEY/L0BmhZVJtifxpe7Bj7MgGQG1QsHyo+q7 VSjSxb3Bhxc9ONtxNvXRqkc0nopqJXZDZqNI1QuCtnF3zg+v8CEL3qbjiXoeAxUbsWX4bo fv6RxJwza+BNzUKT8IhIOZ9cbLckVD+CywpKBFPF9EmtPr1OpaFlUkGcaCpTWg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=afa9a1f5ec9974793a8744c55036ef5c4d08903d commit afa9a1f5ec9974793a8744c55036ef5c4d08903d Author: Konstantin Belousov AuthorDate: 2022-01-23 06:52:59 +0000 Commit: Konstantin Belousov CommitDate: 2022-02-01 03:29:15 +0000 __sflush(): on write error, if nothing was written, reset FILE state back PR: 76398 (cherry picked from commit 86a16ada1ea608408cec370171d9f59353e97c77) --- lib/libc/stdio/fflush.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/lib/libc/stdio/fflush.c b/lib/libc/stdio/fflush.c index f7d2fbdc28e5..decc974907f4 100644 --- a/lib/libc/stdio/fflush.c +++ b/lib/libc/stdio/fflush.c @@ -105,8 +105,8 @@ __weak_reference(__fflush, fflush_unlocked); int __sflush(FILE *fp) { - unsigned char *p; - int n, t; + unsigned char *p, *old_p; + int n, t, old_w; t = fp->_flags; if ((t & __SWR) == 0) @@ -121,7 +121,9 @@ __sflush(FILE *fp) * Set these immediately to avoid problems with longjmp and to allow * exchange buffering (via setvbuf) in user write function. */ + old_p = fp->_p; fp->_p = p; + old_w = fp->_w; fp->_w = t & (__SLBF|__SNBF) ? 0 : fp->_bf._size; for (; n > 0; n -= t, p += t) { @@ -134,6 +136,9 @@ __sflush(FILE *fp) fp->_p += n; if ((fp->_flags & (__SLBF | __SNBF)) == 0) fp->_w -= n; + } else if (p == fp->_p) { /* cond. to handle setvbuf */ + fp->_p = old_p; + fp->_w = old_w; } fp->_flags |= __SERR; return (EOF);