re PR java/18091 (Valgrind errors building libjava)

2004-10-21  Andrew Haley  <aph@redhat.com>

	PR java/18091:
	* jcf-parse.c (set_source_filename): Add code to build new sfname.

From-SVN: r89376

diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index aeae423854efafd0c008e231ff4293390da18cfa..5863fec557dc1fc516878a95489c011add789da4 100644 (file)
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,13 @@
+2004-10-21  Andrew Haley  <aph@redhat.com>
+
+       PR java/18091:
+       * jcf-parse.c (set_source_filename): Add code to build new sfname.
+
+2004-10-20  Andrew Haley  <aph@redhat.com>
+
+       * decl.c (end_java_method): Don't expand if flag_syntax_only.
+       Remove duplicated code block.
+
 2004-10-18  Steven Bosscher  <stevenb@suse.de>
 
        * Make-lang.in (java/parse.o-warn, java/parse-scan.o-warn):

diff --git a/gcc/java/jcf-parse.c b/gcc/java/jcf-parse.c
index 46e096d1d68ff5aaf39895d0ca9c07f401dae7bb..f04b9f958d913ff98fb0ce001caeda9d81cb8f37 100644 (file)
--- a/gcc/java/jcf-parse.c
+++ b/gcc/java/jcf-parse.c
@@ -151,9 +151,11 @@ set_source_filename (JCF *jcf, int index)
       char *dot = strrchr (class_name, '.');
       if (dot != NULL)
        {
-         int i = dot - class_name;
+         int i = dot - class_name + 1;
          /* Concatenate current package prefix with new sfname. */
          char *buf = xmalloc (i+new_len+3);
+         memcpy (buf, class_name, i);
+         strcpy (buf + i, sfname);
          /* Replace '.' by DIR_SEPARATOR. */
          for (; i >= 0;  i--)
            {