From: Jonathan Dieter <jdieter@gmail.com>
Date: Fri, 14 Sep 2018 13:45:04 +0000 (+0100)
Subject: Assert that blank malloc and calloc are allocated and remove error checking
X-Git-Tag: archive/raspbian/1.1.9+ds1-1+rpi1~1^2~119
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=6a703a49ed5b791974676df48eff2a9aae6a2ab6;p=zchunk.git

Assert that blank malloc and calloc are allocated and remove error checking

Signed-off-by: Jonathan Dieter <jdieter@gmail.com>
---

diff --git a/src/lib/buzhash/buzhash.c b/src/lib/buzhash/buzhash.c
index f3ed195..780febd 100644
--- a/src/lib/buzhash/buzhash.c
+++ b/src/lib/buzhash/buzhash.c
@@ -23,6 +23,7 @@
 
 #include "buzhash.h"
 
+#include <assert.h>
 #include <string.h>
 
 static uint32_t rol32(uint32_t v, uint32_t s) {
@@ -104,6 +105,7 @@ uint32_t buzhash_update (buzHash *b, const char *s, size_t window) {
         if(b->window)
             free(b->window);
         b->window = calloc(1, window);
+        assert(b->window);
         b->window_loc = 0;
         b->window_fill = 0;
         b->window_size = window;
diff --git a/src/unzck.c b/src/unzck.c
index a848c5d..fdded0e 100644
--- a/src/unzck.c
+++ b/src/unzck.c
@@ -26,6 +26,7 @@
 
 #define _GNU_SOURCE
 
+#include <assert.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@@ -116,6 +117,7 @@ int main (int argc, char *argv[]) {
     }
     char *base_name = basename(arguments.args[0]);
     char *out_name = malloc(strlen(base_name) - 3);
+    assert(out_name);
     snprintf(out_name, strlen(base_name) - 3, "%s", base_name);
 
     int dst_fd = STDOUT_FILENO;
@@ -132,13 +134,8 @@ int main (int argc, char *argv[]) {
     bool good_exit = false;
 
     zckCtx *zck = zck_create();
-    if(zck == NULL) {
-        dprintf(STDERR_FILENO, "%s", zck_get_error(NULL));
-        zck_clear_error(NULL);
-        goto error1;
-    }
-
     char *data = malloc(BUF_SIZE);
+    assert(data);
     if(!zck_init_read(zck, src_fd))
         goto error2;
 
@@ -172,7 +169,6 @@ error2:
     if(!good_exit)
         dprintf(STDERR_FILENO, "%s", zck_get_error(zck));
     zck_free(&zck);
-error1:
     if(!good_exit)
         unlink(out_name);
     free(out_name);
diff --git a/src/zck.c b/src/zck.c
index 5fd7fc0..26d7996 100644
--- a/src/zck.c
+++ b/src/zck.c
@@ -26,6 +26,7 @@
 
 #define _GNU_SOURCE
 
+#include <assert.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@@ -132,10 +133,12 @@ int main (int argc, char *argv[]) {
     if(arguments.output == NULL) {
         base_name = basename(arguments.args[0]);
         out_name = malloc(strlen(base_name) + 5);
+        assert(out_name);
         snprintf(out_name, strlen(base_name) + 5, "%s.zck", base_name);
     } else {
         base_name = arguments.output;
         out_name = malloc(strlen(base_name) + 1);
+        assert(out_name);
         snprintf(out_name, strlen(base_name) + 1, "%s", base_name);
     }
 
@@ -160,6 +163,7 @@ int main (int argc, char *argv[]) {
             exit(1);
         }
         dict = malloc(dict_size);
+        assert(dict);
         if(read(dict_fd, dict, dict_size) < dict_size) {
             free(dict);
             perror("Error reading dict:");
@@ -231,6 +235,7 @@ int main (int argc, char *argv[]) {
     }
     if(in_size > 0) {
         data = malloc(in_size);
+        assert(data);
         if(read(in_fd, data, in_size) < in_size) {
             dprintf(STDERR_FILENO, "Unable to read from input file\n");
             exit(1);