Ported fix for bug CORE-4051 : Memory leak when sorting big records

FirebirdSQL · Feb 25, 2013 · f05d1bb · f05d1bb
1 parent 08a4416
commit f05d1bb
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/src/jrd/sort.cpp b/src/jrd/sort.cpp
@@ -2256,6 +2256,11 @@ static void merge_runs(sort_context* scb, USHORT n)
 		}
 
 		run->run_buff_cache = false;
+		if (run->run_buff_alloc)
+		{
+			delete (UCHAR*) run->run_buffer;
+			run->run_buff_alloc = false;
+		}
 		run->run_buffer = NULL;
 
 		// Add run descriptor to list of unused run descriptor blocks
@@ -2265,11 +2270,7 @@ static void merge_runs(sort_context* scb, USHORT n)
 	}
 
 	scb->scb_free_runs = run->run_next;
-	if (run->run_buff_alloc)
-	{
-		delete (UCHAR*) run->run_buffer;
-		run->run_buff_alloc = false;
-	}
+
 	temp_run.run_header.rmh_type = RMH_TYPE_RUN;
 	temp_run.run_depth = run->run_depth;
 	temp_run.run_buff_cache = false;