aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Haley <aph@redhat.com>2004-10-21 14:38:13 +0000
committerAndrew Haley <aph@gcc.gnu.org>2004-10-21 14:38:13 +0000
commitd600a3a435e1a8556480916886e895cbc5ead8dd (patch)
treee4f76e7ad2467b5e858c8ecc5b6cfc81b4c0bd55
parent6f4fd16d75e0eda77a1861a0d6c7c424e5803481 (diff)
downloadgcc-d600a3a435e1a8556480916886e895cbc5ead8dd.zip
gcc-d600a3a435e1a8556480916886e895cbc5ead8dd.tar.gz
gcc-d600a3a435e1a8556480916886e895cbc5ead8dd.tar.bz2
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
-rw-r--r--gcc/java/ChangeLog10
-rw-r--r--gcc/java/jcf-parse.c4
2 files changed, 13 insertions, 1 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index aeae423..5863fec 100644
--- 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 46e096d..f04b9f9 100644
--- 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--)
{