| Message ID | aa051ffd-fbe8-e93a-ffca-48d959163efd@charter.net |
|---|---|
| State | New |
| Headers | show
Delivered-To: patches-gcc@linaro.org Received: by 2002:a2e:9d82:0:0:0:0:0 with SMTP id c2-v6csp3293214ljj; Mon, 28 May 2018 14:25:33 -0700 (PDT) X-Google-Smtp-Source: AB8JxZradiArNDUtLkVNnTBjH3n31tZ17QJyYf51GrJR0RKcrBbgY9SX43t8AaZEOskstouhL8Vp X-Received: by 2002:a63:7553:: with SMTP id f19-v6mr11939193pgn.314.1527542733183; Mon, 28 May 2018 14:25:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527542733; cv=none; d=google.com; s=arc-20160816; b=go55hAkqH36IwVW7eOLmk/bhlqJPQOa6YoXN0EO11H1aw2pqUUfd6WbkzuN38qxO6S AI+TL+ieMjIuy0MppgOqb8/iZLNSFzyBl4kSbWsnQk3AYmQbMeeaECKY7rsND8Coi2zs zPeWDGcfChbc2nmMcSxCrH+VL3RiZ7fqIGMZ+XXiGHVVrQDweOG0ex2m5GWkeRwWlkMn 153HzCYIeaiA549Oqz//rDSAr3ZrpW6kbZeX+8YBFKS6QR8cSARH8aTGK1i09d6LJE0C 16zQfF5wI0lbKg68u4Q0Uj4oh4bLBskmmNkuLR9FH+yiXz/UAY8KpjP+C1v0YC/APmo8 AMXQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:user-agent:date:message-id :subject:from:cc:to:delivered-to:sender:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:mailing-list :dkim-signature:domainkey-signature:arc-authentication-results; bh=8cv66ienyBMgGpMflsYhvJSydUvetUiHr8BaqQwbC6I=; b=gJNtLsC40yGgwOeVYe9CoBRAW2vuMbl0cMdJ0q2RgjT+Bi6ixrltEGS41xkKomhgUJ 6l/4SJHrYUqBi2K2q47geqq/Hq64IAaQR/AW0zyqf0/UUld+sJqEpDuBvIvr5Ajvzb9C 6jX8vF7TFtbJLjCeZl4iGPUfQnfEwOfdgfWZ+0rSwi7u13hMxuBIzuAc1fp/YiEYL2ys JpiXwHhTa810mmsn45QxSAx7Y+g+41PI7uMA3Zyw0KJqSztr4sSsH3M83GN2zyuRPRMj N+51ShskMzs+142yGKiL5E8Pqxj7U2J8tpAm3pjK1a5XWaakLAmJNEJ8PT/8bxDYsgTw AbjA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=jRF5Qg8B; spf=pass (google.com: domain of gcc-patches-return-478626-patches-gcc=linaro.org@gcc.gnu.org designates 209.132.180.131 as permitted sender) smtp.mailfrom=gcc-patches-return-478626-patches-gcc=linaro.org@gcc.gnu.org Return-Path: <gcc-patches-return-478626-patches-gcc=linaro.org@gcc.gnu.org> Received: from sourceware.org (server1.sourceware.org. [209.132.180.131]) by mx.google.com with ESMTPS id v80-v6si31690668pfa.173.2018.05.28.14.25.32 for <patches-gcc@linaro.org> (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 28 May 2018 14:25:33 -0700 (PDT) Received-SPF: pass (google.com: domain of gcc-patches-return-478626-patches-gcc=linaro.org@gcc.gnu.org designates 209.132.180.131 as permitted sender) client-ip=209.132.180.131; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=jRF5Qg8B; spf=pass (google.com: domain of gcc-patches-return-478626-patches-gcc=linaro.org@gcc.gnu.org designates 209.132.180.131 as permitted sender) smtp.mailfrom=gcc-patches-return-478626-patches-gcc=linaro.org@gcc.gnu.org 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=nad8/HC41V9XvWlC fPId9XaKm98IA+FRBGxLc483rZDLgrJXMIdIKWNALPpxH3zUvri7CVXodMZ9KdJ2 LEXOq9BRK8/pqAiRbAolvdg0T5Ub0P3xJBTjQDC+zOaNldSm+sjMqncT/JQEHSO7 pujx6rXirQ+6yBlEjqSqphO7EPg= 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=YhW1l2n2bgI+ePoGS31FFy uxnDo=; b=jRF5Qg8BMnNNuEYaexYy4rou07/u4NFSNATsCp9vp5fVq2av2HubhU WLYNiCG8ionuDTuYX2ukgHr0ana4JUHyUESimfgFHRbntWm8ptAWYvcwhUfXOxW1 g48GyCkvHOV4Ns5a0zCPdvD7HorRxjcpbI9J+SOPkmScsWwWU/ZJo= Received: (qmail 35771 invoked by alias); 28 May 2018 21:25:22 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: <gcc-patches.gcc.gnu.org> List-Unsubscribe: <mailto:gcc-patches-unsubscribe-patches-gcc=linaro.org@gcc.gnu.org> List-Archive: <http://gcc.gnu.org/ml/gcc-patches/> List-Post: <mailto:gcc-patches@gcc.gnu.org> List-Help: <mailto:gcc-patches-help@gcc.gnu.org> Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 35663 invoked by uid 89); 28 May 2018 21:25:11 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.0 required=5.0 tests=AWL, BAYES_00, FREEMAIL_FROM, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.2 spammy=dtp, *source, st_parameter_dt, H*r:ip*192.168.1.6 X-Spam-User: qpsmtpd, 2 recipients X-HELO: mtaout006-public.msg.strl.va.charter.net Received: from mtaout006-public.msg.strl.va.charter.net (HELO mtaout006-public.msg.strl.va.charter.net) (68.114.190.31) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 28 May 2018 21:25:09 +0000 Received: from impout003 ([68.114.189.18]) by mtaout006.msg.strl.va.charter.net (InterMail vM.9.00.023.01 201-2473-194) with ESMTP id <20180528212507.EWBX7358.mtaout006.msg.strl.va.charter.net@impout003>; Mon, 28 May 2018 16:25:07 -0500 Received: from [192.168.1.6] ([96.41.213.35]) by impout003 with charter.net id rxR61x00A0mPCJg01xR7Ch; Mon, 28 May 2018 16:25:07 -0500 X-Authority-Analysis: v=2.2 cv=HqsGIwbS c=1 sm=1 tr=0 a=NNeuWy7OTYa7gJ+3pFFB5Q==:117 a=NNeuWy7OTYa7gJ+3pFFB5Q==:17 a=IkcTkHD0fZMA:10 a=x7bEGLp0ZPQA:10 a=mDV3o1hIAAAA:8 a=6K4COjM4EBbzr9C40boA:9 a=kxhKOdnp8PJTZs66:21 a=RpqeED2-CtQH8jh-:21 a=QEXdDO2ut3YA:10 a=_FVE-zBwftR9WsbkzFJk:22 X-Auth-id: anZkZWxpc2xlQGNoYXJ0ZXIubmV0 To: "fortran@gcc.gnu.org" <fortran@gcc.gnu.org> Cc: GCC Patches <gcc-patches@gcc.gnu.org> From: Jerry DeLisle <jvdelisle@charter.net> Subject: [patch, libgfortran] Bug 85840 - Memory leak in write.c Message-ID: <aa051ffd-fbe8-e93a-ffca-48d959163efd@charter.net> Date: Mon, 28 May 2018 14:25:06 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.8.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit |
| Series |
|
| Related |
show
|
diff --git a/libgfortran/io/write.c b/libgfortran/io/write.c index 5d52fd6914f..dc6a234f42e 100644 --- a/libgfortran/io/write.c +++ b/libgfortran/io/write.c @@ -1682,7 +1682,7 @@ write_real (st_parameter_dt *dtp, const char *source, int kind) char buf_stack[BUF_STACK_SZ]; char str_buf[BUF_STACK_SZ]; char *buffer, *result; - size_t buf_size, res_len; + size_t buf_size, res_len, flt_str_len; int orig_scale = dtp->u.p.scale_factor; dtp->u.p.scale_factor = 1;
The attached patch is a follow on from my previous for this PR. I could not reproduce the problem on these code paths, but one should not assume it won't happen. Patch is obvious and I will commit shortly. Regression tested on x86_64. 2018-05-28 Jerry DeLisle <jvdelisle@gcc.gnu.org> PR libgfortran/85840 * io/write.c (write_real, write_real_g0, write_complex): Use separate local variables for the float string length. set_fnode_default (dtp, &f, kind); @@ -1697,8 +1697,8 @@ write_real (st_parameter_dt *dtp, const char *source, int kind) buffer = select_buffer (dtp, &f, precision, buf_stack, &buf_size, kind); get_float_string (dtp, &f, source , kind, 1, buffer, - precision, buf_size, result, &res_len); - write_float_string (dtp, result, res_len); + precision, buf_size, result, &flt_str_len); + write_float_string (dtp, result, flt_str_len); dtp->u.p.scale_factor = orig_scale; if (buf_size > BUF_STACK_SZ) @@ -1717,7 +1717,7 @@ write_real_g0 (st_parameter_dt *dtp, const char *source, int kind, int d) char buf_stack[BUF_STACK_SZ]; char str_buf[BUF_STACK_SZ]; char *buffer, *result; - size_t buf_size, res_len; + size_t buf_size, res_len, flt_str_len; int comp_d; set_fnode_default (dtp, &f, kind); @@ -1741,8 +1741,8 @@ write_real_g0 (st_parameter_dt *dtp, const char *source, int kind, int d) buffer = select_buffer (dtp, &f, precision, buf_stack, &buf_size, kind); get_float_string (dtp, &f, source , kind, comp_d, buffer, - precision, buf_size, result, &res_len); - write_float_string (dtp, result, res_len); + precision, buf_size, result, &flt_str_len); + write_float_string (dtp, result, flt_str_len); dtp->u.p.g0_no_blanks = 0; if (buf_size > BUF_STACK_SZ) @@ -1767,7 +1767,7 @@ write_complex (st_parameter_dt *dtp, const char *source, int kind, size_t size) char str1_buf[BUF_STACK_SZ]; char str2_buf[BUF_STACK_SZ]; char *buffer, *result1, *result2; - size_t buf_size, res_len1, res_len2; + size_t buf_size, res_len1, res_len2, flt_str_len1, flt_str_len2; int width, lblanks, orig_scale = dtp->u.p.scale_factor; dtp->u.p.scale_factor = 1; @@ -1790,18 +1790,18 @@ write_complex (st_parameter_dt *dtp, const char *source, int kind, size_t size) buffer = select_buffer (dtp, &f, precision, buf_stack, &buf_size, kind); get_float_string (dtp, &f, source , kind, 0, buffer, - precision, buf_size, result1, &res_len1); + precision, buf_size, result1, &flt_str_len1); get_float_string (dtp, &f, source + size / 2 , kind, 0, buffer, - precision, buf_size, result2, &res_len2); + precision, buf_size, result2, &flt_str_len2); if (!dtp->u.p.namelist_mode) { - lblanks = width - res_len1 - res_len2 - 3; + lblanks = width - flt_str_len1 - flt_str_len2 - 3; write_x (dtp, lblanks, lblanks); } write_char (dtp, '('); - write_float_string (dtp, result1, res_len1); + write_float_string (dtp, result1, flt_str_len1); write_char (dtp, semi_comma); - write_float_string (dtp, result2, res_len2); + write_float_string (dtp, result2, flt_str_len2); write_char (dtp, ')'); dtp->u.p.scale_factor = orig_scale;