From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2071) id 6E3A23858D35; Wed, 10 Nov 2021 19:42:36 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 6E3A23858D35 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Harald Anlauf To: gcc-cvs@gcc.gnu.org Subject: [gcc r12-5136] Fortran: avoid NULL pointer dereferences X-Act-Checkin: gcc X-Git-Author: Harald Anlauf X-Git-Refname: refs/heads/master X-Git-Oldrev: b83705b477858ba683b99fa61ff9ff83bc5be265 X-Git-Newrev: abc2f01914d6c4703de26c402fb579a9a2d0dba4 Message-Id: <20211110194236.6E3A23858D35@sourceware.org> Date: Wed, 10 Nov 2021 19:42:36 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Nov 2021 19:42:36 -0000 https://gcc.gnu.org/g:abc2f01914d6c4703de26c402fb579a9a2d0dba4 commit r12-5136-gabc2f01914d6c4703de26c402fb579a9a2d0dba4 Author: Harald Anlauf Date: Wed Nov 10 20:30:27 2021 +0100 Fortran: avoid NULL pointer dereferences CLASS(), PARAMETER is not yet properly implemented in gfortran. Using it in declarations could lead to subsequent NULL pointer dereferences during checking or simplification of expressions involving those CLASS variables. gcc/fortran/ChangeLog: PR fortran/103137 PR fortran/103138 * check.c (gfc_check_shape): Avoid NULL pointer dereference on missing ref. * simplify.c (gfc_simplify_cshift): Avoid NULL pointer dereference when shape not set. (gfc_simplify_transpose): Likewise. Diff: --- gcc/fortran/check.c | 3 +++ gcc/fortran/simplify.c | 6 ++++++ 2 files changed, 9 insertions(+) diff --git a/gcc/fortran/check.c b/gcc/fortran/check.c index 15772009af4..ffa07b510cd 100644 --- a/gcc/fortran/check.c +++ b/gcc/fortran/check.c @@ -5096,6 +5096,9 @@ gfc_check_shape (gfc_expr *source, gfc_expr *kind) if (source->rank == 0 || source->expr_type != EXPR_VARIABLE) return true; + if (source->ref == NULL) + return false; + ar = gfc_find_array_ref (source); if (ar->as && ar->as->type == AS_ASSUMED_SIZE && ar->type == AR_FULL) diff --git a/gcc/fortran/simplify.c b/gcc/fortran/simplify.c index d675f2c3aef..6a6b3fbd037 100644 --- a/gcc/fortran/simplify.c +++ b/gcc/fortran/simplify.c @@ -2109,6 +2109,9 @@ gfc_simplify_cshift (gfc_expr *array, gfc_expr *shift, gfc_expr *dim) else which = 0; + if (array->shape == NULL) + return NULL; + gfc_array_size (array, &size); arraysize = mpz_get_ui (size); mpz_clear (size); @@ -8174,6 +8177,9 @@ gfc_simplify_transpose (gfc_expr *matrix) gcc_assert (matrix->rank == 2); + if (matrix->shape == NULL) + return NULL; + result = gfc_get_array_expr (matrix->ts.type, matrix->ts.kind, &matrix->where); result->rank = 2;