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 DAVQLEXEC_H #define DAVQLEXEC_H #include <stdarg.h> #include "davqlparser.h" #include "webdav.h" #include <ucx/buffer.h> #ifdef __cplusplus extern "C" { #endif typedef struct DavQLResult DavQLResult; typedef enum { DAVQL_OK = 0, DAVQL_UNSUPPORTED_FORMATCHAR, DAVQL_UNKNOWN_FORMATCHAR } davqlerror_t; struct DavQLResult { DavResource *result; int status; }; DavQLResult* dav_statement_exec(DavSession *sn, DavQLStatement *st, ...); DavQLResult* dav_statement_execv(DavSession *sn, DavQLStatement *st, va_list ap); UcxBuffer* dav_path_string(sstr_t src, va_list ap, davqlerror_t *error); void dav_exec_get(DavSession *sn,DavQLStatement *st,char* path,va_list ap); int dav_eval_lexpr(DavResource *res, DavQLExpression *lexpr); #ifdef __cplusplus } #endif #endif /* DAVQLEXEC_H */