diff options
| author | ticktock35 <ticktock35@e8e0d7a0-c8d9-11dd-a880-a1081c7ac358> | 2009-09-21 06:11:52 (EDT) |
|---|---|---|
| committer | ticktock35 <ticktock35@e8e0d7a0-c8d9-11dd-a880-a1081c7ac358> | 2009-09-21 06:11:52 (EDT) |
| commit | fc7384c7d44650e9caa25a2f57c05ae9fea7d870 (patch) | |
| tree | 6bc8dd365a7c3fa5919cf2787d665463ce8e3890 /libbb | |
| parent | 3635a6e7099906551fe89102b4026b387e12a1d1 (diff) | |
Fix opkg doesn't handle long link/path names in tar files well
1. provide opkg with a tar file that has a link name that is 100
characters
or
2. provide opkg with a tar file that has a 'path_prefix' of 155
characters.
Thanks to pblack88@gmail.com
http://code.google.com/p/opkg/issues/detail?id=21
git-svn-id: http://opkg.googlecode.com/svn/trunk@217 e8e0d7a0-c8d9-11dd-a880-a1081c7ac358
Diffstat (limited to 'libbb')
| -rw-r--r-- | libbb/unarchive.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libbb/unarchive.c b/libbb/unarchive.c index 19aabff..d0896ba 100644 --- a/libbb/unarchive.c +++ b/libbb/unarchive.c @@ -605,8 +605,10 @@ file_header_t *get_header_tar(FILE *tar_stream) if (tar.formated.prefix[0]) { char *temp = tar_entry->name; - tar_entry->name = concat_path_file(tar.formated.prefix, temp); + char *prefixTemp = strndup(tar.formated.prefix, 155); + tar_entry->name = concat_path_file(prefixTemp, temp); free(temp); + free(prefixTemp); } } @@ -621,8 +623,7 @@ file_header_t *get_header_tar(FILE *tar_stream) tar_entry->gid = strtol(tar.formated.gid, NULL, 8); tar_entry->size = strtol(tar.formated.size, NULL, 8); tar_entry->mtime = strtol(tar.formated.mtime, NULL, 8); - tar_entry->link_name = strlen(tar.formated.linkname) ? - xstrdup(tar.formated.linkname) : NULL; + tar_entry->link_name = *tar.formated.linkname != '\0' ? xstrndup(tar.formated.linkname, 100) : NULL; tar_entry->device = (strtol(tar.formated.devmajor, NULL, 8) << 8) + strtol(tar.formated.devminor, NULL, 8); |