X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=loaders.c;h=92d8cec33f5f44a6b06247ca9e1e165bfaf9dcbe;hp=f30d9ddc2eaec3fea70552cd4fe0f70f41cf4b42;hb=124f7039c7d3e97f3299c222975b4768f3bcbc6b;hpb=9ff91f223c567dfb54c405915507e52f93741137 diff --git a/loaders.c b/loaders.c index f30d9ddc..92d8cec3 100644 --- a/loaders.c +++ b/loaders.c @@ -1,4 +1,4 @@ -const char loaders_rcs[] = "$Id: loaders.c,v 1.99 2014/06/02 06:22:21 fabiankeil Exp $"; +const char loaders_rcs[] = "$Id: loaders.c,v 1.101 2016/02/26 12:29:38 fabiankeil Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/loaders.c,v $ @@ -288,15 +288,8 @@ int check_file_changed(const struct file_list * current, return 0; } - fs = (struct file_list *)zalloc(sizeof(struct file_list)); - if (fs == NULL) - { - /* Out of memory error */ - return 1; - } - - - fs->filename = strdup(filename); + fs = zalloc_or_die(sizeof(struct file_list)); + fs->filename = strdup_or_die(filename); fs->lastmodified = statbuf->st_mtime; if (fs->filename == NULL) @@ -537,30 +530,15 @@ jb_err edit_read_line(FILE *fp, if (raw_out) { - raw = strdup(""); - if (NULL == raw) - { - return JB_ERR_MEMORY; - } + raw = strdup_or_die(""); } if (prefix_out) { - prefix = strdup(""); - if (NULL == prefix) - { - freez(raw); - return JB_ERR_MEMORY; - } + prefix = strdup_or_die(""); } if (data_out) { - data = strdup(""); - if (NULL == data) - { - freez(raw); - freez(prefix); - return JB_ERR_MEMORY; - } + data = strdup_or_die(""); } /* Main loop. Loop while we need more data & it's not EOF. */ @@ -848,11 +826,7 @@ int load_trustfile(struct client_state *csp) goto load_trustfile_error; } - fs->f = bl = (struct block_spec *)zalloc(sizeof(*bl)); - if (bl == NULL) - { - goto load_trustfile_error; - } + fs->f = bl = zalloc_or_die(sizeof(*bl)); if ((fp = fopen(csp->config->trustfile, "r")) == NULL) { @@ -895,11 +869,7 @@ int load_trustfile(struct client_state *csp) } /* allocate a new node */ - if ((b = zalloc(sizeof(*b))) == NULL) - { - fclose(fp); - goto load_trustfile_error; - } + b = zalloc_or_die(sizeof(*b)); /* add it to the list */ b->next = bl->next; @@ -1183,11 +1153,7 @@ int load_one_re_filterfile(struct client_state *csp, int fileid) */ if (new_filter != FT_INVALID_FILTER) { - new_bl = (struct re_filterfile_spec *)zalloc(sizeof(*bl)); - if (new_bl == NULL) - { - goto load_re_filterfile_error; - } + new_bl = zalloc_or_die(sizeof(*bl)); if (new_filter == FT_CONTENT_FILTER) { new_bl->name = chomp(buf + 7); @@ -1214,15 +1180,16 @@ int load_one_re_filterfile(struct client_state *csp, int fileid) new_bl->description = html_encode(chomp(new_bl->description)); if (NULL == new_bl->description) { - new_bl->description = strdup("Out of memory while encoding this filter's description to HTML"); + new_bl->description = strdup_or_die("Out of memory while " + "encoding filter description to HTML"); } } else { - new_bl->description = strdup("No description available for this filter"); + new_bl->description = strdup_or_die("No description available"); } - new_bl->name = strdup(chomp(new_bl->name)); + new_bl->name = strdup_or_die(chomp(new_bl->name)); /* * If this is the first filter block, chain it