Commit 1cd81a9e authored by jan.koester's avatar jan.koester
Browse files

fixed memleak

parent 431dc74b
Loading
Loading
Loading
Loading
Loading
+15 −19
Changes for src/admin.cpp: 15 added lines, 19 removed lines.
Original line number Diff line number Diff line
@@ -1359,6 +1359,8 @@ namespace authdb {

                        mrec = (GroupData::MemberUids *)cur.data;

                        char *start=cur.data+sizeof(GroupData::MemberUids);

                        size_t urd=sizeof(AuthHeader),uend=backend->end();
                        while(urd<uend){
                            authdb::AuthData::Record curu;
@@ -1377,7 +1379,8 @@ namespace authdb {
                                form << "<option value=\"" << cuuid << "\" ";

                                for(size_t i=0; i<mrec->count; ++i ){
                                    if(uuid_compare(mrec->uid[i],curu.uuid) == 0){
                                    uuid_t *ucmp =(uuid_t*)start+(sizeof(uuid_t)*i);
                                    if(uuid_compare(*ucmp,curu.uuid) == 0){
                                        form << "selected";
                                        break;
                                    }
@@ -1420,28 +1423,27 @@ namespace authdb {
            if(sscanf(curreq->getRequestURL(),"/settings/%[^/]/%s",domain,url)<0)
                throw AuthBackendError("wrong url!");

            try {
                if(strncmp(url,"listusers",9)==0){
            if(strncmp("listusers",url,9)==0){
                listUsers(curreq,tid,args,"listusers");
                }else if(strncmp(url,"createuser",10)==0){
            }else if(strncmp("createuser",url,10)==0){
                createUser(curreq,tid,args,"createuser");
                }else if(strncmp(url,"removeuser",10)==0){
            }else if(strncmp("removeuser",url,10)==0){
                removeuser(curreq,tid,args);
                }else if(strncmp(url,"edituser",8)==0){
            }else if(strncmp("edituser",url,8)==0){
                editUser(curreq,tid,args);
                }else if(strncmp(url,"listdomains",11)==0){
            }else if(strncmp("listdomains",url,11)==0){
                listDomains(curreq,tid,args);
                }else if(strncmp(url,"createdomain",11)==0){
            }else if(strncmp("createdomain",url,11)==0){
                createDomain(curreq,tid,args);
                }else if(strncmp(url,"removedomain",11)==0){
            }else if(strncmp("removedomain",url,11)==0){
                removeDomain(curreq,tid,args);
                }else if(strncmp(url,"listgroups",10)==0){
            }else if(strncmp("listgroups",url,10)==0){
                listGroups(curreq,tid,args,"listgroups");
                }else if(strncmp(url,"creategroup",10)==0){
            }else if(strncmp("creategroup",url,10)==0){
                createGroup(curreq,tid,args,"creategroup");
                }else if(strncmp(url,"removegroup",10)==0){
            }else if(strncmp("removegroup",url,10)==0){
                removeGroup(curreq,tid,args,"removegroup");
                }else if(strncmp(url,"editgroup",9)==0){
            }else if(strncmp("editgroup",url,9)==0){
                editGroup(curreq,tid,args);
            }else{
                libhtmlpp::HtmlElement root=_IndexElement;
@@ -1453,12 +1455,6 @@ namespace authdb {
                rep.setContentLength(out.size());
                rep.send(curreq,out.c_str(),out.size());
            }
            }catch(AuthBackendError &e){
                    libhttppp::HttpResponse rep;
                    rep.setState(HTTP500);
                    rep.setContentType("text/html");
                    rep.send(curreq,e.what(),strlen(e.what()));
            }
        }
    private:
        authdb::AuthBackend     _AdminBackend;
+9 −2
Changes for src/authdb.cpp: 9 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -60,16 +60,23 @@ namespace authdb {
        };

        void RequestEvent(libhttppp::HttpRequest * curreq, const int tid, ULONG_PTR args){
            try{
                if(strncmp("/settings",curreq->getRequestURL(),9)==0){
                    _AdminBackend.lock();
            if(strcmp(curreq->getRequestURL(),"/setttings")==0){
                    _AdminInterface.Request(curreq,tid,args);
                    _AdminBackend.unlock();
                }else{
                    libhttppp::HttpResponse rep;
                    rep.setState(HTTP404);
                    rep.setContentType("text/html");
                    rep.send(curreq,nullptr,0);
                }
            _AdminBackend.unlock();
            }catch(AuthBackendError &e){
                libhttppp::HttpResponse rep;
                rep.setState(HTTP500);
                rep.setContentType("text/html");
                rep.send(curreq,e.what(),strlen(e.what()));
            }
        }

    private:
+4 −3
Changes for src/group.cpp: 4 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -154,12 +154,13 @@ void authdb::GroupData::addMember(const MemberUids &uid){
        _Members->storage=StorageType::BinaryStorage;

        snprintf(_Members->fieldname,255,"%s","groupmembers");
        _Members->datasize = sizeof(uid);
        _Members->datasize = sizeof(GroupData::MemberUids)+(sizeof(uuid_t)*uid.count);
        _Members->data=new char [_Members->datasize];
        memset(_Members->data,0,_Members->datasize);
        memcpy(_Members->data,&uid,sizeof(GroupData::MemberUids));
        ((GroupData::MemberUids*)_Members->data)->uid = new uuid_t[uid.count];
        char *start =_Members->data+sizeof(uid);
        for(int i=0; i< uid.count; ++i){
            uuid_copy(((GroupData::MemberUids*)_Members->data)->uid[i],uid.uid[i]);
            memcpy(start+(sizeof(uid)*i),uid.uid[i],sizeof(uuid_t));
        }
}