Fixed bug CORE-6447 : SET SQLDA_DISPLAY ON: different text of message for parameterized expression starting from second run

hvlad · hvlad · commit b1c2329ae161 · 2020-11-17T10:15:54.000+02:00
diff --git a/src/common/classes/InternalMessageBuffer.cpp b/src/common/classes/InternalMessageBuffer.cpp
@@ -45,6 +45,7 @@ class MetadataFromBlr : public MsgMetadata
 };
 
 MetadataFromBlr::MetadataFromBlr(unsigned aBlrLength, const unsigned char* aBlr, unsigned aLength)
+	: MsgMetadata()
 {
 	if (aBlrLength == 0)
 		return;
@@ -248,7 +249,7 @@ InternalMessageBuffer::InternalMessageBuffer(unsigned aBlrLength, const unsigned
 {
 	buffer = aBuffer;
 
-	if (aBlr)
+	if (aBlr && aBlrLength)
 	{
 		metadata = FB_NEW MetadataFromBlr(aBlrLength, aBlr, aBufferLength);
 		metadata->addRef();

Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,7 @@ class MetadataFromBlr : public MsgMetadata`
`45`	`45`	`};`
`46`	`46`
`47`	`47`	`MetadataFromBlr::MetadataFromBlr(unsigned aBlrLength, const unsigned char* aBlr, unsigned aLength)`
	`48`	`+ : MsgMetadata()`
`48`	`49`	`{`
`49`	`50`	`if (aBlrLength == 0)`
`50`	`51`	`return;`
`@@ -248,7 +249,7 @@ InternalMessageBuffer::InternalMessageBuffer(unsigned aBlrLength, const unsigned`
`248`	`249`	`{`
`249`	`250`	`buffer = aBuffer;`
`250`	`251`
`251`		`- if (aBlr)`
	`252`	`+ if (aBlr && aBlrLength)`
`252`	`253`	`{`
`253`	`254`	`metadata = FB_NEW MetadataFromBlr(aBlrLength, aBlr, aBufferLength);`
`254`	`255`	`metadata->addRef();`