aboutsummaryrefslogtreecommitdiff
path: root/libgfortran
diff options
context:
space:
mode:
authorThomas Koenig <Thomas.Koenig@online.de>2007-01-21 20:51:53 +0000
committerThomas Koenig <tkoenig@gcc.gnu.org>2007-01-21 20:51:53 +0000
commitbd9431157f40688ff519cc600b66990248f3b068 (patch)
treeda0f261c2091d8c049c3b6d2fe7280f6763ef07e /libgfortran
parent7fa49e7be7cf815dd55f9ef2ead04ee002d687a8 (diff)
downloadgcc-bd9431157f40688ff519cc600b66990248f3b068.zip
gcc-bd9431157f40688ff519cc600b66990248f3b068.tar.gz
gcc-bd9431157f40688ff519cc600b66990248f3b068.tar.bz2
re PR libfortran/30525 ([4.2, 4.1 only] character comparisons with padding)
2007-01-21 Thomas Koenig <Thomas.Koenig@online.de> PR libfortran/30525 * intrinsics/string_intrinsics.c(compare_string): Make sure that comparisons are done unsigned. 2007-01-21 Thomas Koenig <Thomas.Koenig@online.de> PR libfortran/30525 * gfortran.dg/char_comparison_1.f: New test. From-SVN: r121035
Diffstat (limited to 'libgfortran')
-rw-r--r--libgfortran/ChangeLog6
-rw-r--r--libgfortran/intrinsics/string_intrinsics.c6
2 files changed, 9 insertions, 3 deletions
diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog
index d81546f..f12f83e 100644
--- a/libgfortran/ChangeLog
+++ b/libgfortran/ChangeLog
@@ -1,3 +1,9 @@
+2007-01-21 Thomas Koenig <Thomas.Koenig@online.de>
+
+ PR libfortran/30525
+ * intrinsics/string_intrinsics.c(compare_string): Make
+ sure that comparisons are done unsigned.
+
2006-12-09 Tobias Burnus <burnus@net-b.de>
PR libfortran/30015
diff --git a/libgfortran/intrinsics/string_intrinsics.c b/libgfortran/intrinsics/string_intrinsics.c
index fdaddef..e432987 100644
--- a/libgfortran/intrinsics/string_intrinsics.c
+++ b/libgfortran/intrinsics/string_intrinsics.c
@@ -83,7 +83,7 @@ compare_string (GFC_INTEGER_4 len1, const char * s1,
GFC_INTEGER_4 len2, const char * s2)
{
int res;
- const char *s;
+ const unsigned char *s;
int len;
res = memcmp (s1, s2, (len1 < len2) ? len1 : len2);
@@ -96,13 +96,13 @@ compare_string (GFC_INTEGER_4 len1, const char * s1,
if (len1 < len2)
{
len = len2 - len1;
- s = &s2[len1];
+ s = (unsigned char *) &s2[len1];
res = -1;
}
else
{
len = len1 - len2;
- s = &s1[len2];
+ s = (unsigned char *) &s1[len2];
res = 1;
}