Qubes/core-agent-linux
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tar2qfile: fixed a bug when file contained in tar is a multiple of 512 bytes

Browse Source
This commit is contained in:
Olivier MEDOC 2013-11-14 21:18:18 +01:00 committed by Marek Marczykowski-Górecki
parent 8a1f87d0ed
commit 8e853c752c
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
qubes-rpc/tar2qfile.c
View File

@ -744,7 +744,8 @@ ustar_rd (int fd, struct file_header * untrusted_hdr, char *buf, struct stat * s
} }
// Extract extra padding // Extract extra padding
fprintf(stderr,"Need to remove pad:%ld %ld\n",untrusted_hdr->filelen,BLKMULT-(untrusted_hdr->filelen%BLKMULT)); fprintf(stderr,"Need to remove pad:%ld %ld\n",untrusted_hdr->filelen,BLKMULT-(untrusted_hdr->filelen%BLKMULT));
ret = read(fd, buf, BLKMULT-(untrusted_hdr->filelen%BLKMULT)); if (untrusted_hdr->filelen%BLKMULT < BLKMULT)
ret = read(fd, buf, BLKMULT-(untrusted_hdr->filelen%BLKMULT));
fprintf(stderr,"Removed %d bytes of padding\n",ret); fprintf(stderr,"Removed %d bytes of padding\n",ret);
// Resync trailing headers in order to find next file chunck in the tar file // Resync trailing headers in order to find next file chunck in the tar file
@ -814,8 +815,10 @@ int tar_file_processor(int fd, int filter_count, char **filter)
// Extract extra padding // Extract extra padding
fprintf(stderr,"Need to remove pad:%ld %ld %ld\n",to_skip,hdr.filelen,BLKMULT-(hdr.filelen%BLKMULT)); fprintf(stderr,"Need to remove pad:%ld %ld %ld\n",to_skip,hdr.filelen,BLKMULT-(hdr.filelen%BLKMULT));
ret = read(fd, &buf, BLKMULT-(hdr.filelen%BLKMULT)); if (hdr.filelen%BLKMULT < BLKMULT) {
fprintf(stderr,"Removed %d bytes of padding\n",ret); ret = read(fd, &buf, BLKMULT-(hdr.filelen%BLKMULT));
fprintf(stderr,"Removed %d bytes of padding\n",ret);
}
current = NEED_SYNC_TRAIL; current = NEED_SYNC_TRAIL;
} }
i++; i++;