From 97d9c1afc078b2ec8706f385a98b1e01e69c3ff0 Mon Sep 17 00:00:00 2001 From: tromey Date: Fri, 24 Jan 2003 02:37:34 +0000 Subject: [PATCH] * jcf-parse.c (parse_zip_file_entries): Overwrite trailing \0 of file name in resource buffer. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@61694 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/java/ChangeLog | 5 +++++ gcc/java/jcf-parse.c | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index 3050610..0d084b4 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,5 +1,10 @@ 2003-01-23 Tom Tromey + * jcf-parse.c (parse_zip_file_entries): Overwrite trailing \0 of + file name in resource buffer. + +2003-01-23 Tom Tromey + * expr.c (build_known_method_ref): Use method's context to find method table index. diff --git a/gcc/java/jcf-parse.c b/gcc/java/jcf-parse.c index 7545aa1..2f03202 100644 --- a/gcc/java/jcf-parse.c +++ b/gcc/java/jcf-parse.c @@ -1221,7 +1221,9 @@ parse_zip_file_entries (void) buffer = ALLOC (zdir->filename_length + 1 + (jcf->buffer_end - jcf->buffer)); strcpy (buffer, file_name); - memcpy (buffer + zdir->filename_length + 1, + /* This is not a typo: we overwrite the trailing \0 of the + file name; this is just how the data is laid out. */ + memcpy (buffer + zdir->filename_length, jcf->buffer, jcf->buffer_end - jcf->buffer); compile_resource_data (file_name, buffer, -- 2.7.4