Put isc_info_end into response buffer despite of its presence in info items.

Author: hvlad

src/remote/client/interface.cpp

@@ -1984,6 +1984,13 @@ unsigned char* Attachment::getWireStatsInfo(UCharBuffer& info, unsigned int buff
 		if (ptr >= end)
 			return nullptr;
 
+		if (*item == isc_info_end)
+		{
+			if (info.getCount() == 1)
+				info.remove(item);
+			break;
+		}
+
 		switch (*item)
 		{
 		case fb_info_wire_snd_packets:
@@ -2010,21 +2017,16 @@ unsigned char* Attachment::getWireStatsInfo(UCharBuffer& info, unsigned int buff
 			break;
 		}
 
-		case isc_info_end:
-			if (info.getCount() > 1)
-				return ptr;
-
-			*ptr++ = *item;
-			info.remove(item);
-			return nullptr;
-
 		default:
 			item++;
 			break;
 		}
 	}
 
-	return info.isEmpty() ? nullptr : ptr;
+	if (info.isEmpty() && ptr < end)
+		*ptr++ = isc_info_end;
+
+	return (info.isEmpty() || (ptr >= end)) ? nullptr : ptr;
 }
 
 

src/remote/remote.cpp

@@ -870,6 +870,9 @@ bool RBlobInfo::getLocalInfo(unsigned int itemsLength, const unsigned char* item
 
 	for (auto item = items; p && (item < items + itemsLength); item++)
 	{
+		if (*item == isc_info_end)
+			break;
+
 		switch (*item)
 		{
 		case isc_info_blob_num_segments:
@@ -888,17 +891,15 @@ bool RBlobInfo::getLocalInfo(unsigned int itemsLength, const unsigned char* item
 			p = fb_utils::putInfoItemInt(*item, blob_type, p, end);
 			break;
 
-		case isc_info_end:
-			if (p < end)
-				*p++ = isc_info_end;
-			break;
-
 		default:
 			// unknown info item, let remote server handle it
 			return false;
 		}
 	}
 
+	if (p < end)
+		*p++ = isc_info_end;
+
 	return true;
 }