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

re PR libfortran/54736 (GFORTRAN_CONVERT_UNIT causes malloc error on several platforms) 

2012-10-06  Thomas König  <tkoenig@gcc.gnu.org>

	PR libfortran/54736
	Backport from trunk
	* runtime/environ.c (search_unit):  Correct logic
	for binary search.
	(mark_single):  Fix index errors.

From-SVN: r192408
This commit is contained in:
Thomas Koenig 2012-10-12 18:56:16 +00:00
parent e316491693
commit d4940512f6
2 changed files with 36 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libgfortran/ChangeLog
View File

@ -1,3 +1,11 @@
2012-10-06 Thomas König <tkoenig@gcc.gnu.org>
PR libfortran/54736
Backport from trunk
* runtime/environ.c (search_unit): Correct logic
for binary search.
(mark_single): Fix index errors.
2012-09-20 Release Manager
* GCC 4.7.2 released.

42
libgfortran/runtime/environ.c
View File

@ -446,21 +446,35 @@ search_unit (int unit, int *ip)
{
int low, high, mid;
low = -1;
high = n_elist;
while (high - low > 1)
if (n_elist == 0)
{
*ip = 0;
return 0;
}
low = 0;
high = n_elist - 1;
do
{
mid = (low + high) / 2;
if (unit <= elist[mid].unit)
high = mid;
if (unit == elist[mid].unit)
{
*ip = mid;
return 1;
}
else if (unit > elist[mid].unit)
low = mid + 1;
else
low = mid;
}
*ip = high;
if (elist[high].unit == unit)
return 1;
high = mid - 1;
} while (low <= high);
if (unit > elist[mid].unit)
*ip = mid + 1;
else
return 0;
*ip = mid;
return 0;
}
/* This matches a keyword. If it is found, return the token supplied,
@ -575,13 +589,13 @@ mark_single (int unit)
}
if (search_unit (unit, &i))
{
elist[unit].conv = endian;
elist[i].conv = endian;
}
else
{
for (j=n_elist; j>=i; j--)
for (j=n_elist-1; j>=i; j--)
elist[j+1] = elist[j];
n_elist += 1;
elist[i].unit = unit;
elist[i].conv = endian;