forked from pool/fastjar
4557c0d5d0
* fix-update-mode.diff * jartool.diff - Remove patch fastjar-0.98-fix.patch * Merged in jartool.diff - Remove patch fastjar-0.98-directory-traversal.patch * Merged in jartool.diff OBS-URL: https://build.opensuse.org/package/show/Java:packages/fastjar?expand=0&rev=11
45 lines
1.3 KiB
Diff
45 lines
1.3 KiB
Diff
Index: b/compress.c
|
|
===================================================================
|
|
--- a/compress.c
|
|
+++ b/compress.c
|
|
@@ -86,6 +86,10 @@ write_data (int fd, void *buf, size_t le
|
|
exit(EXIT_FAILURE);
|
|
}
|
|
}
|
|
+ else if (!next && here + len >= end_of_entries)
|
|
+ {
|
|
+ end_of_entries = here + len;
|
|
+ }
|
|
}
|
|
|
|
return write (fd, buf, len);
|
|
Index: b/jartool.c
|
|
===================================================================
|
|
--- a/jartool.c
|
|
+++ b/jartool.c
|
|
@@ -1273,15 +1273,18 @@ int add_file_to_jar(int jfd, int ffd, co
|
|
compress_file(ffd, jfd, ze, existing);
|
|
} else {
|
|
/* If we are not writing the last entry, make space for it. */
|
|
- if (existing && existing->next_entry)
|
|
+ if (existing)
|
|
{
|
|
- if (ze->usize > existing->usize)
|
|
+ if (existing->next_entry)
|
|
{
|
|
- if (shift_down (jfd, existing->next_entry->offset,
|
|
- ze->usize - existing->usize, existing->next_entry))
|
|
+ if (ze->usize > existing->usize)
|
|
{
|
|
- fprintf (stderr, "%s: %s\n", progname, strerror (errno));
|
|
- return 1;
|
|
+ if (shift_down (jfd, existing->next_entry->offset,
|
|
+ ze->usize - existing->usize, existing->next_entry))
|
|
+ {
|
|
+ fprintf (stderr, "%s: %s\n", progname, strerror (errno));
|
|
+ return 1;
|
|
+ }
|
|
}
|
|
}
|
|
}
|