diff options
| author | dnovillo <dnovillo@138bc75d-0d04-0410-961f-82ee72b054a4> | 2002-09-09 22:18:33 +0000 |
|---|---|---|
| committer | dnovillo <dnovillo@138bc75d-0d04-0410-961f-82ee72b054a4> | 2002-09-09 22:18:33 +0000 |
| commit | 889532c279291c821eab458f8744bad7d3b08358 (patch) | |
| tree | 285c9fc57cc6a657a6eac69b25094b46f6c15392 /fastjar | |
| parent | ff475a5e887b5f29593e25c8a3d291c04cbff435 (diff) | |
Mainline merge as of 2002-09-08.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/tree-ssa-20020619-branch@56989 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'fastjar')
| -rw-r--r-- | fastjar/ChangeLog | 6 | ||||
| -rw-r--r-- | fastjar/jartool.c | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/fastjar/ChangeLog b/fastjar/ChangeLog index 42cc98ab390..6528dd0437f 100644 --- a/fastjar/ChangeLog +++ b/fastjar/ChangeLog @@ -1,3 +1,9 @@ +2002-09-04 Tom Tromey <tromey@redhat.com> + + From greenrd@hotmail.com: + * jartool.c (list_jar): Correctly determine when new `filename' + buffer must be allocated. Fixes PR java/7830. + 2002-06-03 Geoffrey Keating <geoffk@redhat.com> * configure.in: Support cross-compiling. diff --git a/fastjar/jartool.c b/fastjar/jartool.c index 2436606d502..7251185d61f 100644 --- a/fastjar/jartool.c +++ b/fastjar/jartool.c @@ -1657,7 +1657,7 @@ int list_jar(int fd, char **files, int file_num){ strftime(ascii_date, 30, "%a %b %d %H:%M:%S %Z %Y", s_tm); } - if(filename_len < fnlen){ + if(filename_len < fnlen + 1){ if(filename != NULL) free(filename); @@ -1776,7 +1776,7 @@ int list_jar(int fd, char **files, int file_num){ strftime(ascii_date, 30, "%a %b %d %H:%M:%S %Z %Y", s_tm); } - if(filename_len < fnlen){ + if(filename_len < fnlen + 1){ if(filename != NULL) free(filename); |