From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 7932) id 3E0F93858D38; Mon, 28 Aug 2023 16:43:50 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 3E0F93858D38 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1693241030; bh=PxxNEC0WObRTf07vdDVfATI+6U6KoKbxF3bKFO443Dk=; h=From:To:Subject:Date:From; b=sbE7JbwkrhUnu+cf3dmJ8Q20UTvdC23wVWSAwFhEHNPgK/b9pDBD2bIdLXwE/hAqt +OPoZzHx4BUk1ubLcr3g5Dv/+LbbXntYOfmn1Hq8NXfGHTET1wlfSXAV0murewC+ke kQnLpXkbwa7PRN+PS/71iDlK8E6WDy1ih3u1V/II= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Joe Simmons-Talbott To: glibc-cvs@sourceware.org Subject: [glibc] gencat: Get rid of alloca. X-Act-Checkin: glibc X-Git-Author: Joe Simmons-Talbott X-Git-Refname: refs/heads/master X-Git-Oldrev: 87ced255bdf2681f5bf6c89d7121e59f6f342161 X-Git-Newrev: 4d8b09393354f6ce079f399df5b84abf0db894b5 Message-Id: <20230828164350.3E0F93858D38@sourceware.org> Date: Mon, 28 Aug 2023 16:43:50 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=4d8b09393354f6ce079f399df5b84abf0db894b5 commit 4d8b09393354f6ce079f399df5b84abf0db894b5 Author: Joe Simmons-Talbott Date: Mon Aug 28 16:42:13 2023 +0000 gencat: Get rid of alloca. Convert to scratch_buffers to avoid potential stack overflow. Checked on x86_64-linux-gnu and aarch64-linux-gnu. Reviewed-by: Adhemerval Zanella Diff: --- catgets/gencat.c | 37 +++++++++++++++++++++++++++++++------ 1 file changed, 31 insertions(+), 6 deletions(-) diff --git a/catgets/gencat.c b/catgets/gencat.c index 9cacc801b5..63bdbf86a6 100644 --- a/catgets/gencat.c +++ b/catgets/gencat.c @@ -32,6 +32,7 @@ #include #include #include +#include #include #include #include @@ -854,6 +855,10 @@ write_out (struct catalog *catalog, const char *output_name, uint32_t *array1, *array2; size_t cnt; int fd; + struct scratch_buffer buf1; + scratch_buffer_init (&buf1); + struct scratch_buffer buf2; + scratch_buffer_init (&buf2); /* If not otherwise told try to read file with existing translations. */ @@ -929,9 +934,19 @@ write_out (struct catalog *catalog, const char *output_name, uint32_t array_size = best_size * best_depth * sizeof (uint32_t) * 3; /* Allocate room for all needed arrays. */ - array1 = (uint32_t *) alloca (array_size); + if (!scratch_buffer_set_array_size (&buf1, best_size * best_depth * 3, + sizeof (uint32_t))) + error (EXIT_FAILURE, ENOMEM, gettext ("cannot allocate memory")); + array1 = buf1.data; memset (array1, '\0', array_size); - array2 = (uint32_t *) alloca (array_size); + + if (!scratch_buffer_set_array_size (&buf2, best_size * best_depth * 3, + sizeof (uint32_t))) + { + scratch_buffer_free (&buf1); + error (EXIT_FAILURE, ENOMEM, gettext ("cannot allocate memory")); + } + array2 = buf2.data; obstack_init (&string_pool); set_run = catalog->all_sets; @@ -979,8 +994,12 @@ write_out (struct catalog *catalog, const char *output_name, { fd = creat (output_name, 0666); if (fd < 0) - error (EXIT_FAILURE, errno, gettext ("cannot open output file `%s'"), - output_name); + { + scratch_buffer_free (&buf1); + scratch_buffer_free (&buf2); + error (EXIT_FAILURE, errno, gettext ("cannot open output file `%s'"), + output_name); + } } /* Write out header. */ @@ -1019,8 +1038,12 @@ write_out (struct catalog *catalog, const char *output_name, { fp = fopen (header_name, "w"); if (fp == NULL) - error (EXIT_FAILURE, errno, - gettext ("cannot open output file `%s'"), header_name); + { + scratch_buffer_free (&buf1); + scratch_buffer_free (&buf2); + error (EXIT_FAILURE, errno, + gettext ("cannot open output file `%s'"), header_name); + } } /* Iterate over all sets and all messages. */ @@ -1066,6 +1089,8 @@ write_out (struct catalog *catalog, const char *output_name, if (fp != stdout) fclose (fp); } + scratch_buffer_free (&buf1); + scratch_buffer_free (&buf2); }