From owner-svn-src-head@freebsd.org Wed Aug 5 15:20:08 2020 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id DF8D3379852; Wed, 5 Aug 2020 15:20:08 +0000 (UTC) (envelope-from se@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BMFfw5dwFz3TNp; Wed, 5 Aug 2020 15:20:08 +0000 (UTC) (envelope-from se@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A5E471825E; Wed, 5 Aug 2020 15:20:08 +0000 (UTC) (envelope-from se@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 075FK8s9026740; Wed, 5 Aug 2020 15:20:08 GMT (envelope-from se@FreeBSD.org) Received: (from se@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 075FK7ho026737; Wed, 5 Aug 2020 15:20:07 GMT (envelope-from se@FreeBSD.org) Message-Id: <202008051520.075FK7ho026737@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: se set sender to se@FreeBSD.org using -f From: =?UTF-8?Q?Stefan_E=c3=9fer?= Date: Wed, 5 Aug 2020 15:20:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r363915 - in head/contrib/bc: . locales src X-SVN-Group: head X-SVN-Commit-Author: se X-SVN-Commit-Paths: in head/contrib/bc: . locales src X-SVN-Commit-Revision: 363915 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 Aug 2020 15:20:08 -0000 Author: se Date: Wed Aug 5 15:20:07 2020 New Revision: 363915 URL: https://svnweb.freebsd.org/changeset/base/363915 Log: Upgrade to version 3.1.5 This version fixes some entries in the chinese message catalogs which could lead to program crashes when used. Modified: head/contrib/bc/Makefile.in head/contrib/bc/NEWS.md head/contrib/bc/locales/zh_CN.GB18030.msg head/contrib/bc/locales/zh_CN.GB2312.msg head/contrib/bc/locales/zh_CN.GBK.msg head/contrib/bc/locales/zh_CN.UTF-8.msg head/contrib/bc/locales/zh_CN.eucCN.msg head/contrib/bc/src/program.c head/contrib/bc/src/vm.c Directory Properties: head/contrib/bc/ (props changed) Modified: head/contrib/bc/Makefile.in ============================================================================== --- head/contrib/bc/Makefile.in Wed Aug 5 14:42:45 2020 (r363914) +++ head/contrib/bc/Makefile.in Wed Aug 5 15:20:07 2020 (r363915) @@ -29,7 +29,7 @@ # .POSIX: -VERSION = 3.1.4 +VERSION = 3.1.5 SRC = %%SRC%% OBJ = %%OBJ%% Modified: head/contrib/bc/NEWS.md ============================================================================== --- head/contrib/bc/NEWS.md Wed Aug 5 14:42:45 2020 (r363914) +++ head/contrib/bc/NEWS.md Wed Aug 5 15:20:07 2020 (r363915) @@ -1,5 +1,13 @@ # News +## 3.1.5 + +This is a production release that fixes the Chinese locales (which caused `bc` +to crash) and a crash caused by `bc` executing code when it should not have been +able to. + +***ALL USERS SHOULD UPGRADE.*** + ## 3.1.4 This is a production release that fixes one bug, changes two behaviors, and Modified: head/contrib/bc/locales/zh_CN.GB18030.msg ============================================================================== Binary file (source and/or target). No diff available. Modified: head/contrib/bc/locales/zh_CN.GB2312.msg ============================================================================== Binary file (source and/or target). No diff available. Modified: head/contrib/bc/locales/zh_CN.GBK.msg ============================================================================== Binary file (source and/or target). No diff available. Modified: head/contrib/bc/locales/zh_CN.UTF-8.msg ============================================================================== Binary file (source and/or target). No diff available. Modified: head/contrib/bc/locales/zh_CN.eucCN.msg ============================================================================== Binary file (source and/or target). No diff available. Modified: head/contrib/bc/src/program.c ============================================================================== --- head/contrib/bc/src/program.c Wed Aug 5 14:42:45 2020 (r363914) +++ head/contrib/bc/src/program.c Wed Aug 5 15:20:07 2020 (r363915) @@ -1271,11 +1271,12 @@ static void bc_program_divmod(BcProgram *p) { BcNum *n1, *n2; size_t req; + bc_vec_expand(&p->results, p->results.len + 2); + + // We don't need to update the pointer because + // the capacity is enough due to the line above. res2 = bc_program_prepResult(p); res = bc_program_prepResult(p); - - // Update the pointer, just in case. - res2 = bc_vec_item_rev(&p->results, 1); bc_program_binOpPrep(p, &opd1, &n1, &opd2, &n2, 2); Modified: head/contrib/bc/src/vm.c ============================================================================== --- head/contrib/bc/src/vm.c Wed Aug 5 14:42:45 2020 (r363914) +++ head/contrib/bc/src/vm.c Wed Aug 5 15:20:07 2020 (r363915) @@ -464,7 +464,7 @@ static void bc_vm_process(const char *text) { while (BC_PARSE_CAN_PARSE(vm.prs)) vm.parse(&vm.prs); - bc_program_exec(&vm.prog); + if(BC_IS_DC || !BC_PARSE_NO_EXEC(&vm.prs)) bc_program_exec(&vm.prog); assert(BC_IS_DC || vm.prog.results.len == 0);