gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-02-08 07:21:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r26077) -Codechange: handle strings like strings when scanning a tar instead of merely blobs of memory

Browse Source
This commit is contained in:
rubidium 2013-11-23 21:42:45 +00:00
parent 5049e938f5
commit 5e2d22da79
1 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/fileio.cpp
View File

@ -761,7 +761,7 @@ bool TarScanner::AddFile(const char *filename, size_t basepath_length, const cha
TarHeader th; TarHeader th;
char buf[sizeof(th.name) + 1], *end; char buf[sizeof(th.name) + 1], *end;
char name[sizeof(th.prefix) + 1 + sizeof(th.name) + 1]; char name[sizeof(th.prefix) + 1 + sizeof(th.name) + 1] = "";
char link[sizeof(th.linkname) + 1]; char link[sizeof(th.linkname) + 1];
char dest[sizeof(th.prefix) + 1 + sizeof(th.name) + 1 + 1 + sizeof(th.linkname) + 1]; char dest[sizeof(th.prefix) + 1 + sizeof(th.name) + 1 + 1 + sizeof(th.linkname) + 1];
size_t num = 0, pos = 0; size_t num = 0, pos = 0;
@ -784,25 +784,17 @@ bool TarScanner::AddFile(const char *filename, size_t basepath_length, const cha
return false; return false;
} }
name[0] = '\0';
size_t len = 0;
/* The prefix contains the directory-name */ /* The prefix contains the directory-name */
if (th.prefix[0] != '\0') { if (th.prefix[0] != '\0') {
memcpy(name, th.prefix, sizeof(th.prefix)); ttd_strlcpy(name, th.prefix, lengthof(name));
name[sizeof(th.prefix)] = '\0'; ttd_strlcat(name, PATHSEP, lengthof(name));
len = strlen(name);
name[len] = PATHSEPCHAR;
len++;
} }
/* Copy the name of the file in a safe way at the end of 'name' */ /* Copy the name of the file in a safe way at the end of 'name' */
memcpy(&name[len], th.name, sizeof(th.name)); ttd_strlcat(name, th.name, lengthof(name));
name[len + sizeof(th.name)] = '\0';
/* Calculate the size of the file.. for some strange reason this is stored as a string */ /* Calculate the size of the file.. for some strange reason this is stored as a string */
memcpy(buf, th.size, sizeof(th.size)); ttd_strlcpy(buf, th.size, lengthof(buf));
buf[sizeof(th.size)] = '\0';
size_t skip = strtoul(buf, &end, 8); size_t skip = strtoul(buf, &end, 8);
switch (th.typeflag) { switch (th.typeflag) {
@ -831,8 +823,7 @@ bool TarScanner::AddFile(const char *filename, size_t basepath_length, const cha
case '1': // hard links case '1': // hard links
case '2': { // symbolic links case '2': { // symbolic links
/* Copy the destination of the link in a safe way at the end of 'linkname' */ /* Copy the destination of the link in a safe way at the end of 'linkname' */
memcpy(link, th.linkname, sizeof(th.linkname)); ttd_strlcpy(link, th.linkname, lengthof(link));
link[sizeof(th.linkname)] = '\0';
if (strlen(name) == 0 || strlen(link) == 0) break; if (strlen(name) == 0 || strlen(link) == 0) break;
@ -848,7 +839,7 @@ bool TarScanner::AddFile(const char *filename, size_t basepath_length, const cha
/* Process relative path. /* Process relative path.
* Note: The destination of links must not contain any directory-links. */ * Note: The destination of links must not contain any directory-links. */
strecpy(dest, name, lastof(dest)); ttd_strlcpy(dest, name, lengthof(dest));
char *destpos = strrchr(dest, PATHSEPCHAR); char *destpos = strrchr(dest, PATHSEPCHAR);
if (destpos == NULL) destpos = dest; if (destpos == NULL) destpos = dest;
*destpos = '\0'; *destpos = '\0';