void/void-packages
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

xbps_unpack_archive_cb: alloc buf from heap memory instead.

Browse source 
--HG--
extra : convert_revision : dfbcbfeab3e57b571388447565ca0156816e7a84
This commit is contained in:
Juan RP 2008-12-28 11:13:17 +01:00
parent a00a9a52b2
commit 27de1e8a0c
1 changed files with 17 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

20
lib/install.c
View file

@ -264,7 +264,8 @@ int
xbps_unpack_archive_cb(struct archive *ar, const char *pkgname) xbps_unpack_archive_cb(struct archive *ar, const char *pkgname)
{ {
struct archive_entry *entry; struct archive_entry *entry;
char buf[PATH_MAX]; size_t len;
char *buf;
int rv = 0, flags; int rv = 0, flags;
bool actgt = false; bool actgt = false;
@ -273,9 +274,20 @@ xbps_unpack_archive_cb(struct archive *ar, const char *pkgname)
else else
flags = 0; flags = 0;
if (snprintf(buf, sizeof(buf) - 1, ".%s/metadata/%s/prepost-action.sh", /*
XBPS_META_PATH, pkgname) < 0) * This length is '.%s/metadata/%s/prepost-action.sh' not
* including nul.
*/
len = strlen(XBPS_META_PATH) + strlen(pkgname) + 29;
buf = malloc(len + 1);
if (buf == NULL)
return ENOMEM;
if (snprintf(buf, len + 1, ".%s/metadata/%s/prepost-action.sh",
XBPS_META_PATH, pkgname) < 0) {
free(buf);
return -1; return -1;
}
while (archive_read_next_header(ar, &entry) == ARCHIVE_OK) { while (archive_read_next_header(ar, &entry) == ARCHIVE_OK) {
/* /*
@ -322,6 +334,8 @@ xbps_unpack_archive_cb(struct archive *ar, const char *pkgname)
} }
} }
free(buf);
return rv; return rv;
} }