OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

re PR fortran/32124 (Execution stops with stat= in ALLOCATE) 

2007-05-28  Tobias Burnus  <burnus@net-b.de>

	PR fortran/32124
	* runtime/memory.c (allocate_size): Use ERROR_ALLOCATION.
	(allocate,allocate64): Use stat variable if present.

From-SVN: r125133
This commit is contained in:
Tobias Burnus 2007-05-28 18:39:35 +02:00 committed by Tobias Burnus
parent 6124296bce
commit 3078848ea3
2 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libgfortran/ChangeLog
View File

@ -1,3 +1,9 @@
2007-05-28 Tobias Burnus <burnus@net-b.de>
PR fortran/32124
* runtime/memory.c (allocate_size): Use ERROR_ALLOCATION.
(allocate,allocate64): Use stat variable if present.
2007-05-27 Janne Blomqvist <jb@gcc.gnu.org>
* runtime/string.c (compare0): Use gfc_charlen_type instead of

26
libgfortran/runtime/memory.c
View File

@ -144,7 +144,7 @@ allocate_size (size_t size, GFC_INTEGER_4 * stat)
{
if (stat)
{
*stat = 1;
*stat = ERROR_ALLOCATION;
return newmem;
}
else
@ -164,8 +164,16 @@ void *
allocate (GFC_INTEGER_4 size, GFC_INTEGER_4 * stat)
{
if (size < 0)
runtime_error ("Attempt to allocate negative amount of memory. "
"Possible integer overflow");
{
if (stat)
{
*stat = ERROR_ALLOCATION;
return NULL;
}
else
runtime_error ("Attempt to allocate negative amount of memory. "
"Possible integer overflow");
}
return allocate_size ((size_t) size, stat);
}
@ -177,8 +185,16 @@ void *
allocate64 (GFC_INTEGER_8 size, GFC_INTEGER_4 * stat)
{
if (size < 0)
runtime_error ("ALLOCATE64: Attempt to allocate negative amount of "
"memory. Possible integer overflow");
{
if (stat)
{
*stat = ERROR_ALLOCATION;
return NULL;
}
else
runtime_error ("ALLOCATE64: Attempt to allocate negative amount of "
"memory. Possible integer overflow");
}
return allocate_size ((size_t) size, stat);
}