summaryrefslogtreecommitdiffstats
path: root/src/cc4group.c
diff options
context:
space:
mode:
authorMarkus Mittendrein <git@maxmitti.tk>2019-03-17 15:11:21 +0100
committerMarkus Mittendrein <git@maxmitti.tk>2019-03-17 15:11:21 +0100
commit2312f39a0d56e55a9a9df282c478173d8d8567b6 (patch)
tree5f3ad8f34fc241aac4c5c7dbe20ba25d81b7a031 /src/cc4group.c
parentda95529c87148fa62cc2d2b3d2725aeb9fc19d64 (diff)
downloadcc4group-2312f39a0d56e55a9a9df282c478173d8d8567b6.tar.gz
cc4group-2312f39a0d56e55a9a9df282c478173d8d8567b6.zip
Add malloc error checking in new, mention the error case in the description and add assert(file) in openFd
Diffstat (limited to 'src/cc4group.c')
-rw-r--r--src/cc4group.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/src/cc4group.c b/src/cc4group.c
index 1a726ca..95d604d 100644
--- a/src/cc4group.c
+++ b/src/cc4group.c
@@ -1080,7 +1080,10 @@ static bool cc4group_initNewHeader(CC4Group* const this)
static CC4Group* cc4group_new(void)
{
CC4Group* this = malloc(sizeof(CC4Group));
- cc4group_init(this);
+ if(this != NULL)
+ {
+ cc4group_init(this);
+ }
return this;
}
@@ -1101,12 +1104,17 @@ static bool cc4group_create(CC4Group* const this)
static bool cc4group_openFd(CC4Group* const this, int fd)
{
+ // assert is in cc4group_uncompressGroup
+
ChunkedReadData arg = {.arg = &fd};
return cc4group_uncompressGroup(this, cc4group_readFdReadCallback, &arg, Reference, cc4group_initChunkBufferCallback, cc4group_deinitChunkBufferCallback);
}
static bool cc4group_openFilePointer(CC4Group* const this, FILE* file)
{
+ // assert(this) is in cc4group_uncompressGroup
+ assert(file);
+
ChunkedReadData arg = {.arg = file};
return cc4group_uncompressGroup(this, cc4group_readFilePointerReadCallback, &arg, Reference, cc4group_initChunkBufferCallback, cc4group_deinitChunkBufferCallback);
}