dav: comparison libidav/davqlexec.c

-:458a8dc68048
+:f21ee22170bf
 }
 }
 }
 *error = DAVQL_OK;
-return sstrdup_a(a, sstrn(buf->space, buf->size));
+sstr_t ret = sstrdup_a(a, sstrn(buf->space, buf->size));
+ucx_buffer_free(buf);
+return ret;
 }
 static int fl_add_properties(DavSession *sn, UcxMempool *mp, UcxMap *map, DavQLExpression *expression) {
 if(!expression) {
 return 0;
 ucx_map_free(properties);
 *isallprop = 1;
 return create_allprop_propfind_request();
 } else if(!sstrcmp(field->name, S("-"))) {
 ucx_map_free(properties);
-return create_basic_propfind_request();
+return create_propfind_request(sn, NULL);
 } else {
 if(fl_add_properties(sn, mp, properties, field->expr)) {
 // TODO: set error
+ucx_map_free(properties);
 return NULL;
 }
 }
 }
 list = ucx_list_append(list, value);
 }
 UcxBuffer *reqbuf = create_propfind_request(sn, list);
 ucx_list_free(list);
+ucx_map_free(properties);
 return reqbuf;
 }
 static int reset_properties(DavSession *sn, DavResult *result, DavResource *res, UcxList *fields) {
 UcxMap *new_properties = ucx_map_new_a(sn->mp->allocator, 32);
 }
 }
 if(str.ptr) {
 UcxKey key = dav_property_key(field->ns, field->name);
 ucx_map_put(new_properties, key, str.ptr);
+free(key.data);
 }
 } else {
 // TODO: error
 resource_free_properties(sn, new_properties);
 return -1;
 UcxBuffer *rqbuf = fieldlist2propfindrequest(sn, mp, st->fields, &isallprop);
 if(!rqbuf) {
 ucx_mempool_destroy(mp);
 return result;
 }
+ucx_mempool_reg_destr(mp, rqbuf, (ucx_destructor)ucx_buffer_free);
 // compile field list
 UcxList *cfieldlist = NULL;
 UCX_FOREACH(elm, st->fields) {
 DavQLField *field = elm->data;
 ap);
 if(!code) {
 // TODO: set error string
 return result;
 }
+ucx_mempool_reg_destr(mp, code, (ucx_destructor)ucx_buffer_free);
 DavCompiledField *cfield = ucx_mempool_malloc(
 mp,
 sizeof(DavCompiledField));
 char *ns;
 // get path string
 davqlerror_t error;
 sstr_t path = dav_format_string(mp->allocator, st->path, ap, &error);
 if(error) {
 // TODO: cleanup
+ucx_mempool_destroy(mp);
 return result;
 }
 int depth = st->depth == DAV_DEPTH_PLACEHOLDER ? va_arg(ap, int) : st->depth;
 UcxBuffer *where = dav_compile_expr(sn->context, mp->allocator, st->where, ap);
 if(st->where && !where) {
+// TODO: cleanup
 ucx_mempool_destroy(mp);
 return result;
 }
+ucx_mempool_reg_destr(mp, where, (ucx_destructor)ucx_buffer_free);
 // compile order criterion
 UcxList *ordercr = NULL;
 UCX_FOREACH(elm, st->orderby) {
 DavQLOrderCriterion *oc = elm->data;
 cr->descending = oc->descending;
 ordercr = ucx_list_append_a(mp->allocator, ordercr, cr);
 } else {
 // error
 // TODO: cleanup
+ucx_mempool_destroy(mp);
 return result;
 }
 } else if(dav_identifier2resprop(column->srctext, &resprop)) {
 DavOrderCriterion *cr = ucx_mempool_malloc(mp, sizeof(DavOrderCriterion));
 cr->type = 0;
 cr->descending = oc->descending;
 ordercr = ucx_list_append_a(mp->allocator, ordercr, cr);
 } else {
 // error
 // TODO: cleanup
+ucx_mempool_destroy(mp);
 return result;
 }
 } else if(column->type == DAVQL_NUMBER) {
 // TODO: implement
 fprintf(stderr, "order by number not supported\n");
 return result;
 } else {
 // something is broken
 // TODO: cleanup
+ucx_mempool_destroy(mp);
 return result;
 }
 }
 DavResource *selroot = dav_resource_new(sn, path.ptr);
 r->depth = 0;
 stack = ucx_list_prepend(stack, r);
 // reuseable response buffer
 UcxBuffer *rpbuf = ucx_buffer_new(NULL, 4096, UCX_BUFFER_AUTOEXTEND);
+if(!rpbuf) {
+// TODO: cleanup
+ucx_mempool_destroy(mp);
+return result;
+}
+ucx_mempool_reg_destr(mp, rpbuf, (ucx_destructor)ucx_buffer_free);
 result.result = selroot;
 result.status = 0;
 // do a propfind request for each resource on the stack
 while((r = get_propfind_response(parser, &response)) != 0) {
 if(r == -1) {
 // error
 result.status = -1;
 // TODO: free resources
+cleanup_response(&response);
 break;
 }
 // the propfind multistatus response contains responses
 // for the requested resource and all childs
 // response is the currently requested resource
 // and not a child
 // add properties
 add_properties(root, &response);
+cleanup_response(&response);
 if(root == selroot) {
 // The current root is the root of the select query.
 // In this case we have to check the where clause.
 // If root is not selroot, the where clause was
 } else {
 DavResource *child = response2resource(
 sn,
 &response,
 root->path);
+cleanup_response(&response);
 // check where clause
 DavQLStackObj where_result;
 if(!dav_exec_expr(where, child, &where_result)) {
 if(where_result.data.integer != 0) {
 if(!reset_properties(sn, &result, child, cfieldlist)) {
 dav_resource_free(child);
 }
 }
 }
 }
+destroy_propfind_parser(parser);
 } else  {
 dav_session_set_error(sn, ret, http_status);
 result.result = NULL;
 result.status = -1;
 dav_resource_free_all(selroot);

Mercurial > hg > dav / file comparison

comparison: libidav/davqlexec.c

libidav/davqlexec.c