|
From: <sv...@va...> - 2005-06-17 19:28:51
|
Author: njn
Date: 2005-06-17 20:28:29 +0100 (Fri, 17 Jun 2005)
New Revision: 3921
Log:
Fix strchr. It was rather bogus.
Modified:
trunk/memcheck/tests/strchr.c
trunk/memcheck/tests/strchr.stderr.exp
Modified: trunk/memcheck/tests/strchr.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/memcheck/tests/strchr.c 2005-06-17 13:06:53 UTC (rev 3920)
+++ trunk/memcheck/tests/strchr.c 2005-06-17 19:28:29 UTC (rev 3921)
@@ -7,8 +7,12 @@
=20
int main(int argc, char* argv[])
{
- char* s =3D malloc(10);
- char* a =3D strchr(s, '\0');
- char* b =3D strrchr(s, '\0');
- return ((int)a + (int)b);
+ char *s, *a, *b;
+ s =3D malloc(sizeof(char));
+
+ // Nb: s[0] is uninitialised, but almost certainly a zero
+ =20
+ a =3D strchr (s, '1');
+ b =3D strrchr(s, '1');
+ return 0;//((int)a + (int)b);
}
Modified: trunk/memcheck/tests/strchr.stderr.exp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/memcheck/tests/strchr.stderr.exp 2005-06-17 13:06:53 UTC (rev 3=
920)
+++ trunk/memcheck/tests/strchr.stderr.exp 2005-06-17 19:28:29 UTC (rev 3=
921)
@@ -1,7 +1,15 @@
Conditional jump or move depends on uninitialised value(s)
at 0x........: index (mac_replace_strmem.c:...)
- by 0x........: main (strchr.c:11)
+ by 0x........: main (strchr.c:15)
=20
Conditional jump or move depends on uninitialised value(s)
at 0x........: index (mac_replace_strmem.c:...)
- by 0x........: main (strchr.c:12)
+ by 0x........: main (strchr.c:15)
+
+Conditional jump or move depends on uninitialised value(s)
+ at 0x........: rindex (mac_replace_strmem.c:...)
+ by 0x........: main (strchr.c:16)
+
+Conditional jump or move depends on uninitialised value(s)
+ at 0x........: rindex (mac_replace_strmem.c:...)
+ by 0x........: main (strchr.c:16)
|