Thu, 28 May 2015 14:15:32 +0200
fixed null pointer access on end of token stream by adding a special END token to the stream
/* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * * Copyright 2015 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. */ #ifndef CONFIG_H #define CONFIG_H #include <ucx/string.h> #include <stdbool.h> #include <libidav/webdav.h> #ifdef __cplusplus extern "C" { #endif typedef struct Repository Repository; typedef struct DavKey Key; typedef struct Proxy Proxy; #define HTTP_PROXY 1 #define HTTPS_PROXY 2 enum key_type { KEY_AES128 = 0, KEY_AES256, KEY_PASSWORD }; typedef enum key_type KeyType; struct Repository { char *name; char *url; char *user; char *password; char *default_key; bool encrypt_content; bool encrypt_name; bool decrypt_content; bool decrypt_name; int ssl_version; }; struct Proxy { char *url; char *user; char *password; char *no; }; void load_config(DavContext *ctx); void free_config(); void load_repository(xmlNode *reponode); void load_key(xmlNode *keynode); void load_proxy(xmlNode *proxynode, int type); sstr_t load_key_file(char *filename); Repository* get_repository(sstr_t name); int get_repository_flags(Repository *repo); DavSession *repository_session(Repository *repo); Key* get_key(char *name); Proxy* get_http_proxy(); Proxy* get_https_proxy(); #ifdef __cplusplus } #endif #endif /* CONFIG_H */