Attachment 152163 Details for Bug 230220 – patch to avoid recursive free

[patch] patch to avoid recursive free

lmbench-3.0-a7-cleanup.patch (text/plain), 1.08 KB, created by George Beshers on 2007-04-10 17:48:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: George Beshers

Created: 2007-04-10 17:48:33 UTC

Size: 1.08 KB

patch

obsolete

>diff -Naur lmbench-3.0-a7/src/lib_timing.c lmbench-mine/src/lib_timing.c
>--- lmbench-3.0-a7/src/lib_timing.c	2006-05-30 15:13:03.000000000 -0400
>+++ lmbench-mine/src/lib_timing.c	2007-04-05 17:06:53.000000000 -0400
>@@ -563,11 +563,14 @@
> {
> 	signal(SIGTERM, SIG_IGN);
> 	if (_benchmp_child_state.cleanup) {
>+		benchmp_f cl_up;
> 		void (*sig)(int) = signal(SIGCHLD, SIG_DFL);
> 		if (sig != benchmp_child_sigchld && sig != SIG_DFL) {
> 			signal(SIGCHLD, sig);
> 		}
>-		(*_benchmp_child_state.cleanup)(0, &_benchmp_child_state);
>+		cl_up = _benchmp_child_state.cleanup;
>+		_benchmp_child_state.cleanup = 0;
>+		(*cl_up)(0, &_benchmp_child_state);
> 	}
> 	exit(0);
> }
>@@ -747,9 +750,12 @@
> 			read(state->result_signal, (void*)&c, sizeof(char));
> 			write(state->response, (void*)get_results(), state->r_size);
> 			if (state->cleanup) {
>+				benchmp_f cl_up;
> 				if (benchmp_sigchld_handler == SIG_DFL)
> 					signal(SIGCHLD, SIG_DFL);
>-				(*state->cleanup)(0, state->cookie);
>+				cl_up = state->cleanup;
>+				state->cleanup = 0;
>+				(*cl_up)(0, state->cookie);
> 			}
> 
> 			/* Now wait for signal to exit */

Actions: View | Diff

Attachments on bug 230220: 152163