fix free error

Vladimir Ershov · Vladimir Ershov · commit 5784b1ab5c58 · 2017-04-17T15:34:23.000+03:00
diff --git a/src/scheduler_executor.c b/src/scheduler_executor.c
@@ -162,10 +162,7 @@ int do_one_job(schd_executor_share_t *shared, schd_executor_status_t *status)
 	int i;
 	job_t *job;
 	spi_response_t *r;
-	MemoryContext old;
-	MemoryContext mem = init_mem_ctx("executor");
-
-	old = MemoryContextSwitchTo(mem);
+	MemoryContext old, mem;
 
 	EE.n = 0;
 	EE.errors = NULL;
@@ -178,6 +175,9 @@ int do_one_job(schd_executor_share_t *shared, schd_executor_status_t *status)
 		return 0;
 	}
 
+	mem = init_mem_ctx("executor");
+	old = MemoryContextSwitchTo(mem);
+
 	*status = shared->status = SchdExecutorWork;
 	shared->message[0] = 0;
 
@@ -191,6 +191,9 @@ int do_one_job(schd_executor_share_t *shared, schd_executor_status_t *status)
 		shared->worker_exit = true;
 		*status = shared->status = SchdExecutorError;
 
+		MemoryContextSwitchTo(old);
+		MemoryContextDelete(mem);
+
 		return -1;
 	}
 	current_job_id = job->cron_id;
@@ -211,6 +214,8 @@ int do_one_job(schd_executor_share_t *shared, schd_executor_status_t *status)
 		}
 		*status = shared->worker_exit = true;
 		shared->status = SchdExecutorError;
+		MemoryContextSwitchTo(old);
+		MemoryContextDelete(mem);
 		return -2;
 	}
 
@@ -257,7 +262,7 @@ int do_one_job(schd_executor_share_t *shared, schd_executor_status_t *status)
 			destroy_spi_data(r);
 			ABORT_SPI_SNAP();
 			SetConfigOption("schedule.transaction_state", "failure", PGC_INTERNAL, PGC_S_SESSION);
-			executor_onrollback(job, &EE);
+			executor_onrollback(mem, job, &EE);
 
 			break;
 		}
@@ -467,7 +472,7 @@ TimestampTz get_next_excution_time(char *sql, executor_error_t *ee)
 	return ts;
 }
 
-int executor_onrollback(job_t *job, executor_error_t *ee)
+int executor_onrollback(MemoryContext mem, job_t *job, executor_error_t *ee)
 {
 	int rv;
 	spi_response_t *r;
@@ -476,7 +481,7 @@ int executor_onrollback(job_t *job, executor_error_t *ee)
 	pgstat_report_activity(STATE_RUNNING, "execure onrollback");
 
 	START_SPI_SNAP();
-	r = execute_spi(CurrentMemoryContext, job->onrollback);
+	r = execute_spi(mem, job->onrollback);
 	if(r->retval < 0)
 	{
 		if(r->error)
diff --git a/src/scheduler_executor.h b/src/scheduler_executor.h
@@ -60,7 +60,7 @@ extern PGDLLEXPORT void executor_worker_main(Datum arg);
 job_t *initializeExecutorJob(schd_executor_share_t *data);
 void set_shared_message(schd_executor_share_t *shared, executor_error_t *ee);
 TimestampTz get_next_excution_time(char *sql, executor_error_t *ee);
-int executor_onrollback(job_t *job, executor_error_t *ee);
+int executor_onrollback(MemoryContext mem, job_t *job, executor_error_t *ee);
 void set_pg_var(bool resulti, executor_error_t *ee);
 int push_executor_error(executor_error_t *e, char *fmt, ...)  pg_attribute_printf(2, 3);
 int set_session_authorization(char *username, char **error);
diff --git a/src/scheduler_spi_utils.c b/src/scheduler_spi_utils.c
@@ -78,6 +78,7 @@ spi_response_t *__error_spi_resp(MemoryContext ctx, int ret, char *error)
 	r->retval = ret;
 	r->types = NULL;
 	r->rows = NULL;
+	r->ref = NULL;
 	r->error = _mcopy_string(ctx, error);
 
 	return r;
