Fix #8890 - WITH TIME ZONE types store non-zero garbage for padding instead of 0x00

Author: asfernandes

src/common/cvt.cpp

@@ -37,6 +37,7 @@
 
 #include "firebird.h"
 #include <cmath>
+#include <cstddef>
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
@@ -293,6 +294,32 @@ static void timeStampToUtc(ISC_TIMESTAMP_TZ& timestampTZ, USHORT sessionTimeZone
 }
 
 
+static void zeroTzPadding(dsc* to)
+{
+	if (!to || !to->dsc_address)
+		return;
+
+	size_t logicalLength = 0;
+
+	switch (to->dsc_dtype)
+	{
+		case dtype_sql_time_tz:
+			logicalLength = offsetof(ISC_TIME_TZ, time_zone) + sizeof(ISC_USHORT);
+			break;
+
+		case dtype_timestamp_tz:
+			logicalLength = offsetof(ISC_TIMESTAMP_TZ, time_zone) + sizeof(ISC_USHORT);
+			break;
+
+		default:
+			return;
+	}
+
+	if (to->dsc_length > logicalLength)
+		memset(to->dsc_address + logicalLength, 0, to->dsc_length - logicalLength);
+}
+
+
 static void float_to_text(const dsc* from, dsc* to, Callbacks* cb)
 {
 /**************************************
@@ -1680,6 +1707,7 @@ void CVT_move_common(const dsc* from, dsc* to, DecimalStatus decSt, Callbacks* c
 		if (length) {
 			memcpy(p, q, length);
 		}
+		zeroTzPadding(to);
 		return;
 	}
 
@@ -1770,31 +1798,37 @@ void CVT_move_common(const dsc* from, dsc* to, DecimalStatus decSt, Callbacks* c
 				CVT_string_to_datetime(from, &date, NULL, expect_timestamp_tz, true, cb);
 				*((ISC_TIMESTAMP_TZ*) to->dsc_address) = date;
 			}
+			zeroTzPadding(to);
 			return;
 
 		case dtype_sql_time:
 			*(ISC_TIMESTAMP_TZ*) to->dsc_address =
 				TimeZoneUtil::timeToTimeStampTz(*(ISC_TIME*) from->dsc_address, cb);
+			zeroTzPadding(to);
 			return;
 
 		case dtype_ex_time_tz:
 		case dtype_sql_time_tz:
 			*((ISC_TIMESTAMP_TZ*) to->dsc_address) =
 				TimeZoneUtil::timeTzToTimeStampTz(*(ISC_TIME_TZ*) from->dsc_address, cb);
+			zeroTzPadding(to);
 			return;
 
 		case dtype_ex_timestamp_tz:
 			*((ISC_TIMESTAMP_TZ*) to->dsc_address) = *((ISC_TIMESTAMP_TZ*) from->dsc_address);
+			zeroTzPadding(to);
 			return;
 
 		case dtype_sql_date:
 			*(ISC_TIMESTAMP_TZ*) to->dsc_address =
 				TimeZoneUtil::dateToTimeStampTz(*(GDS_DATE*) from->dsc_address, cb);
+			zeroTzPadding(to);
 			return;
 
 		case dtype_timestamp:
 			*(ISC_TIMESTAMP_TZ*) to->dsc_address =
 				TimeZoneUtil::timeStampToTimeStampTz(*(ISC_TIMESTAMP*) from->dsc_address, cb);
+			zeroTzPadding(to);
 			return;
 
 		default:
@@ -1878,26 +1912,31 @@ void CVT_move_common(const dsc* from, dsc* to, DecimalStatus decSt, Callbacks* c
 				((ISC_TIME_TZ*) to->dsc_address)->utc_time = date.utc_timestamp.timestamp_time;
 				((ISC_TIME_TZ*) to->dsc_address)->time_zone = date.time_zone;
 			}
+			zeroTzPadding(to);
 			return;
 
 		case dtype_sql_time:
 			*(ISC_TIME_TZ*) to->dsc_address = TimeZoneUtil::timeToTimeTz(*(ISC_TIME*) from->dsc_address, cb);
+			zeroTzPadding(to);
 			return;
 
 		case dtype_timestamp:
 			*(ISC_TIME_TZ*) to->dsc_address =
 				TimeZoneUtil::timeStampToTimeTz(*(ISC_TIMESTAMP*) from->dsc_address, cb);
+			zeroTzPadding(to);
 			return;
 
 		case dtype_timestamp_tz:
 		case dtype_ex_timestamp_tz:
 			*(ISC_TIME_TZ*) to->dsc_address =
 				TimeZoneUtil::timeStampTzToTimeTz(*(ISC_TIMESTAMP_TZ*) from->dsc_address);
+			zeroTzPadding(to);
 			return;
 
 		case dtype_ex_time_tz:
 			*(ISC_TIME_TZ*) to->dsc_address = *(ISC_TIME_TZ*) from->dsc_address;
-			 return;
+			zeroTzPadding(to);
+			return;
 
 		default:
 			CVT_conversion_error(from, cb->err);

src/common/tests/CvtTest.cpp

@@ -1,8 +1,11 @@
 #include "boost/test/unit_test.hpp"
+#include <cstddef>
+#include <cstring>
 #include "../common/tests/CvtTestUtils.h"
 
 #include "../common/StatusArg.h"
 #include "../common/CvtFormat.h"
+#include "../jrd/intl.h"
 
 using namespace Firebird;
 using namespace Jrd;
@@ -218,6 +221,55 @@ BOOST_AUTO_TEST_CASE(CVTDatetimeToFormatStringTest_TIME_TZ)
 	testCVTDatetimeToFormatString(createTimeTZ(0, 0, 0, -160), "TZH MI TZM", "-02 00 -40", cb);
 }
 
+BOOST_AUTO_TEST_CASE(CVTMoveCommonZeroPadding_TZ)
+{
+	const char* tsText = "2026-02-08 14:32 +00:00";
+	UCHAR tsBuffer[sizeof(ISC_TIMESTAMP_TZ)];
+	memset(tsBuffer, 0xA5, sizeof(tsBuffer));
+
+	dsc fromTs;
+	fromTs.dsc_dtype = dtype_text;
+	fromTs.dsc_length = strlen(tsText);
+	fromTs.dsc_scale = 0;
+	fromTs.dsc_address = (UCHAR*) tsText;
+	fromTs.dsc_ttype() = ttype_ascii;
+
+	dsc toTs;
+	toTs.dsc_dtype = dtype_timestamp_tz;
+	toTs.dsc_length = sizeof(tsBuffer);
+	toTs.dsc_scale = 0;
+	toTs.dsc_address = tsBuffer;
+
+	CVT_move_common(&fromTs, &toTs, 0, &cb);
+
+	const size_t tsLogical = offsetof(ISC_TIMESTAMP_TZ, time_zone) + sizeof(ISC_USHORT);
+	for (size_t i = tsLogical; i < sizeof(tsBuffer); ++i)
+		BOOST_TEST(tsBuffer[i] == 0);
+
+	const char* timeText = "14:32 +00:00";
+	UCHAR timeBuffer[sizeof(ISC_TIME_TZ)];
+	memset(timeBuffer, 0xA5, sizeof(timeBuffer));
+
+	dsc fromTime;
+	fromTime.dsc_dtype = dtype_text;
+	fromTime.dsc_length = strlen(timeText);
+	fromTime.dsc_scale = 0;
+	fromTime.dsc_address = (UCHAR*) timeText;
+	fromTime.dsc_ttype() = ttype_ascii;
+
+	dsc toTime;
+	toTime.dsc_dtype = dtype_sql_time_tz;
+	toTime.dsc_length = sizeof(timeBuffer);
+	toTime.dsc_scale = 0;
+	toTime.dsc_address = timeBuffer;
+
+	CVT_move_common(&fromTime, &toTime, 0, &cb);
+
+	const size_t timeLogical = offsetof(ISC_TIME_TZ, time_zone) + sizeof(ISC_USHORT);
+	for (size_t i = timeLogical; i < sizeof(timeBuffer); ++i)
+		BOOST_TEST(timeBuffer[i] == 0);
+}
+
 BOOST_AUTO_TEST_CASE(CVTDatetimeToFormatStringTest_TIMESTAMP_TZ)
 {
 	ISC_TIMESTAMP_TZ timestampTZ = createTimeStampTZ(1982, 4, 21, 1, 34, 15, 0, 500);