diff options
| author | Tobias Burnus <burnus@net-b.de> | 2012-09-15 17:42:01 +0200 |
|---|---|---|
| committer | Tobias Burnus <burnus@gcc.gnu.org> | 2012-09-15 17:42:01 +0200 |
| commit | fd2805e11b7018a148a4f87201b4d85344b5aad4 (patch) | |
| tree | 05e97776b1fe54ef1d015ca3c6f07b279078ff83 /gcc/fortran/simplify.c | |
| parent | 8385420c4f45090a3393557783d8c7c73ef9a9b7 (diff) | |
| download | gcc-fd2805e11b7018a148a4f87201b4d85344b5aad4.zip gcc-fd2805e11b7018a148a4f87201b4d85344b5aad4.tar.gz gcc-fd2805e11b7018a148a4f87201b4d85344b5aad4.tar.bz2 | |
match.c (lock_unlock_statement, [...]): Fix potential double freeing.
2012-09-15 Tobias Burnus <burnus@net-b.de>
* match.c (lock_unlock_statement, sync_statement): Fix potential
double freeing.
(sync_statement): Remove unreachable code.
* simplify.c (gfc_simplify_bessel_n2): Avoid double freeing.
(gfc_simplify_repeat): Remove bogus code.
* target-memory.h (gfc_target_encode_expr): Update prototype.
* target-memory.c (gfc_target_encode_expr, encode_array,
encode_derived): Return unsigned HOST_WIDE_INT.
(gfc_target_interpret_expr): Add assert.
(gfc_merge_initializers): Fix "== 0" check for mpz_t.
* symbol.c (gfc_get_typebound_proc): Add assert.
(gfc_merge_initializers): Remove unreachable check.
From-SVN: r191343
Diffstat (limited to 'gcc/fortran/simplify.c')
| -rw-r--r-- | gcc/fortran/simplify.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/gcc/fortran/simplify.c b/gcc/fortran/simplify.c index 07aeee8..5aa2704 100644 --- a/gcc/fortran/simplify.c +++ b/gcc/fortran/simplify.c @@ -1370,7 +1370,11 @@ gfc_simplify_bessel_n2 (gfc_expr *order1, gfc_expr *order2, gfc_expr *x, mpfr_sub (e->value.real, e->value.real, last1, GFC_RND_MODE); if (range_check (e, jn ? "BESSEL_JN" : "BESSEL_YN") == &gfc_bad_expr) - goto error; + { + /* Range_check frees "e" in that case. */ + e = NULL; + goto error; + } if (jn) gfc_constructor_insert_expr (&result->value.constructor, e, &x->where, @@ -4930,11 +4934,6 @@ gfc_simplify_repeat (gfc_expr *e, gfc_expr *n) else ncop = 0; - len = e->value.character.length; - nlen = ncop * len; - - result = gfc_get_constant_expr (BT_CHARACTER, e->ts.kind, &e->where); - if (ncop == 0) return gfc_get_character_expr (e->ts.kind, &e->where, NULL, 0); |