rcorder problem when booting CURRENT

[Ganbold]

Giorgos Keramidas wrote:
> On 2006-03-21 11:42, Ganbold <ganbold at micom.mng.net> wrote:
>   
>> Hi,
>>
>> I have just upgraded my machine from FreeBSD-6.1-PRERELEASE to
>> FreeBSD-7.0-CURRENT.
>>
>> gw# uname -an
>> FreeBSD gw.micom.mng.net 7.0-CURRENT FreeBSD 7.0-CURRENT #0: Tue Mar 21
>> 09:00:50 ULAT 2006 tsgan at gw.micom.mng.net:/usr/obj/usr/src/sys/GW  i386
>>
>> When I restarted the machine right after mergemaster, it said following
>> error and
>> didn't run rc scripts. I had to manually start some scripts.
>>
>> ...
>> pid 104(rcorder), uid0: exited on signal 11 (core dumped)
>> Segmentation fault (core dumped)
>> ...
>> [snip stack trace without symbols]
>>     
>
> On 2006-03-21 11:57, Ganbold <ganbold at micom.mng.net> wrote:
>   
>> Sorry for the noise. I read UPDATING and found out that
>> dansguardian startup script was causing the problem.
>>     
>
> Still a core dump is a core dump.  Can you build a debugging version of
> rcorder and try again?  This time the stack trace may be more useful.
>   

Following patch fixed rcorder problem. I'm not sure whether this is 
correct fix or not.

--- rcorder.c   Tue Jan 17 16:01:00 2006
+++ rcorder.c-new       Tue Mar 21 14:10:41 2006
@@ -798,8 +798,10 @@

         DPRINTF((stderr, "nuking %s\n", fnode->filename));
         if (was_set == 0) {
-               free(fnode->filename);
-               free(fnode);
+               if(fnode->next == NULL){
+                       free(fnode->filename);
+                       free(fnode);
+               }
         }
  }

Ganbold