mirrors/gcc
1
0
Fork 0
mirror of https://gcc.gnu.org/git/gcc.git synced 2024-11-24 03:14:08 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

jartool.c (make_manifest): Fix off-by-one bug when creating an empty MANIFEST.MF.

Browse Source 
2004-01-07  Andreas Tobler  <a.tobler@schweiz.ch>

        * jartool.c (make_manifest): Fix off-by-one bug when creating
        an empty MANIFEST.MF.

From-SVN: r75511
This commit is contained in:
Andreas Tobler 2004-01-07 19:46:04 +01:00 committed by Andreas Tobler
parent 9b773289f8
commit 6838645e85
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
fastjar/ChangeLog
View File

@ -1,3 +1,8 @@
2004-01-07 Andreas Tobler <a.tobler@schweiz.ch>
* jartool.c (make_manifest): Fix off-by-one bug when creating
an empty MANIFEST.MF.
2003-12-01 Kelley Cook <kcook@gcc.gnu.org>
* Makefile.am: Define AM_MAKINFOFLAGS. Remove Automake 1.4 hack.

10
fastjar/jartool.c
View File

@ -313,6 +313,11 @@ int number_of_entries; /* number of entries in the linked list */
/* This holds all options. */
#define OPTION_STRING "-ctxuvVf:m:C:0ME@"
/* Define the MANIFEST content here to have it easier with calculations
below. This is for the case we create an empty MANIFEST.MF. */
#define MANIFEST_STR "Manifest-Version: 1.0\nCreated-By: "
#define MANIFEST_END "\n\n"
static const struct option options[] =
{
{ "help", no_argument, NULL, OPT_HELP },
@ -732,13 +737,14 @@ int make_manifest(int jfd, const char *mf_name){
/* if the user didn't specify an external manifest file... */
if(mf_name == NULL){
int mf_len = 37 + strlen(VERSION);
int mf_len = strlen(MANIFEST_STR) + strlen(VERSION) + strlen(MANIFEST_END);
char *mf;
if((mf = (char *) malloc(mf_len + 1))) {
uLong crc;
sprintf(mf, "Manifest-Version: 1.0\nCreated-By: %s\n\n", VERSION);
sprintf(mf, "%s%s%s", MANIFEST_STR, VERSION, MANIFEST_END);
crc = crc32(0L, Z_NULL, 0);