upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-06-09 00:32:25 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use malloc in write_archive to allocate a 64kB buffer for holding file data

Browse source 
instead of using 64kB of stack space in copy_file_data and write_file_data.
This commit is contained in:
Colin Percival 2008-07-05 08:03:08 +00:00
parent 3a877a1d93
commit d47b2ddb21
2 changed files with 21 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
usr.bin/tar/bsdtar.h
View file

@ -94,6 +94,7 @@ struct bsdtar {
struct archive_entry_linkresolver *resolver;
struct archive_dir *archive_dir; /* for write.c */
struct name_cache *gname_cache; /* for write.c */
char *buff; /* for write.c */
struct matching *matching; /* for matching.c */
struct security *security; /* for read.c */
struct name_cache *uname_cache; /* for write.c */

32
usr.bin/tar/write.c
View file

@ -79,6 +79,9 @@ __FBSDID("$FreeBSD$");
#include "bsdtar.h"
#include "tree.h"
/* Size of buffer for holding file data prior to writing. */
#define FILEDATABUFLEN 65536
/* Fixed size of uname/gname caches. */
#define name_cache_size 101
@ -434,6 +437,10 @@ write_archive(struct archive *a, struct bsdtar *bsdtar)
const char *arg;
struct archive_entry *entry, *sparse_entry;
/* Allocate a buffer for file data. */
if ((bsdtar->buff = malloc(FILEDATABUFLEN)) == NULL)
bsdtar_errc(bsdtar, 1, 0, "cannot allocate memory");
if ((bsdtar->resolver = archive_entry_linkresolver_new()) == NULL)
bsdtar_errc(bsdtar, 1, 0, "cannot create link resolver");
archive_entry_linkresolver_set_strategy(bsdtar->resolver,
@ -484,6 +491,9 @@ write_archive(struct archive *a, struct bsdtar *bsdtar)
bsdtar_warnc(bsdtar, 0, "%s", archive_error_string(a));
bsdtar->return_value = 1;
}
/* Free file data buffer. */
free(bsdtar->buff);
}
/*
@ -615,22 +625,23 @@ append_archive(struct bsdtar *bsdtar, struct archive *a, struct archive *ina)
static int
copy_file_data(struct bsdtar *bsdtar, struct archive *a, struct archive *ina)
{
char buff[64*1024];
ssize_t bytes_read;
ssize_t bytes_written;
off_t progress = 0;
bytes_read = archive_read_data(ina, buff, sizeof(buff));
bytes_read = archive_read_data(ina, bsdtar->buff, FILEDATABUFLEN);
while (bytes_read > 0) {
siginfo_printinfo(bsdtar, progress);
bytes_written = archive_write_data(a, buff, bytes_read);
bytes_written = archive_write_data(a, bsdtar->buff,
bytes_read);
if (bytes_written < bytes_read) {
bsdtar_warnc(bsdtar, 0, "%s", archive_error_string(a));
return (-1);
}
progress += bytes_written;
bytes_read = archive_read_data(ina, buff, sizeof(buff));
bytes_read = archive_read_data(ina, bsdtar->buff,
FILEDATABUFLEN);
}
return (0);
@ -956,24 +967,21 @@ abort:
}
/* Helper function to copy file to archive, with stack-allocated buffer. */
/* Helper function to copy file to archive. */
static int
write_file_data(struct bsdtar *bsdtar, struct archive *a,
struct archive_entry *entry, int fd)
{
char buff[64*1024];
ssize_t bytes_read;
ssize_t bytes_written;
off_t progress = 0;
/* XXX TODO: Allocate buffer on heap and store pointer to
* it in bsdtar structure; arrange cleanup as well. XXX */
bytes_read = read(fd, buff, sizeof(buff));
bytes_read = read(fd, bsdtar->buff, FILEDATABUFLEN);
while (bytes_read > 0) {
siginfo_printinfo(bsdtar, progress);
bytes_written = archive_write_data(a, buff, bytes_read);
bytes_written = archive_write_data(a, bsdtar->buff,
FILEDATABUFLEN);
if (bytes_written < 0) {
/* Write failed; this is bad */
bsdtar_warnc(bsdtar, 0, "%s", archive_error_string(a));
@ -987,7 +995,7 @@ write_file_data(struct bsdtar *bsdtar, struct archive *a,
return (0);
}
progress += bytes_written;
bytes_read = read(fd, buff, sizeof(buff));
bytes_read = read(fd, bsdtar->buff, FILEDATABUFLEN);
}
return 0;
}