Merge pull request #8852 from FirebirdSQL/work/gh-8851

Fixed bug #8851 : 'Internal error' when calling outer procedure after deleting unused result variable from inner procedure

Author: hvlad

src/jrd/recsrc/ProcedureScan.cpp

@@ -70,6 +70,12 @@ void ProcedureScan::open(thread_db* tdbb) const
 
 	const_cast<jrd_prc*>(m_procedure)->checkReload(tdbb);
 
+	// Procedure could be altered and its record format changed since current instance of
+	// ProcedureScan was created. Here it is not the right place to check if new format is
+	// compatible with caller's expectations, so we just use correct (possible new) format.
+
+	m_format = m_procedure->prc_record_format;
+
 	jrd_req* const request = tdbb->getRequest();
 	Impure* const impure = request->getImpure<Impure>(m_impure);
 
@@ -226,6 +232,8 @@ bool ProcedureScan::getRecord(thread_db* tdbb) const
 
 	trace.fetch(false, ITracePlugin::RESULT_SUCCESS);
 
+	fb_assert(m_format == m_procedure->prc_record_format);
+
 	for (USHORT i = 0; i < m_format->fmt_count; i++)
 	{
 		assignParams(tdbb, &msg_format->fmt_desc[2 * i], &msg_format->fmt_desc[2 * i + 1],

src/jrd/recsrc/RecordSource.h

@@ -137,7 +137,7 @@ namespace Jrd
 
 	protected:
 		const StreamType m_stream;
-		const Format* const m_format;
+		mutable const Format* m_format;
 	};