Wed, 09 Nov 2022 10:37:52 +0100
use realloc instead of malloc in object_add_directive
/* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * * Copyright 2013 Olaf Wintermann. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: * * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ #include <stdio.h> #include <stdlib.h> #include <string.h> #include <cx/mempool.h> #include "mimeconf.h" #define MIMECONFIG_MAX_TOKENS 4096 MimeConfig *load_mime_config(const char *file) { FILE *in = fopen(file, "r"); if(in == NULL) { log_ereport(LOG_FAILURE, "Cannot load mime config file %s: %s", file, strerror(errno)); return NULL; } MimeConfig *conf = malloc(sizeof(MimeConfig)); conf->parser.parse = mimeconf_parse; conf->directives_begin = NULL; conf->directives_end = NULL; conf->ntypes = 0; int r = cfg_parse_basic_file((ConfigParser*)conf, in); if(r != 0) { log_ereport(LOG_FAILURE, "Cannot parse mime config file %s", file); fclose(in); free(conf); // TODO: free return NULL; } fclose(in); return conf; } void free_mime_config(MimeConfig *conf) { //ucx_mempool_destroy(conf->parser.mp->pool); free(conf); } int mimeconf_parse(void *p, ConfigLine *begin, ConfigLine *end, cxmutstr line) { MimeConfig *conf = p; CxAllocator *mp = conf->parser.mp; // parse mime directive MimeDirective *dir = OBJ_NEW_N(mp, MimeDirective); ConfigParam *params = cfg_param_list(line, mp); for(ConfigParam *param=params;param;param=param->next) { if(!cx_strcmp(cx_strcast(param->name), cx_str("type"))) { dir->type = param->value; } else if(!cx_strcmp(cx_strcast(param->name), cx_str("exts"))) { // comma-separated file extensions dir->nextensions = cx_strsplit_a(mp, cx_strcast(param->value), cx_strn(",", 1), MIMECONFIG_MAX_TOKENS, &dir->extensions); } } CFG_MIME_ADD(&conf->directives_begin, &conf->directives_end, dir); conf->ntypes++; return 0; }