jaiden
/
apk-tools
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tar: return correct error for short read of tar archive

cute-signatures
Timo Teräs 2017-01-05 16:14:44 +02:00
parent ce72c8498e
commit ca368916e0
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/archive.c
View File

@ -105,12 +105,17 @@ static ssize_t tar_entry_read(void *stream, void *ptr, size_t size)
if (size > teis->bytes_left) if (size > teis->bytes_left)
size = teis->bytes_left; size = teis->bytes_left;
if (size == 0) if (size == 0)
return 0; return 0;
r = teis->tar_is->read(teis->tar_is, ptr, size); r = teis->tar_is->read(teis->tar_is, ptr, size);
if (r < 0) if (r <= 0) {
/* If inner stream returned zero (end-of-stream), we
* are getting short read, because tar header indicated
* more was to be expected. */
if (r == 0) return -ECONNABORTED;
return r; return r;
}
teis->bytes_left -= r; teis->bytes_left -= r;
if (teis->csum == NULL) if (teis->csum == NULL)