From d600a3a435e1a8556480916886e895cbc5ead8dd Mon Sep 17 00:00:00 2001 From: Andrew Haley Date: Thu, 21 Oct 2004 14:38:13 +0000 Subject: [PATCH] re PR java/18091 (Valgrind errors building libjava) 2004-10-21 Andrew Haley PR java/18091: * jcf-parse.c (set_source_filename): Add code to build new sfname. From-SVN: r89376 --- gcc/java/ChangeLog | 10 ++++++++++ gcc/java/jcf-parse.c | 4 +++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index aeae423854e..5863fec557d 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,3 +1,13 @@ +2004-10-21 Andrew Haley + + PR java/18091: + * jcf-parse.c (set_source_filename): Add code to build new sfname. + +2004-10-20 Andrew Haley + + * decl.c (end_java_method): Don't expand if flag_syntax_only. + Remove duplicated code block. + 2004-10-18 Steven Bosscher * 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 46e096d1d68..f04b9f958d9 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--) { -- 2.30.2