diff --git a/.hgtags b/.hgtags
index b53dd3ce9e5b9b101831252824f73a63648574a6..3f70231561206f21a95d45aedc6c7ea7dbc40752 100644
--- a/.hgtags
+++ b/.hgtags
@@ -325,3 +325,4 @@ fba99f381b8d4ad1b7b42fa4993b29998d95be18 DRTVWR-179
 1dc94555582f52718834081e7659e973ae4521f7 3.4.1-beta8
 52c164c8023a5e65f3dc1b0bbb7fa1dd0c631b6b DRTVWR-231
 9c4519aa5c70f7560111fb5c740d3a7dc20a845a 3.4.1-beta9
+464cf7a63a9a2f95bc4972dc022ca765e93de7d3 DRTVWR-233
diff --git a/indra/llcommon/llmemory.h b/indra/llcommon/llmemory.h
index 40cde485cffa672b38ea1ed85589447e7af0d1bf..10013e0f92868ded68ab34b126e0e06c0577fed7 100644
--- a/indra/llcommon/llmemory.h
+++ b/indra/llcommon/llmemory.h
@@ -87,7 +87,11 @@ inline void* ll_aligned_realloc_16(void* ptr, size_t size, size_t old_size) // r
 	void* ret = ll_aligned_malloc_16(size);
 	if (ptr)
 	{
-		memcpy(ret, ptr, old_size);
+		if (ret)
+		{
+			// Only copy the size of the smallest memory block to avoid memory corruption.
+			memcpy(ret, ptr, llmin(old_size, size));
+		}
 		ll_aligned_free_16(ptr);
 	}
 	return ret;