mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-04 07:35:24 +02:00
Code Issues Wiki Activity

Bug 139207: Browsing into some remote tar archives via dstore fails, and crashes the dstore server. This only occurred for tars generated on Windows and the problem was with reading the last entries in the tar archive which are different when generated on Windows than on Linux. The tar format does not specify how archives should end, though it does recommend a certain format. The problem was fixed by making our code more robust when it comes to handling end of archive entries.

Browse source
This commit is contained in:
Kushal Munir 2006-09-20 11:34:25 +00:00
parent 3f3351fdcf
commit fc4f9921d5
1 changed files with 30 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/services/clientserver/util/tar/TarFile.java
View file

@ -152,11 +152,24 @@ public class TarFile implements ITarConstants {
// if header is not null, we add it to our list of headers
if (header != null) {
// add header
blockHeaders.add(header);
// determine how many blocks make up the contents of the file
long fileSize = header.getSize();
long fileSize = 0;
// Bug 139207: Browsing into some tar archives failed
// The reason was that the last entry in the file did not necessarily have an empty string as the name
// of the entry and so the header is not null. The tar format does not guarantee an empty name.
// Instead we get a NumberFormatException when reading the size. We assume that the entries
// are not valid in such cases.
try {
fileSize = header.getSize();
}
catch (NumberFormatException e) {
break;
}
// add header only if the size is valid
blockHeaders.add(header);
int numFileBlocks = (int)(fileSize / BLOCK_SIZE);
numFileBlocks += (fileSize % BLOCK_SIZE) > 0 ? 1 : 0;
@ -299,7 +312,19 @@ public class TarFile implements ITarConstants {
// if header is not null, we add it to our list of headers
if (header != null) {
long fileSize = header.getSize();
long fileSize = 0;
// Bug 139207: Browsing into some tar archives failed
// The reason was that the last entry in the file did not necessarily have an empty string as the name
// of the entry and so the header is not null. The tar format does not guarantee an empty name.
// Instead we get a NumberFormatException when reading the size. We assume that the entries
// are not valid in such cases.
try {
fileSize = header.getSize();
}
catch (NumberFormatException e) {
break;
}
// if the header name does not match the entry name
if (!header.getName().equals(entry.getName())) {