pool/zchunk
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Update to version 1.0.3

Browse Source 
+ Fix some small bugs found by Coverity
  + Fix memory leak and off-by-one errors
- Drop patches part of 1.0.3 release
  + 0001-Fix-some-small-bugs-found-by-Coverity.patch

OBS-URL: https://build.opensuse.org/package/show/Archiving/zchunk?expand=0&rev=17
This commit is contained in:
Neal Gompa 2019-01-24 20:58:15 +00:00 committed by Git OBS Bridge
parent 509c931d2e
commit 5d0b5bd225
5 changed files with 13 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
0001-Fix-some-small-bugs-found-by-Coverity.patch
View File

@ -1,63 +0,0 @@
From 13b0e4d2068a3e4777ad431936910dd732e82dad Mon Sep 17 00:00:00 2001
From: Jonathan Dieter <jdieter@gmail.com>
Date: Sat, 29 Dec 2018 12:25:44 +0000
Subject: [PATCH] Fix some small bugs found by Coverity
Signed-off-by: Jonathan Dieter <jdieter@gmail.com>
---
src/lib/comp/comp.c | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/src/lib/comp/comp.c b/src/lib/comp/comp.c
index da0cfe1..89b3301 100644
--- a/src/lib/comp/comp.c
+++ b/src/lib/comp/comp.c
@@ -479,8 +479,10 @@ ssize_t comp_read(zckCtx *zck, char *dst, size_t dst_size, bool use_dict) {
}
}
if(zck->comp.data_loc == zck->comp.data_idx->comp_length) {
- if(!comp_end_dchunk(zck, use_dict, zck->comp.data_idx->length))
+ if(!comp_end_dchunk(zck, use_dict, zck->comp.data_idx->length)) {
+ free(src);
return -1;
+ }
if(zck->comp.data_idx == NULL)
zck->comp.data_eof = true;
continue;
@@ -659,10 +661,15 @@ ssize_t PUBLIC zck_get_chunk_comp_data(zckChunk *idx, char *dst,
/* Make sure chunk size is valid */
if(zck_get_chunk_size(idx) < 0)
return -1;
+
/* If the chunk is empty, we're done */
if(zck_get_chunk_size(idx) == 0)
return 0;
+ /* Make sure requested chunk has a beginning */
+ if(zck_get_chunk_start(idx) < 0)
+ return -1;
+
/* Seek to beginning of requested chunk */
if(!seek_data(zck, zck_get_chunk_start(idx), SEEK_SET))
return -1;
@@ -687,12 +694,17 @@ ssize_t PUBLIC zck_get_chunk_data(zckChunk *idx, char *dst,
/* If the chunk is empty, we're done */
if(zck_get_chunk_size(idx) == 0)
return 0;
+ /* Make sure requested chunk has a beginning */
+ if(zck_get_chunk_start(idx) < 0)
+ return -1;
/* Read dictionary if needed */
zckChunk *dict = zck_get_first_chunk(zck);
if(dict == NULL)
return -1;
if(zck_get_chunk_size(dict) > 0 && zck->comp.dict == NULL) {
+ if(zck_get_chunk_start(dict) < 0)
+ return -1;
if(!seek_data(zck, zck_get_chunk_start(dict), SEEK_SET))
return -1;
if(!comp_reset(zck))
--
2.20.1

3
zchunk-1.0.2.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:701e5f8b7ba655d3676f876a7b697ca8ce4d9e34f041f8b1d6d18e47c3dad966
size 1449678

3
zchunk-1.0.3.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:728a2fe91057be0646d430cbbf90b8d85e68995e61c27feda311421b51d88298
size 1449680

9
zchunk.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Thu Jan 24 20:54:12 UTC 2019 - Neal Gompa <ngompa13@gmail.com>
- Update to version 1.0.3
+ Fix some small bugs found by Coverity
+ Fix memory leak and off-by-one errors
- Drop patches part of 1.0.3 release
+ 0001-Fix-some-small-bugs-found-by-Coverity.patch
-------------------------------------------------------------------
Thu Jan 24 04:17:23 UTC 2019 - Neal Gompa <ngompa13@gmail.com>

4
zchunk.spec
View File

@ -22,15 +22,13 @@
%global devname libzck-devel
Name: zchunk
Version: 1.0.2
Version: 1.0.3
Release: 0
Summary: Compressed file format that allows easy deltas
License: BSD-2-Clause AND MIT
Group: Productivity/Archiving/Compression
URL: https://github.com/zchunk/zchunk
Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz
# Patches backported from upstream
Patch0001: 0001-Fix-some-small-bugs-found-by-Coverity.patch
BuildRequires: meson >= 0.44.0
BuildRequires: pkgconfig
BuildRequires: pkgconfig(libcurl)