From: Tom Tromey <tromey@redhat.com>
Date: Wed, 4 Sep 2002 22:40:55 +0000 (+0000)
Subject: re PR java/7830 (Off-by-one buffer overruns in fastjar tool)
X-Git-Tag: releases/gcc-3.3.0~3033
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a038cc83d66e70c608995e066de22ced97b8ad38;p=thirdparty%2Fgcc.git

re PR java/7830 (Off-by-one buffer overruns in fastjar tool)

	From greenrd@hotmail.com:
	* jartool.c (list_jar): Correctly determine when new `filename'
	buffer must be allocated.  Fixes PR java/7830.

From-SVN: r56818
---

diff --git a/fastjar/ChangeLog b/fastjar/ChangeLog
index 42cc98ab3904..6528dd0437f8 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 2436606d5026..7251185d61f7 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);