1
0
OBS User unknown 2008-05-16 11:48:48 +00:00 committed by Git OBS Bridge
parent 2718610408
commit dae4c65932
3 changed files with 57 additions and 1 deletions

View File

@ -0,0 +1,47 @@
--- src/lib/event.c
+++ src/lib/event.c
@@ -85,8 +85,14 @@
void fr_event_list_free(fr_event_list_t *el)
{
+ fr_event_t *ev;
+
if (!el) return;
+ while ((ev = fr_heap_peek(el->times)) != NULL) {
+ fr_event_delete(el, &ev);
+ }
+
fr_heap_delete(el->times);
free(el);
}
@@ -137,6 +143,7 @@
*ev_p = NULL;
fr_heap_extract(el->times, ev);
+ free(ev);
return 1;
}
--- src/lib/fifo.c
+++ src/lib/fifo.c
@@ -127,7 +127,7 @@
{
entry->data = NULL;
entry->next = fi->freelist;
- fi->freelist = entry->next;
+ fi->freelist = entry;
}
--- src/main/threads.c
+++ src/main/threads.c
@@ -365,6 +365,8 @@
entry = fr_fifo_pop(thread_pool.fifo[i]);
rad_assert(entry != NULL);
entry->request->child_state = REQUEST_DONE;
+ thread_pool.num_queued--;
+ free(entry);
}
start = 0;

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue May 13 18:25:19 CEST 2008 - prusnak@suse.cz
- fix crashes in events, fifo and threads (event-fifo-threads.patch)
-------------------------------------------------------------------
Mon May 5 15:02:10 CEST 2008 - pth@suse.de

View File

@ -12,7 +12,7 @@
Name: freeradius-server
Version: 2.0.3
Release: 15
Release: 20
License: GPL v2 only; LGPL v2.1 only
Group: Productivity/Networking/Radius/Servers
Provides: radiusd
@ -27,6 +27,7 @@ Patch1: %{name}-%{version}-dialup_admin.patch
Patch2: %{name}-%{version}-rcradiusd.patch
Patch3: %{name}-%{version}-raddb.patch
Patch4: %{name}-%{version}-codecleanup.patch
Patch5: %{name}-%{version}-event-fifo-threads.patch
PreReq: %{_sbindir}/useradd %{_sbindir}/groupadd
PreReq: perl
PreReq: %insserv_prereq %fillup_prereq
@ -203,6 +204,7 @@ Authors:
%patch2
%patch3
%patch4
%patch5
%build
#export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -DLDAP_DEPRECATED -fstack-protector"
@ -422,6 +424,8 @@ rm -rf $RPM_BUILD_ROOT
%attr(644,root,root) %{_includedir}/freeradius/*.h
%changelog
* Tue May 13 2008 prusnak@suse.cz
- fix crashes in events, fifo and threads (event-fifo-threads.patch)
* Mon May 05 2008 pth@suse.de
- Fix coding errors that made the package fail to build.
* Wed Mar 19 2008 prusnak@suse.cz