From patchwork Sun Jan 14 17:42:54 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerry DeLisle X-Patchwork-Id: 860489 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=gcc.gnu.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=gcc-patches-return-471192-incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="QYWDWpQk"; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zKP2z403Rz9sCZ for ; Mon, 15 Jan 2018 04:43:06 +1100 (AEDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:to:cc :from:subject:message-id:date:mime-version:content-type :content-transfer-encoding; q=dns; s=default; b=PquYSaQBYXzvkFTM FQ1PPtmyk/tYYWvUJr2wETOExWin6af4T7suLafCmhiKf63L4yb5xdNpyJodnPiP jb36SBKEoyA359k+XVS9smBMNUFCU4Xm4ASMVaQ5WrRHK33dHTpXk0vdRWqKl4JZ p2luA1R+zeD85LUxRg2n4Ete7gE= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:to:cc :from:subject:message-id:date:mime-version:content-type :content-transfer-encoding; s=default; bh=zovZKjrZh9fM8nq57JTbSL B5f8k=; b=QYWDWpQk91mzuhhTE0OApzy2rQJgnIig4MmgM7Uyck8ULZq1bR8d5N KLtdlyMXIpohR3QbheaJzyN7qyVe18k4k1q4jFf7pILADD6AsJ89Rhm7iIIPM6Vl xZc7nfbkidG6B37cnqtEu9h5phWjcmRcw4PT52IQIBLV6TrQAXaJ4= Received: (qmail 37784 invoked by alias); 14 Jan 2018 17:42:58 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 37761 invoked by uid 89); 14 Jan 2018 17:42:58 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.5 required=5.0 tests=AWL, BAYES_00, FREEMAIL_FROM, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_LOW, SPF_PASS, T_RP_MATCHES_RCVD autolearn=ham version=3.3.2 spammy=Hx-spam-relays-external:!192.168.1.5!, H*RU:!192.168.1.5!, H*r:ip*192.168.1.5 X-Spam-User: qpsmtpd, 2 recipients X-HELO: mtaout002-public.msg.strl.va.charter.net Received: from mtaout002-public.msg.strl.va.charter.net (HELO mtaout002-public.msg.strl.va.charter.net) (68.114.190.27) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Sun, 14 Jan 2018 17:42:57 +0000 Received: from impout005 ([68.114.189.20]) by mtaout002.msg.strl.va.charter.net (InterMail vM.9.00.023.01 201-2473-194) with ESMTP id <20180114174255.BJMO7360.mtaout002.msg.strl.va.charter.net@impout005>; Sun, 14 Jan 2018 11:42:55 -0600 Received: from [192.168.1.5] ([96.41.213.35]) by impout005 with charter.net id yHiu1w00L0mPCJg01HiuTv; Sun, 14 Jan 2018 11:42:55 -0600 X-Authority-Analysis: v=2.2 cv=VrVTO6+n c=1 sm=1 tr=0 a=NNeuWy7OTYa7gJ+3pFFB5Q==:117 a=NNeuWy7OTYa7gJ+3pFFB5Q==:17 a=IkcTkHD0fZMA:10 a=x7bEGLp0ZPQA:10 a=mDV3o1hIAAAA:8 a=Fl-czRnaPp8XtgtFqPwA:9 a=QEXdDO2ut3YA:10 a=_FVE-zBwftR9WsbkzFJk:22 X-Auth-id: anZkZWxpc2xlQGNoYXJ0ZXIubmV0 To: gfortran Cc: gcc patches From: Jerry DeLisle Subject: [patch, committed] PR83811 fortran 'e' format broken for single digit exponents Message-ID: <4f4c9fe9-f1b0-c707-71dc-4218d7b9ec5f@charter.net> Date: Sun, 14 Jan 2018 09:42:54 -0800 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.5.0 MIME-Version: 1.0 Hello all, I committed the following as trivial. Regression tested on x86_64-pc-linux-gnu. This is a regression on 7 so I will backport. Regards, Jerry 2018-01-18 Jerry DeLisle PR libgfortran/83811 * write.c (select_buffer): Adjust buffer size up by 1. result = xmalloc (*size); New test case: ! { dg-do run } ! PR83811 fortran 'e' format broken for single digit exponents program test character(25) :: s write(s, '(1pe5.0e1)') 1.e-4 if (s.ne."1.E-4") call abort write(s, '(e5.1e1)') 1.e12 if (s.ne."*****") call abort end diff --git a/libgfortran/io/write.c b/libgfortran/io/write.c index 8021a1e9c4b..28ea852867b 100644 --- a/libgfortran/io/write.c +++ b/libgfortran/io/write.c @@ -1519,8 +1519,9 @@ select_buffer (st_parameter_dt *dtp, const fnode *f, int precision, { char *result; - /* The buffer needs at least one more byte to allow room for normalizing. */ - *size = size_from_kind (dtp, f, kind) + precision + 1; + /* The buffer needs at least one more byte to allow room for + normalizing and 1 to hold null terminator. */ + *size = size_from_kind (dtp, f, kind) + precision + 1 + 1; if (*size > BUF_STACK_SZ)