Better backward compatibility. Some paranoid checks in gbak.

Author: dyemanov

src/burp/backup.epp

@@ -1259,7 +1259,7 @@ void put_blob( burp_fld* field, ISC_QUAD& blob_id)
 		return;
 	}
 
-	UCHAR blob_info[32];
+	UCHAR blob_info[BUFFER_TINY];
 	if (!blob.getInfo(sizeof(blob_items), blob_items, sizeof(blob_info), blob_info))
 	{
 		BURP_error_redirect(&status_vector, 20);
@@ -1388,32 +1388,33 @@ bool put_blr_blob( att_type attribute, ISC_QUAD& blob_id)
 		// msg 24 isc_open_blob failed
 	}
 
-	UCHAR blob_info[32];
+	UCHAR blob_info[BUFFER_TINY];
 	if (!blob.getInfo(sizeof(blr_items), blr_items, sizeof(blob_info), blob_info))
 	{
 		BURP_error_redirect(&status_vector, 20);
 		// msg 20 isc_blob_info failed
 	}
 
-	ULONG length = 0;
+	FB_UINT64 length = 0;
 	USHORT max_segment = 0;
 	const UCHAR* p = blob_info;
 	UCHAR item;
 
 	while ((item = *p++) != isc_info_end)
 	{
-		const USHORT l = isc_vax_integer((const char*) p, 2);
+		const auto l = gds__vax_integer(p, 2);
 		p += 2;
-		const ULONG n = isc_vax_integer((const char*) p, l);
+		const auto n = isc_portable_integer(p, l);
 		p += l;
+
 		switch (item)
 		{
 		case isc_info_blob_max_segment:
-			max_segment = n;
+			max_segment = (USHORT) n;
 			break;
 
 		case isc_info_blob_total_length:
-			length = n;
+			length = (FB_UINT64) n;
 			break;
 
 		default:
@@ -1426,7 +1427,7 @@ bool put_blr_blob( att_type attribute, ISC_QUAD& blob_id)
 		}
 	}
 
-	if (!length)
+	if (!length || length > MAX_ULONG)
 	{
 		if (!blob.close())
 			BURP_error_redirect(&status_vector, 23);
@@ -2136,37 +2137,38 @@ bool put_source_blob(att_type attribute, att_type old_attribute, ISC_QUAD& blob_
 		// msg 24 isc_open_blob failed
 	}
 
-	UCHAR blob_info[48];
+	UCHAR blob_info[BUFFER_TINY];
 	if (!blob.getInfo(sizeof(source_items), source_items, sizeof(blob_info), blob_info))
 	{
 		BURP_error_redirect(&status_vector, 20);
 		// msg 20 isc_blob_info failed
 	}
 
-	ULONG length = 0;
+	FB_UINT64 length = 0;
 	ULONG num_seg = 0;
 	USHORT max_segment = 0;
 	const UCHAR* p = blob_info;
 	UCHAR item;
 
 	while ((item = *p++) != isc_info_end)
 	{
-		const USHORT l = gds__vax_integer(p, 2);
+		const auto l = gds__vax_integer(p, 2);
 		p += 2;
-		const ULONG n = gds__vax_integer(p, l);
+		const auto n = isc_portable_integer(p, l);
 		p += l;
+
 		switch (item)
 		{
 		case isc_info_blob_max_segment:
-			max_segment = n;
+			max_segment = (USHORT) n;
 			break;
 
 		case isc_info_blob_total_length:
-			length = n;
+			length = (FB_UINT64) n;
 			break;
 
 		case isc_info_blob_num_segments:
-			num_seg = n;
+			num_seg = (ULONG) n;
 			break;
 
 		default:
@@ -2181,7 +2183,7 @@ bool put_source_blob(att_type attribute, att_type old_attribute, ISC_QUAD& blob_
 		}
 	}
 
-	if (!length)
+	if (!length || length > MAX_ULONG)
 	{
 		if (!blob.close())
 		{
@@ -3881,8 +3883,11 @@ void write_relations()
 			// RDB$VIEW_BLR must be the first blob field in the backup file.
 			// RESTORE.EPP makes this assumption in get_relation().
 
-			if (put_blr_blob (att_relation_view_blr, X.RDB$VIEW_BLR))
+			if (!X.RDB$VIEW_BLR.NULL && !BlobWrapper::blobIsNull(X.RDB$VIEW_BLR))
 				flags |= REL_view;
+
+			put_blr_blob (att_relation_view_blr, X.RDB$VIEW_BLR);
+
 			if (X.RDB$SYSTEM_FLAG)
 				put_int32 (att_relation_system_flag, X.RDB$SYSTEM_FLAG);
 			if (!X.RDB$FLAGS.NULL)
@@ -3941,8 +3946,10 @@ void write_relations()
 			// RDB$VIEW_BLR must be the first blob field in the backup file.
 			// RESTORE.EPP makes this assumption in get_relation().
 
-			if (put_blr_blob (att_relation_view_blr, X.RDB$VIEW_BLR))
+			if (!X.RDB$VIEW_BLR.NULL && !BlobWrapper::blobIsNull(X.RDB$VIEW_BLR))
 				flags |= REL_view;
+
+			put_blr_blob (att_relation_view_blr, X.RDB$VIEW_BLR);
 			if (X.RDB$SYSTEM_FLAG)
 				put_int32 (att_relation_system_flag, X.RDB$SYSTEM_FLAG);
 			if (!X.RDB$FLAGS.NULL)

src/remote/remote.cpp

@@ -873,28 +873,38 @@ bool RBlobInfo::getLocalInfo(unsigned int itemsLength, const unsigned char* item
 		if (*item == isc_info_end)
 			break;
 
+		FB_UINT64 value;
+
 		switch (*item)
 		{
 		case isc_info_blob_num_segments:
-			p = fb_utils::putInfoItemInt(*item, num_segments, p, end);
+			value = num_segments;
 			break;
 
 		case isc_info_blob_max_segment:
-			p = fb_utils::putInfoItemInt(*item, max_segment, p, end);
+			value = max_segment;
 			break;
 
 		case isc_info_blob_total_length:
-			p = fb_utils::putInfoItemInt(*item, total_length, p, end);
+			value = total_length;
 			break;
 
 		case isc_info_blob_type:
-			p = fb_utils::putInfoItemInt(*item, blob_type, p, end);
+			value = blob_type;
 			break;
 
 		default:
 			// unknown info item, let remote server handle it
 			return false;
 		}
+
+		if (value <= MAX_SLONG)
+			p = fb_utils::putInfoItemInt(*item, (SLONG) value, p, end);
+		else
+			p = fb_utils::putInfoItemInt(*item, value, p, end);
+
+		if (!p)
+			return false;
 	}
 
 	if (p < end)